[svn-commits] file: branch group/stasis_cache_usage r393518 - /team/group/stasis_cache_usag...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Jul 2 18:02:55 CDT 2013
Author: file
Date: Tue Jul 2 18:02:53 2013
New Revision: 393518
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393518
Log:
Incorporate review feedback.
Modified:
team/group/stasis_cache_usage/main/manager.c
team/group/stasis_cache_usage/main/manager_bridging.c
team/group/stasis_cache_usage/main/manager_channels.c
Modified: team/group/stasis_cache_usage/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/group/stasis_cache_usage/main/manager.c?view=diff&rev=393518&r1=393517&r2=393518
==============================================================================
--- team/group/stasis_cache_usage/main/manager.c (original)
+++ team/group/stasis_cache_usage/main/manager.c Tue Jul 2 18:02:53 2013
@@ -3737,10 +3737,14 @@
}
/* if we look by name, we break after the first iteration */
- for (; msg; msg = ao2_iterator_next(&it_chans)) {
+ for (; msg; ao2_ref(msg, -1), msg = ao2_iterator_next(&it_chans)) {
struct ast_channel_snapshot *snapshot = stasis_message_data(msg);
struct ast_channel *c;
struct ast_str *built = ast_manager_build_channel_state_string_prefix(snapshot, "");
+
+ if (!built) {
+ continue;
+ }
if (!ast_strlen_zero(cvariables) && (c = ast_channel_get_by_name(snapshot->name))) {
int i;
@@ -3775,7 +3779,6 @@
ast_str_buffer(str),
idText);
- ao2_ref(msg, -1);
ast_free(built);
if (!all) {
@@ -5165,6 +5168,10 @@
struct ast_channel_snapshot *cs = stasis_message_data(msg);
struct ast_str *built = ast_manager_build_channel_state_string_prefix(cs, "");
+ if (!built) {
+ continue;
+ }
+
astman_append(s,
"Event: CoreShowChannel\r\n"
"%s"
@@ -5177,6 +5184,7 @@
ast_free(built);
}
+ ao2_iterator_destroy(&it_chans);
astman_append(s,
"Event: CoreShowChannelsComplete\r\n"
Modified: team/group/stasis_cache_usage/main/manager_bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/group/stasis_cache_usage/main/manager_bridging.c?view=diff&rev=393518&r1=393517&r2=393518
==============================================================================
--- team/group/stasis_cache_usage/main/manager_bridging.c (original)
+++ team/group/stasis_cache_usage/main/manager_bridging.c Tue Jul 2 18:02:53 2013
@@ -41,9 +41,16 @@
<synopsis>Raised when a bridge is created.</synopsis>
<syntax>
<parameter name="BridgeUniqueid">
+ <para>The unique identifier of the bridge</para>
</parameter>
<parameter name="BridgeType">
<para>The type of bridge</para>
+ </parameter>
+ <parameter name="BridgeTechnology">
+ <para>Technology in use by the bridge</para>
+ </parameter>
+ <parameter name="BridgeNumChannels">
+ <para>Number of channels in the bridge</para>
</parameter>
</syntax>
</managerEventInstance>
Modified: team/group/stasis_cache_usage/main/manager_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/group/stasis_cache_usage/main/manager_channels.c?view=diff&rev=393518&r1=393517&r2=393518
==============================================================================
--- team/group/stasis_cache_usage/main/manager_channels.c (original)
+++ team/group/stasis_cache_usage/main/manager_channels.c Tue Jul 2 18:02:53 2013
@@ -43,11 +43,19 @@
<synopsis>Raised when a new channel is created.</synopsis>
<syntax>
<parameter name="Channel">
+ <para>Name of the channel</para>
+ </parameter>
+ <parameter name="Type">
+ <para>Type of channel</para>
+ </parameter>
+ <parameter name="DNID">
+ <para>Dialed number identifier</para>
</parameter>
<parameter name="ChannelState">
<para>A numeric code for the channel's current state, related to ChannelStateDesc</para>
</parameter>
<parameter name="ChannelStateDesc">
+ <para>Name for the channel's current state</para>
<enumlist>
<enum name="Down"/>
<enum name="Rsrvd"/>
@@ -70,6 +78,10 @@
</parameter>
<parameter name="ConnectedLineName">
</parameter>
+ <parameter name="EffectiveConnectedLineNum">
+ </parameter>
+ <parameter name="EffectiveConnectedLineName">
+ </parameter>
<parameter name="AccountCode">
</parameter>
<parameter name="Context">
@@ -79,6 +91,48 @@
<parameter name="Priority">
</parameter>
<parameter name="Uniqueid">
+ <para>Unique identifier for the channel</para>
+ </parameter>
+ <parameter name="TimeToHangup">
+ <para>Absolute lifetime of the channel</para>
+ </parameter>
+ <parameter name="BridgeID">
+ <para>Identifier of the bridge the channel is in, may be empty if not in one</para>
+ </parameter>
+ <parameter name="Linkedid">
+ </parameter>
+ <parameter name="Callid">
+ <para>Call identifier for the overall call</para>
+ </parameter>
+ <parameter name="Application">
+ <para>Application currently executing on the channel</para>
+ </parameter>
+ <parameter name="Data">
+ <para>Data given to the currently executing channel</para>
+ </parameter>
+ <parameter name="Nativeformats">
+ <para>Media formats the connected party is willing to send or receive</para>
+ </parameter>
+ <parameter name="Readformat">
+ <para>Media formats that frames from the channel are received in</para>
+ </parameter>
+ <parameter name="Readtrans">
+ <para>Translation path for media received in native formats</para>
+ </parameter>
+ <parameter name="Writeformat">
+ <para>Media formats that frames to the channel are accepted in</para>
+ </parameter>
+ <parameter name="Writetrans">
+ <para>Translation path for media sent to the connected party</para>
+ </parameter>
+ <parameter name="Callgroup">
+ <para>Configured call group on the channel</para>
+ </parameter>
+ <parameter name="Pickupgroup">
+ <para>Configured pickup group on the channel</para>
+ </parameter>
+ <parameter name="Seconds">
+ <para>Number of seconds the channel has been active</para>
</parameter>
</syntax>
</managerEventInstance>
More information about the svn-commits
mailing list