........ r399887 | dlee | 2013-09-26 10:41:47 -0500 (Thu, 26 Sep 2013) | 1 line Minor performance bump by not allocate manager variable struct if we don't need it ........ r400138 | dlee | 2013-09-30 10:24:00 -0500 (Mon, 30 Sep 2013) | 23 lines Stasis performance improvements This patch addresses several performance problems that were found in the initial performance testing of Asterisk 12. The Stasis dispatch object was allocated as an AO2 object, even though it has a very confined lifecycle. This was replaced with a straight ast_malloc(). The Stasis message router was spending an inordinate amount of time searching hash tables. In this case, most of our routers had 6 or fewer routes in them to begin with. This was replaced with an array that's searched linearly for the route. We more heavily rely on AO2 objects in Asterisk 12, and the memset() in ao2_ref() actually became noticeable on the profile. This was #ifdef'ed to only run when AO2_DEBUG was enabled. After being misled by an erroneous comment in taskprocessor.c during profiling, the wrong comment was removed. Review: https://reviewboard.asterisk.org/r/2873/ ........ r400178 | dlee | 2013-09-30 13:26:27 -0500 (Mon, 30 Sep 2013) | 24 lines Taskprocessor optimization; switch Stasis to use taskprocessors This patch optimizes taskprocessor to use a semaphore for signaling, which the OS can do a better job at managing contention and waiting that we can with a mutex and condition. The taskprocessor execution was also slightly optimized to reduce the number of locks taken. The only observable difference in the taskprocessor implementation is that when the final reference to the taskprocessor goes away, it will execute all tasks to completion instead of discarding the unexecuted tasks. For systems where unnamed semaphores are not supported, a really simple semaphore implementation is provided. (Which gives identical performance as the original taskprocessor implementation). The way we ended up implementing Stasis caused the threadpool to be a burden instead of a boost to performance. This was switched to just use taskprocessors directly for subscriptions. Review: https://reviewboard.asterisk.org/r/2881/ ........ r400180 | dlee | 2013-09-30 13:39:34 -0500 (Mon, 30 Sep 2013) | 28 lines Optimize how Stasis forwards are dispatched This patch optimizes how forwards are dispatched in Stasis. Originally, forwards were dispatched as subscriptions that are invoked on the publishing thread. This did not account for the vast number of forwards we would end up having in the system, and the amount of work it would take to walk though the forward subscriptions. This patch modifies Stasis so that rather than walking the tree of forwards on every dispatch, when forwards and subscriptions are changed, the subscriber list for every topic in the tree is changed. This has a couple of benefits. First, this reduces the workload of dispatching messages. It also reduces contention when dispatching to different topics that happen to forward to the same aggregation topic (as happens with all of the channel, bridge and endpoint topics). Since forwards are no longer subscriptions, the bulk of this patch is simply changing stasis_subscription objects to stasis_forward objects (which, admittedly, I should have done in the first place.) Since this required me to yet again put in a growing array, I finally abstracted that out into a set of ast_vector macros in asterisk/vector.h. Review: https://reviewboard.asterisk.org/r/2883/ ........ r400181 | dlee | 2013-09-30 13:48:57 -0500 (Mon, 30 Sep 2013) | 28 lines Remove dispatch object allocation from Stasis publishing While looking for areas for performance improvement, I realized that an unused feature in Stasis was negatively impacting performance. When a message is sent to a subscriber, a dispatch object is allocated for the dispatch, containing the topic the message was published to, the subscriber the message is being sent to, and the message itself. The topic is actually unused by any subscriber in Asterisk today. And the subscriber is associated with the taskprocessor the message is being dispatched to. First, this patch removes the unused topic parameter from Stasis subscription callbacks. Second, this patch introduces the concept of taskprocessor local data, data that may be set on a taskprocessor and provided along with the data pointer when a task is pushed using the ast_taskprocessor_push_local() call. This allows the task to have both data specific to that taskprocessor, in addition to data specific to that invocation. With those two changes, the dispatch object can be removed completely, and the message is simply refcounted and sent directly to the taskprocessor. Review: https://reviewboard.asterisk.org/r/2884/ ........ Merged revisions 399887,400138,400178,400180-400181 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400186 65c4cc65-6c06-0410-ace0-fbb531ad65f3
201 lines
5.3 KiB
C
201 lines
5.3 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 2013, Digium, Inc.
|
|
*
|
|
* Matt Jordan <mjordan@digium.com>
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*! \file
|
|
*
|
|
* \brief The Asterisk Management Interface - AMI (MWI event handling)
|
|
*
|
|
* \author Matt Jordan <mjordan@digium.com>
|
|
*/
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
#include "asterisk/manager.h"
|
|
#include "asterisk/app.h"
|
|
#include "asterisk/channel.h"
|
|
#include "asterisk/stasis_message_router.h"
|
|
#include "asterisk/stasis.h"
|
|
|
|
struct stasis_message_router *mwi_state_router;
|
|
|
|
/*** DOCUMENTATION
|
|
***/
|
|
|
|
/*! \brief The \ref stasis subscription returned by the forwarding of the MWI topic
|
|
* to the manager topic
|
|
*/
|
|
static struct stasis_forward *topic_forwarder;
|
|
|
|
/*! \brief Callback function used by \ref mwi_app_event_cb to weed out "Event" keys */
|
|
static int exclude_event_cb(const char *key)
|
|
{
|
|
if (!strcmp(key, "Event")) {
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*! \brief Generic MWI event callback used for one-off events from voicemail modules */
|
|
static void mwi_app_event_cb(void *data, struct stasis_subscription *sub,
|
|
struct stasis_message *message)
|
|
{
|
|
struct ast_mwi_blob *payload = stasis_message_data(message);
|
|
RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);
|
|
RAII_VAR(struct ast_str *, event_buffer, NULL, ast_free);
|
|
struct ast_json *event_json = ast_json_object_get(payload->blob, "Event");
|
|
|
|
if (!event_json) {
|
|
return;
|
|
}
|
|
|
|
if (payload->mwi_state && payload->mwi_state->snapshot) {
|
|
channel_event_string = ast_manager_build_channel_state_string(payload->mwi_state->snapshot);
|
|
}
|
|
|
|
event_buffer = ast_manager_str_from_json_object(payload->blob, exclude_event_cb);
|
|
if (!event_buffer) {
|
|
ast_log(AST_LOG_WARNING, "Failed to create payload for event %s\n", ast_json_string_get(event_json));
|
|
return;
|
|
}
|
|
|
|
manager_event(EVENT_FLAG_CALL, ast_json_string_get(event_json),
|
|
"Mailbox: %s\r\n"
|
|
"%s"
|
|
"%s",
|
|
payload->mwi_state ? payload->mwi_state->uniqueid : "Unknown",
|
|
ast_str_buffer(event_buffer),
|
|
channel_event_string ? ast_str_buffer(channel_event_string) : "");
|
|
}
|
|
|
|
static void mwi_update_cb(void *data, struct stasis_subscription *sub,
|
|
struct stasis_message *message)
|
|
{
|
|
struct ast_mwi_state *mwi_state;
|
|
RAII_VAR(struct ast_str *, channel_event_string, NULL, ast_free);
|
|
|
|
if (ast_mwi_state_type() != stasis_message_type(message)) {
|
|
return;
|
|
}
|
|
|
|
mwi_state = stasis_message_data(message);
|
|
if (!mwi_state) {
|
|
return;
|
|
}
|
|
|
|
if (mwi_state->snapshot) {
|
|
channel_event_string = ast_manager_build_channel_state_string(mwi_state->snapshot);
|
|
}
|
|
|
|
/*** DOCUMENTATION
|
|
<managerEventInstance>
|
|
<synopsis>Raised when the state of messages in a voicemail mailbox
|
|
has changed or when a channel has finished interacting with a
|
|
mailbox.</synopsis>
|
|
<syntax>
|
|
<channel_snapshot/>
|
|
<parameter name="Mailbox">
|
|
<para>The mailbox with the new message, specified as <literal>mailbox</literal>@<literal>context</literal></para>
|
|
</parameter>
|
|
<parameter name="Waiting">
|
|
<para>Whether or not the mailbox has messages waiting for it.</para>
|
|
</parameter>
|
|
<parameter name="New">
|
|
<para>The number of new messages.</para>
|
|
</parameter>
|
|
<parameter name="Old">
|
|
<para>The number of old messages.</para>
|
|
</parameter>
|
|
</syntax>
|
|
<description>
|
|
<note><para>The Channel related parameters are only present if a
|
|
channel was involved in the manipulation of a mailbox. If no
|
|
channel is involved, the parameters are not included with the
|
|
event.</para>
|
|
</note>
|
|
</description>
|
|
</managerEventInstance>
|
|
***/
|
|
manager_event(EVENT_FLAG_CALL, "MessageWaiting",
|
|
"%s"
|
|
"Mailbox: %s\r\n"
|
|
"Waiting: %d\r\n"
|
|
"New: %d\r\n"
|
|
"Old: %d\r\n",
|
|
AS_OR(channel_event_string, ""),
|
|
mwi_state->uniqueid,
|
|
ast_app_has_voicemail(mwi_state->uniqueid, NULL),
|
|
mwi_state->new_msgs,
|
|
mwi_state->old_msgs);
|
|
}
|
|
|
|
static void manager_mwi_shutdown(void)
|
|
{
|
|
stasis_forward_cancel(topic_forwarder);
|
|
topic_forwarder = NULL;
|
|
}
|
|
|
|
int manager_mwi_init(void)
|
|
{
|
|
int ret = 0;
|
|
struct stasis_topic *manager_topic;
|
|
struct stasis_topic *mwi_topic;
|
|
struct stasis_message_router *message_router;
|
|
|
|
manager_topic = ast_manager_get_topic();
|
|
if (!manager_topic) {
|
|
return -1;
|
|
}
|
|
message_router = ast_manager_get_message_router();
|
|
if (!message_router) {
|
|
return -1;
|
|
}
|
|
mwi_topic = ast_mwi_topic_all();
|
|
if (!mwi_topic) {
|
|
return -1;
|
|
}
|
|
|
|
topic_forwarder = stasis_forward_all(mwi_topic, manager_topic);
|
|
if (!topic_forwarder) {
|
|
return -1;
|
|
}
|
|
|
|
ast_register_atexit(manager_mwi_shutdown);
|
|
|
|
ret |= stasis_message_router_add(message_router,
|
|
ast_mwi_state_type(),
|
|
mwi_update_cb,
|
|
NULL);
|
|
|
|
ret |= stasis_message_router_add(message_router,
|
|
ast_mwi_vm_app_type(),
|
|
mwi_app_event_cb,
|
|
NULL);
|
|
|
|
/* If somehow we failed to add any routes, just shut down the whole
|
|
* thing and fail it.
|
|
*/
|
|
if (ret) {
|
|
manager_mwi_shutdown();
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|