[svn-commits] oej: branch oej/cancel_elsewhere_1.4 r164600 - in /team/oej/cancel_elsewhere_...

[SVN commits to the Digium repositories]

Author: oej
Date: Tue Dec 16 04:32:46 2008
New Revision: 164600

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164600
Log:
Updating

Modified:
    team/oej/cancel_elsewhere_1.4/   (props changed)
    team/oej/cancel_elsewhere_1.4/include/asterisk/channel.h
    team/oej/cancel_elsewhere_1.4/include/asterisk/pbx.h

Propchange: team/oej/cancel_elsewhere_1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 16 04:32:46 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-164411
+/branches/1.4:1-164599

Modified: team/oej/cancel_elsewhere_1.4/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/include/asterisk/channel.h?view=diff&rev=164600&r1=164599&r2=164600
==============================================================================
--- team/oej/cancel_elsewhere_1.4/include/asterisk/channel.h (original)
+++ team/oej/cancel_elsewhere_1.4/include/asterisk/channel.h Tue Dec 16 04:32:46 2008
@@ -1190,6 +1190,11 @@
 /*! 
  * \brief Stop servicing a channel for us...  
  *
+ * \note if chan is locked prior to calling ast_autoservice_stop, it
+ * is likely that there will be a deadlock between the thread that calls
+ * ast_autoservice_stop and the autoservice thread. It is important
+ * that chan is not locked prior to this call
+ *
  * \retval 0 success
  * \retval -1 error, or the channel has been hungup 
  */

Modified: team/oej/cancel_elsewhere_1.4/include/asterisk/pbx.h
URL: http://svn.digium.com/view/asterisk/team/oej/cancel_elsewhere_1.4/include/asterisk/pbx.h?view=diff&rev=164600&r1=164599&r2=164600
==============================================================================
--- team/oej/cancel_elsewhere_1.4/include/asterisk/pbx.h (original)
+++ team/oej/cancel_elsewhere_1.4/include/asterisk/pbx.h Tue Dec 16 04:32:46 2008
@@ -383,6 +383,10 @@
  * \param priority priority of the action within the extension
  * \param callerid callerid to search for
  *
+ * \note It is possible for autoservice to be started and stopped on c during this
+ * function call, it is important that c is not locked prior to calling this. Otherwise
+ * a deadlock may occur
+ *
  * \return If an extension within the given context(or callerid) with the given priority 
  *         is found a non zero value will be returned. Otherwise, 0 is returned.
  */
@@ -398,6 +402,10 @@
  * \param label label of the action within the extension to match to priority
  * \param callerid callerid to search for
  *
+ * \note It is possible for autoservice to be started and stopped on c during this
+ * function call, it is important that c is not locked prior to calling this. Otherwise
+ * a deadlock may occur
+ *
  * \return the priority which matches the given label in the extension or -1 if not found.
  */
 int ast_findlabel_extension(struct ast_channel *c, const char *context, 
@@ -405,6 +413,10 @@
 
 /*!
  * \brief Find the priority of an extension that has the specified label
+ *
+ * \note It is possible for autoservice to be started and stopped on c during this
+ * function call, it is important that c is not locked prior to calling this. Otherwise
+ * a deadlock may occur
  *
  * \note This function is the same as ast_findlabel_extension, except that it accepts
  * a pointer to an ast_context structure to specify the context instead of the
@@ -422,6 +434,10 @@
  * \param priority priority of extension path
  * \param callerid callerid of extension being searched for
  *
+ * \note It is possible for autoservice to be started and stopped on c during this
+ * function call, it is important that c is not locked prior to calling this. Otherwise
+ * a deadlock may occur
+ *
  * \return If "exten" *could be* a valid extension in this context with or without
  * some more digits, return non-zero.  Basically, when this returns 0, no matter
  * what you add to exten, it's not going to be a valid extension anymore
@@ -438,6 +454,10 @@
  * \param priority priority of extension path
  * \param callerid callerid of extension being searched for
  *
+ * \note It is possible for autoservice to be started and stopped on c during this
+ * function call, it is important that c is not locked prior to calling this. Otherwise
+ * a deadlock may occur
+ *
  * \return If "exten" *could match* a valid extension in this context with
  * some more digits, return non-zero.  Does NOT return non-zero if this is
  * an exact-match only.  Basically, when this returns 0, no matter
@@ -471,6 +491,10 @@
  * \param callerid callerid of extension
  *
  * This adds a new extension to the asterisk extension list.
+ *
+ * \note It is possible for autoservice to be started and stopped on c during this
+ * function call, it is important that c is not locked prior to calling this. Otherwise
+ * a deadlock may occur
  *
  * \retval 0 on success 
  * \retval -1 on failure.