kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

allow listeners to pre-bind to subclasses before the main subscriber is loaded and fix off by one issue in unbinding event handler functions 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15790 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-12-04 20:28:55 +00:00
parent 866d98f586
commit 2e8d0e7d18
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/switch_event.c
View File

@ -59,6 +59,8 @@ struct switch_event_subclass {
char *owner; char *owner;
/*! the subclass name */ /*! the subclass name */
char *name; char *name;
/*! the subclass was reserved by a listener so it's ok for a module to reserve it still */
int bind;
}; };
#define MAX_DISPATCH_VAL 20 #define MAX_DISPATCH_VAL 20
@ -403,6 +405,9 @@ SWITCH_DECLARE(switch_status_t) switch_event_free_subclass_detailed(const char *
FREE(subclass); FREE(subclass);
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;
switch_thread_rwlock_unlock(RWLOCK); switch_thread_rwlock_unlock(RWLOCK);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Subclass reservation %s inuse by listeners, detaching..\n", subclass_name);
subclass->bind = 1;
} }
} }
@ -412,11 +417,16 @@ SWITCH_DECLARE(switch_status_t) switch_event_free_subclass_detailed(const char *
SWITCH_DECLARE(switch_status_t) switch_event_reserve_subclass_detailed(const char *owner, const char *subclass_name) SWITCH_DECLARE(switch_status_t) switch_event_reserve_subclass_detailed(const char *owner, const char *subclass_name)
{ {
switch_event_subclass_t *subclass; switch_event_subclass_t *subclass;
switch_assert(RUNTIME_POOL != NULL); switch_assert(RUNTIME_POOL != NULL);
switch_assert(CUSTOM_HASH != NULL); switch_assert(CUSTOM_HASH != NULL);
if (switch_core_hash_find(CUSTOM_HASH, subclass_name)) { if ((subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name))) {
/* a listener reserved it for us, now we can lock it so nobody else can have it */
if (subclass->bind) {
subclass->bind = 0;
return SWITCH_STATUS_SUCCESS;
}
return SWITCH_STATUS_INUSE; return SWITCH_STATUS_INUSE;
} }
@ -1187,6 +1197,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_bind_removable(const char *id, swit
if (!(subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name))) { if (!(subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name))) {
switch_event_reserve_subclass_detailed(id, subclass_name); switch_event_reserve_subclass_detailed(id, subclass_name);
subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name); subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name);
subclass->bind = 1;
} }
if (!subclass) { if (!subclass) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not reserve subclass. '%s'\n", subclass_name); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not reserve subclass. '%s'\n", subclass_name);
@ -1241,7 +1252,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_unbind_callback(switch_event_callba
switch_thread_rwlock_wrlock(RWLOCK); switch_thread_rwlock_wrlock(RWLOCK);
switch_mutex_lock(BLOCK); switch_mutex_lock(BLOCK);
/* <LOCKED> ----------------------------------------------- */ /* <LOCKED> ----------------------------------------------- */
for (id = 0; id < SWITCH_EVENT_ALL; id++) { for (id = 0; id <= SWITCH_EVENT_ALL; id++) {
lnp = NULL; lnp = NULL;
for (np = EVENT_NODES[id]; np;) { for (np = EVENT_NODES[id]; np;) {
@ -1253,6 +1264,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_unbind_callback(switch_event_callba
} else { } else {
EVENT_NODES[n->event_id] = n->next; EVENT_NODES[n->event_id] = n->next;
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Event Binding deleted for %s:%s\n", n->id, switch_event_name(n->event_id)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Event Binding deleted for %s:%s\n", n->id, switch_event_name(n->event_id));
if (n->subclass) { if (n->subclass) {
FREE(n->subclass->owner); FREE(n->subclass->owner);