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

cleanup threadstate so that it removes the thread-local storage and cleans up django database connections which are stored in thread-local. fixes bug where it was leaking connections. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8193 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Traun Leyden 2008-04-24 17:58:38 +00:00
parent 9e5e1e7c9a
commit 7de99aa9dc
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mod/languages/mod_python/mod_python.c
View File

@ -176,11 +176,14 @@ static void eval_some_python(char *uuid, char *args, switch_core_session_t *sess
// or out .. thread state will currently be swapped in, and the SwapInThreadState // or out .. thread state will currently be swapped in, and the SwapInThreadState
// will be null // will be null
if (swapin_tstate == NULL) { if (swapin_tstate == NULL) {
// swap it out // clear out threadstate
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Threadstate mod_python.c swap-out! \n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "clear threadstate \n");
// PyEval_ReleaseThread(cur_tstate); // we know we are swapped in because swapin_tstate is NULL, and therefore we have the GIL, so
swapin_tstate = (void *) PyEval_SaveThread(); // it is safe to call PyThreadState_Get.
switch_channel_set_private(channel, "SwapInThreadState", (void *) swapin_tstate); PyThreadState *cur_tstate = PyThreadState_Get();
PyThreadState_Clear(cur_tstate);
PyEval_ReleaseThread(cur_tstate);
PyThreadState_Delete(cur_tstate);
} }
else { else {
// thread state is already swapped out, so, nothing for us to do // thread state is already swapped out, so, nothing for us to do
@ -189,7 +192,7 @@ static void eval_some_python(char *uuid, char *args, switch_core_session_t *sess
} }
else { else {
// they ran python script from cmd line, behave a bit differently (untested) // they ran python script from cmd line, behave a bit differently (untested)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Threadstate mod_python.c swap-out! \n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No session: Threadstate mod_python.c swap-out! \n");
PyEval_ReleaseThread(tstate); PyEval_ReleaseThread(tstate);
} }