summaryrefslogtreecommitdiff
path: root/include/asterisk
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2013-10-02 22:22:17 +0000
committerMark Michelson <mmichelson@digium.com>2013-10-02 22:22:17 +0000
commitaddbf276f5037dc5a265a1e43e383ae1d9e9d0d8 (patch)
tree0d9c84e9baffd708576d6c79fcd8adf768cba77d /include/asterisk
parente4ed9886e6527cab3858f45e8ba2d5f11a9aed08 (diff)
Multiple revisions 400318-400319
........ r400318 | mmichelson | 2013-10-02 17:08:49 -0500 (Wed, 02 Oct 2013) | 12 lines Remove unnecessary waits from stasis. Since caches are updated on publisher threads, there is no need to wait for the cache updates to occur after a stasis message is published. In the case of chan_pjsip device state changes, this set of changes caused an improvement to performance. Review: https://reviewboard.asterisk.org/r/2890 ........ r400319 | mmichelson | 2013-10-02 17:10:54 -0500 (Wed, 02 Oct 2013) | 3 lines Remove svn:mergeinfo property. ........ Merged revisions 400318-400319 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/stasis.h14
-rw-r--r--include/asterisk/stasis_endpoints.h4
2 files changed, 1 insertions, 17 deletions
diff --git a/include/asterisk/stasis.h b/include/asterisk/stasis.h
index 529aa12bb..943e0c72c 100644
--- a/include/asterisk/stasis.h
+++ b/include/asterisk/stasis.h
@@ -347,15 +347,6 @@ const char *stasis_topic_name(const struct stasis_topic *topic);
*/
void stasis_publish(struct stasis_topic *topic, struct stasis_message *message);
-/*!
- * \brief Wait for all pending messages on a given topic to be processed.
- * \param topic Topic to await pending messages on.
- * \return 0 on success.
- * \return Non-zero on error.
- * \since 12
- */
-int stasis_topic_wait(struct stasis_topic *topic);
-
/*! @} */
/*! @{ */
@@ -868,11 +859,6 @@ int stasis_cache_init(void);
*/
int stasis_config_init(void);
-/*!
- * \internal
- */
-int stasis_wait_init(void);
-
/*! @} */
/*!
diff --git a/include/asterisk/stasis_endpoints.h b/include/asterisk/stasis_endpoints.h
index 4a35e9587..0ba233bf8 100644
--- a/include/asterisk/stasis_endpoints.h
+++ b/include/asterisk/stasis_endpoints.h
@@ -194,14 +194,12 @@ struct stasis_cache *ast_endpoint_cache(void);
*
* \param tech Name of the endpoint's technology.
* \param resource Resource name of the endpoint.
- * \param guaranteed Whether to require all pending messages to have been processed or not.
* \return Snapshot of the endpoint with the given name.
* \return \c NULL if endpoint is not found, or on error.
* \since 12
*/
struct ast_endpoint_snapshot *ast_endpoint_latest_snapshot(const char *tech,
- const char *resource,
- unsigned int guaranteed
+ const char *resource
);
/*! @} */