diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2008-06-10 08:30:35 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2008-06-10 08:30:35 +0000 |
| commit | 11a4980acbe5fdd43a115aaf1193aa48a7ca7327 (patch) | |
| tree | c92d06711091e9e641714a65a8f6212090922a0e /net/asterisk/files/patch-main::manager.c | |
| parent | - update to 0.33 (diff) | |
o Update to 1.4.20.1;
o add opt-in support for the iLBC codec;
o move another extra patch into opt-in section.
Notes
Notes:
svn path=/head/; revision=214611
Diffstat (limited to 'net/asterisk/files/patch-main::manager.c')
| -rw-r--r-- | net/asterisk/files/patch-main::manager.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/net/asterisk/files/patch-main::manager.c b/net/asterisk/files/patch-main::manager.c deleted file mode 100644 index 686068b09e09..000000000000 --- a/net/asterisk/files/patch-main::manager.c +++ /dev/null @@ -1,31 +0,0 @@ ---- main/manager.c.orig 2008-04-02 15:49:38.000000000 +0300 -+++ main/manager.c 2008-04-02 15:42:18.000000000 +0300 -@@ -176,6 +176,7 @@ - struct eventqent *eventq; - /* Timeout for ast_carefulwrite() */ - int writetimeout; -+ int pending_event; - AST_LIST_ENTRY(mansession) list; - }; - -@@ -2214,6 +2215,11 @@ - fds[0].events = POLLIN; - do { - ast_mutex_lock(&s->__lock); -+ if (s->pending_event) { -+ s->pending_event = 0; -+ ast_mutex_unlock(&s->__lock); -+ return 0; -+ } - s->waiting_thread = pthread_self(); - ast_mutex_unlock(&s->__lock); - -@@ -2475,6 +2481,8 @@ - ast_mutex_lock(&s->__lock); - if (s->waiting_thread != AST_PTHREADT_NULL) - pthread_kill(s->waiting_thread, SIGURG); -+ else -+ s->pending_event = 1; - ast_mutex_unlock(&s->__lock); - } - AST_LIST_UNLOCK(&sessions); |