aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-18 18:06:49 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-18 18:06:49 +0000
commit0d0cc03264712da7aa22d55a6492e6340ce52c71 (patch)
treef54b8087dd53faf052a33b4e7ef34725c135af67 /include
parentadd1dcc65f7ce2502b9815a4d0ad9556ba2d4124 (diff)
Merged revisions 86330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r86330 | russell | 2007-10-18 13:03:10 -0500 (Thu, 18 Oct 2007) | 10 lines The channel needs to stay locked while running timer callbacks, as they access and modify channel data that may change elsewhere. I went through every timer callback in the source tree to make sure that none of them did any additional locking that could introduce deadlocks, and all is well. (closes issue #10765) Reported by: Ivan Patches: ast_1_4_11_svn_patch_channel_rc.diff uploaded by Ivan (license 229) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@86331 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/channel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 8e556d092..6c5376b15 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -181,6 +181,7 @@ typedef unsigned long long ast_group_t;
struct ast_generator {
void *(*alloc)(struct ast_channel *chan, void *params);
void (*release)(struct ast_channel *chan, void *data);
+ /*! This function gets called with the channel locked */
int (*generate)(struct ast_channel *chan, void *data, int len, int samples);
/*! This gets called when DTMF_END frames are read from the channel */
void (*digit)(struct ast_channel *chan, char digit);