From: Russell Bryant Date: Fri, 24 Apr 2009 14:04:26 +0000 (+0000) Subject: Convert the ast_channel data structure over to the astobj2 framework. X-Git-Tag: 11.0.0-beta1~5003 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cba19c8a671c76a3969a7d36bc43444792a13a81;p=thirdparty%2Fasterisk.git Convert the ast_channel data structure over to the astobj2 framework. There is a lot that could be said about this, but the patch is a big improvement for performance, stability, code maintainability, and ease of future code development. The channel list is no longer an unsorted linked list. The main container for channels is an astobj2 hash table. All of the code related to searching for channels or iterating active channels has been rewritten. Let n be the number of active channels. Iterating the channel list has gone from O(n^2) to O(n). Searching for a channel by name went from O(n) to O(1). Searching for a channel by extension is still O(n), but uses a new method for doing so, which is more efficient. The ast_channel object is now a reference counted object. The benefits here are plentiful. Some benefits directly related to issues in the previous code include: 1) When threads other than the channel thread owning a channel wanted access to a channel, it had to hold the lock on it to ensure that it didn't go away. This is no longer a requirement. Holding a reference is sufficient. 2) There are places that now require less dealing with channel locks. 3) There are places where channel locks are held for much shorter periods of time. 4) There are places where dealing with more than one channel at a time becomes _MUCH_ easier. ChanSpy is a great example of this. Writing code in the future that deals with multiple channels will be much easier. Some additional information regarding channel locking and reference count handling can be found in channel.h, where a new section has been added that discusses some of the rules associated with it. Mark Michelson also assisted with the development of this patch. He did the conversion of ChanSpy and introduced a new API, ast_autochan, which makes it much easier to deal with holding on to a channel pointer for an extended period of time and having it get automatically updated if the channel gets masqueraded. Mark was also a huge help in the code review process. Thanks to David Vossel for his assistance with this branch, as well. David did the conversion of the DAHDIScan application by making it become a wrapper for ChanSpy internally. The changes come from the svn/asterisk/team/russell/ast_channel_ao2 branch. Review: http://reviewboard.digium.com/r/203/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@190423 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/CHANGES b/CHANGES index fe31769ad4..c243eb2a2e 100644 --- a/CHANGES +++ b/CHANGES @@ -28,6 +28,10 @@ Applications regardless if the call has been answered or not. * Added functionality to the app_dial F() option to continue with execution at the current location when no parameters are provided. + * Added c() option to app_chanspy. This option allows custom DTMF to be set + to cycle through the next avaliable channel. By default this is still '*'. + * Added x() option to app_chanspy. This option allows DTMF to be set to + exit the application. Dialplan Functions ------------------ diff --git a/UPGRADE.txt b/UPGRADE.txt index 35b0d455aa..6272b99486 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -25,6 +25,9 @@ From 1.6.2 to 1.6.3: If you are not using autoload=yes in modules.conf you will need to ensure it is set to load. If not, then any module which uses RTP (such as chan_sip) will not be able to send or receive calls. +* The app_dahdiscan.c file has been removed, but the dialplan app DAHDIScan still + remains. It now exists within app_chanspy.c and retains the exact same + functionality as before. From 1.6.1 to 1.6.2: diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c index a20d20f431..f604151ee2 100644 --- a/apps/app_channelredirect.c +++ b/apps/app_channelredirect.c @@ -86,8 +86,7 @@ static int asyncgoto_exec(struct ast_channel *chan, void *data) return -1; } - chan2 = ast_get_channel_by_name_locked(args.channel); - if (!chan2) { + if (!(chan2 = ast_channel_get_by_name(args.channel))) { ast_log(LOG_WARNING, "No such channel: %s\n", args.channel); pbx_builtin_setvar_helper(chan, "CHANNELREDIRECT_STATUS", "NOCHANNEL"); return 0; @@ -96,9 +95,12 @@ static int asyncgoto_exec(struct ast_channel *chan, void *data) if (chan2->pbx) { ast_set_flag(chan2, AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */ } + res = ast_async_parseable_goto(chan2, args.label); + + chan2 = ast_channel_unref(chan2); + pbx_builtin_setvar_helper(chan, "CHANNELREDIRECT_STATUS", "SUCCESS"); - ast_channel_unlock(chan2); return res; } diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 9d087c4d1f..07eac74a28 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -50,6 +50,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/module.h" #include "asterisk/lock.h" #include "asterisk/options.h" +#include "asterisk/autochan.h" #define AST_NAME_STRLEN 256 #define NUM_SPYGROUPS 128 @@ -141,6 +142,16 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") name of the last channel that was spied on will be stored in the SPY_CHANNEL variable. + + + +