kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-13 10:37:42 +00:00
Code Issues Projects Releases Wiki Activity

fix MODEVENT-32

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10289 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-11-07 14:48:49 +00:00
parent 23b022fa33
commit b18903ecf3
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/mod/event_handlers/mod_event_socket/mod_event_socket.c
View File

@ -86,9 +86,13 @@ struct listener {
typedef struct listener listener_t; typedef struct listener listener_t;
static struct {
switch_mutex_t *listener_mutex;
switch_event_node_t *node;
} globals;
static struct { static struct {
switch_socket_t *sock; switch_socket_t *sock;
switch_mutex_t *mutex;
switch_mutex_t *sock_mutex; switch_mutex_t *sock_mutex;
listener_t *listeners; listener_t *listeners;
uint8_t ready; uint8_t ready;
@ -114,9 +118,9 @@ static void remove_listener(listener_t *listener);
static uint32_t next_id(void) static uint32_t next_id(void)
{ {
uint32_t id; uint32_t id;
switch_mutex_lock(listen_list.mutex); switch_mutex_lock(globals.listener_mutex);
id = ++prefs.id; id = ++prefs.id;
switch_mutex_unlock(listen_list.mutex); switch_mutex_unlock(globals.listener_mutex);
return id; return id;
} }
@ -126,16 +130,11 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_pref_pass, prefs.password);
static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj); static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj);
static void launch_listener_thread(listener_t *listener); static void launch_listener_thread(listener_t *listener);
static struct {
switch_event_node_t *node;
} globals;
static switch_status_t socket_logger(const switch_log_node_t *node, switch_log_level_t level) static switch_status_t socket_logger(const switch_log_node_t *node, switch_log_level_t level)
{ {
listener_t *l; listener_t *l;
switch_mutex_lock(listen_list.mutex); switch_mutex_lock(globals.listener_mutex);
for (l = listen_list.listeners; l; l = l->next) { for (l = listen_list.listeners; l; l = l->next) {
if (switch_test_flag(l, LFLAG_LOG) && l->level >= node->level) { if (switch_test_flag(l, LFLAG_LOG) && l->level >= node->level) {
char *data = strdup(node->data); char *data = strdup(node->data);
@ -160,7 +159,7 @@ static switch_status_t socket_logger(const switch_log_node_t *node, switch_log_l
} }
} }
} }
switch_mutex_unlock(listen_list.mutex); switch_mutex_unlock(globals.listener_mutex);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -212,7 +211,7 @@ static void event_handler(switch_event_t *event)
lp = listen_list.listeners; lp = listen_list.listeners;
switch_mutex_lock(listen_list.mutex); switch_mutex_lock(globals.listener_mutex);
while(lp) { while(lp) {
int send = 0; int send = 0;
@ -321,7 +320,7 @@ static void event_handler(switch_event_t *event)
} }
} }
switch_mutex_unlock(listen_list.mutex); switch_mutex_unlock(globals.listener_mutex);
} }
SWITCH_STANDARD_APP(socket_function) SWITCH_STANDARD_APP(socket_function)
@ -456,11 +455,11 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_socket_shutdown)
} }
switch_event_unbind(&globals.node); switch_event_unbind(&globals.node);
switch_mutex_lock(listen_list.mutex); switch_mutex_lock(globals.listener_mutex);
for (l = listen_list.listeners; l; l = l->next) { for (l = listen_list.listeners; l; l = l->next) {
close_socket(&l->sock); close_socket(&l->sock);
} }
switch_mutex_unlock(listen_list.mutex); switch_mutex_unlock(globals.listener_mutex);
@ -470,17 +469,17 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_socket_shutdown)
static void add_listener(listener_t *listener) static void add_listener(listener_t *listener)
{ {
/* add me to the listeners so I get events */ /* add me to the listeners so I get events */
switch_mutex_lock(listen_list.mutex); switch_mutex_lock(globals.listener_mutex);
listener->next = listen_list.listeners; listener->next = listen_list.listeners;
listen_list.listeners = listener; listen_list.listeners = listener;
switch_mutex_unlock(listen_list.mutex); switch_mutex_unlock(globals.listener_mutex);
} }
static void remove_listener(listener_t *listener) static void remove_listener(listener_t *listener)
{ {
listener_t *l, *last = NULL; listener_t *l, *last = NULL;
switch_mutex_lock(listen_list.mutex); switch_mutex_lock(globals.listener_mutex);
for (l = listen_list.listeners; l; l = l->next) { for (l = listen_list.listeners; l; l = l->next) {
if (l == listener) { if (l == listener) {
if (last) { if (last) {
@ -491,7 +490,7 @@ static void remove_listener(listener_t *listener)
} }
last = l; last = l;
} }
switch_mutex_unlock(listen_list.mutex); switch_mutex_unlock(globals.listener_mutex);
} }
@ -499,7 +498,7 @@ static listener_t *find_listener(uint32_t id)
{ {
listener_t *l, *r = NULL; listener_t *l, *r = NULL;
switch_mutex_lock(listen_list.mutex); switch_mutex_lock(globals.listener_mutex);
for (l = listen_list.listeners; l; l = l->next) { for (l = listen_list.listeners; l; l = l->next) {
if (l->id && l->id == id) { if (l->id && l->id == id) {
if (switch_thread_rwlock_tryrdlock(l->rwlock) == SWITCH_STATUS_SUCCESS) { if (switch_thread_rwlock_tryrdlock(l->rwlock) == SWITCH_STATUS_SUCCESS) {
@ -508,7 +507,7 @@ static listener_t *find_listener(uint32_t id)
break; break;
} }
} }
switch_mutex_unlock(listen_list.mutex); switch_mutex_unlock(globals.listener_mutex);
return r; return r;
} }
@ -755,6 +754,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_event_socket_load)
switch_application_interface_t *app_interface; switch_application_interface_t *app_interface;
switch_api_interface_t *api_interface; switch_api_interface_t *api_interface;
switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool);
/* connect my internal structure to the blank pointer passed to me */ /* connect my internal structure to the blank pointer passed to me */
*module_interface = switch_loadable_module_create_module_interface(pool, modname); *module_interface = switch_loadable_module_create_module_interface(pool, modname);
SWITCH_ADD_APP(app_interface, "socket", "Connect to a socket", "Connect to a socket", socket_function, "<ip>[:<port>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "socket", "Connect to a socket", "Connect to a socket", socket_function, "<ip>[:<port>]", SAF_SUPPORT_NOMEDIA);
@ -1591,9 +1592,9 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj)
switch_channel_t *channel = NULL; switch_channel_t *channel = NULL;
switch_event_t *revent = NULL; switch_event_t *revent = NULL;
switch_mutex_lock(listen_list.mutex); switch_mutex_lock(globals.listener_mutex);
prefs.threads++; prefs.threads++;
switch_mutex_unlock(listen_list.mutex); switch_mutex_unlock(globals.listener_mutex);
switch_assert(listener != NULL); switch_assert(listener != NULL);
@ -1785,9 +1786,9 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj)
switch_core_destroy_memory_pool(&pool); switch_core_destroy_memory_pool(&pool);
} }
switch_mutex_lock(listen_list.mutex); switch_mutex_lock(globals.listener_mutex);
prefs.threads--; prefs.threads--;
switch_mutex_unlock(listen_list.mutex); switch_mutex_unlock(globals.listener_mutex);
return NULL; return NULL;
} }
@ -1871,7 +1872,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_socket_runtime)
return SWITCH_STATUS_TERM; return SWITCH_STATUS_TERM;
} }
switch_mutex_init(&listen_list.mutex, SWITCH_MUTEX_NESTED, pool);
switch_mutex_init(&listen_list.sock_mutex, SWITCH_MUTEX_NESTED, pool); switch_mutex_init(&listen_list.sock_mutex, SWITCH_MUTEX_NESTED, pool);