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

skypiax: tweakings for windows, still don't know how to make the API thread to die on windows at module unload 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16812 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Giovanni Maruzzelli 2010-02-25 12:43:06 +00:00
parent 4a89537070
commit 13c38b26c9
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mod/endpoints/mod_skypiax/mod_skypiax.c
View File

@ -1203,6 +1203,7 @@ static void *SWITCH_THREAD_FUNC skypiax_signaling_thread_func(switch_thread_t *
} }
} }
} }
DEBUGA_SKYPE("EXITING\n", SKYPIAX_P_LOG);
return NULL; return NULL;
} }
@ -1511,7 +1512,7 @@ static switch_status_t load_config(int reload_type)
switch_sleep(100000); switch_sleep(100000);
switch_threadattr_create(&skypiax_signaling_thread_attr, skypiax_module_pool); switch_threadattr_create(&skypiax_signaling_thread_attr, skypiax_module_pool);
switch_threadattr_detach_set(skypiax_signaling_thread_attr, 1); switch_threadattr_detach_set(skypiax_signaling_thread_attr, 0);
switch_threadattr_stacksize_set(skypiax_signaling_thread_attr, SWITCH_THREAD_STACKSIZE); switch_threadattr_stacksize_set(skypiax_signaling_thread_attr, SWITCH_THREAD_STACKSIZE);
switch_thread_create(&globals.SKYPIAX_INTERFACES[interface_id]. switch_thread_create(&globals.SKYPIAX_INTERFACES[interface_id].
skypiax_signaling_thread, skypiax_signaling_thread_attr, skypiax_signaling_thread, skypiax_signaling_thread_attr,
@ -1565,6 +1566,10 @@ static switch_status_t load_config(int reload_type)
skypiax_signaling_write(&globals.SKYPIAX_INTERFACES[interface_id], "SET USERSTATUS ONLINE"); skypiax_signaling_write(&globals.SKYPIAX_INTERFACES[interface_id], "SET USERSTATUS ONLINE");
switch_sleep(10000); switch_sleep(10000);
if(globals.SKYPIAX_INTERFACES[interface_id].silent_mode){ if(globals.SKYPIAX_INTERFACES[interface_id].silent_mode){
skypiax_signaling_write(&globals.SKYPIAX_INTERFACES[interface_id], "SET SILENT_MODE ON");
switch_sleep(10000);
skypiax_signaling_write(&globals.SKYPIAX_INTERFACES[interface_id], "SET SILENT_MODE OFF");
switch_sleep(10000);
skypiax_signaling_write(&globals.SKYPIAX_INTERFACES[interface_id], "SET SILENT_MODE ON"); skypiax_signaling_write(&globals.SKYPIAX_INTERFACES[interface_id], "SET SILENT_MODE ON");
switch_sleep(10000); switch_sleep(10000);
} }
@ -1773,7 +1778,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown)
{ {
int x; int x;
private_t *tech_pvt = NULL; private_t *tech_pvt = NULL;
switch_status_t status; switch_status_t status = SWITCH_STATUS_SUCCESS;
unsigned int howmany = 8; unsigned int howmany = 8;
int interface_id; int interface_id;
@ -1822,9 +1827,13 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown)
if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread) { if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread) {
switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread); switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread);
} }
if(status != SWITCH_STATUS_SUCCESS)
DEBUGA_SKYPE("got FALSE here, thread was not joined\n", SKYPIAX_P_LOG);
if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread) { if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread) {
switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread); switch_thread_join(&status, globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread);
} }
if(status != SWITCH_STATUS_SUCCESS)
DEBUGA_SKYPE("got FALSE here, thread was not joined\n", SKYPIAX_P_LOG);
#ifndef WIN32 #ifndef WIN32
WARNINGA("SHUTDOWN interface_id=%d\n", SKYPIAX_P_LOG, interface_id); WARNINGA("SHUTDOWN interface_id=%d\n", SKYPIAX_P_LOG, interface_id);
shutdown(tech_pvt->audiopipe_cli[0], 2); shutdown(tech_pvt->audiopipe_cli[0], 2);

2
src/mod/endpoints/mod_skypiax/skypiax_protocol.c
View File

@ -1506,7 +1506,7 @@ void *skypiax_do_skypeapi_thread_func(void *obj)
win32_DeInitialize_DestroyWindowClass(tech_pvt); win32_DeInitialize_DestroyWindowClass(tech_pvt);
} }
} }
DEBUGA_SKYPE("EXITING\n", SKYPIAX_P_LOG);
return NULL; return NULL;
} }