From 64f666bdcb2403922ba264a93b7c95bde6095e25 Mon Sep 17 00:00:00 2001 From: russell Date: Thu, 18 Oct 2007 18:03:10 +0000 Subject: 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/branches/1.4@86330 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk/channel.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/asterisk/channel.h') diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 8f23fea11..5a704199e 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -141,6 +141,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); }; -- cgit v1.2.3