(original) (raw)

--- Modules/_tkinter.c.orig 2007-06-05 22:04:50.000000000 +0000 +++ Modules/_tkinter.c 2007-06-06 15:09:49.000000000 +0000 @@ -1097,7 +1097,7 @@ typedef struct Tkapp_CallEvent { int flags; PyObject **res; PyObject **exc_type, **exc_value, **exc_tb; - Tcl_Condition done; + Tcl_Condition* done; } Tkapp_CallEvent; void @@ -1243,10 +1243,12 @@ Tkapp_CallProc(Tkapp_CallEvent *e, int f *(e->res) = Tkapp_CallResult(e->self); } LEAVE_PYTHON + + Tkapp_CallDeallocArgs(objv, objStore, objc); done: /* Wake up calling thread. */ Tcl_MutexLock(&call_mutex); - Tcl_ConditionNotify(&e->done); + Tcl_ConditionNotify(e->done); Tcl_MutexUnlock(&call_mutex); return 1; } @@ -1279,6 +1281,7 @@ Tkapp_Call(PyObject *_self, PyObject *ar /* We cannot call the command directly. Instead, we must marshal the parameters to the interpreter thread. */ Tkapp_CallEvent *ev; + Tcl_Condition cond = NULL; PyObject *exc_type, *exc_value, *exc_tb; if (!WaitForMainloop(self)) return NULL; @@ -1290,9 +1293,9 @@ Tkapp_Call(PyObject *_self, PyObject *ar ev->exc_type = &exc_type; ev->exc_value = &exc_value; ev->exc_tb = &exc_tb; - ev->done = (Tcl_Condition)0; + ev->done = &cond; - Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->done, &call_mutex); + Tkapp_ThreadSend(self, (Tcl_Event*)ev, &cond, &call_mutex); if (res == NULL) { if (exc_type) @@ -1300,6 +1303,7 @@ Tkapp_Call(PyObject *_self, PyObject *ar else PyErr_SetObject(Tkinter_TclError, exc_value); } + Tcl_ConditionFinalize(&cond); } else #endif @@ -1485,7 +1489,7 @@ typedef struct VarEvent { PyObject **res; PyObject **exc_type; PyObject **exc_val; - Tcl_Condition cond; + Tcl_Condition* cond; } VarEvent; static int @@ -1525,7 +1529,7 @@ var_proc(VarEvent* ev, int flags) ENTER_PYTHON var_perform(ev); Tcl_MutexLock(&var_mutex); - Tcl_ConditionNotify(&ev->cond); + Tcl_ConditionNotify(ev->cond); Tcl_MutexUnlock(&var_mutex); LEAVE_PYTHON return 1; @@ -1540,6 +1544,7 @@ var_invoke(EventFunc func, PyObject *_se TkappObject *self = (TkappObject*)_self; VarEvent *ev; PyObject *res, *exc_type, *exc_val; + Tcl_Condition cond = NULL; /* The current thread is not the interpreter thread. Marshal the call to the interpreter thread, then wait for @@ -1556,9 +1561,10 @@ var_invoke(EventFunc func, PyObject *_se ev->res = &res; ev->exc_type = &exc_type; ev->exc_val = &exc_val; - ev->cond = NULL; + ev->cond = &cond; ev->ev.proc = (Tcl_EventProc*)var_proc; - Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->cond, &var_mutex); + Tkapp_ThreadSend(self, (Tcl_Event*)ev, &cond, &var_mutex); + Tcl_ConditionFinalize(&cond); if (!res) { PyErr_SetObject(exc_type, exc_val); Py_DECREF(exc_type); @@ -2050,7 +2056,7 @@ typedef struct CommandEvent{ int create; int *status; ClientData *data; - Tcl_Condition done; + Tcl_Condition* done; } CommandEvent; static int @@ -2063,7 +2069,7 @@ Tkapp_CommandProc(CommandEvent *ev, int else *ev->status = Tcl_DeleteCommand(ev->interp, ev->name); Tcl_MutexLock(&command_mutex); - Tcl_ConditionNotify(&ev->done); + Tcl_ConditionNotify(ev->done); Tcl_MutexUnlock(&command_mutex); return 1; } @@ -2099,6 +2105,7 @@ Tkapp_CreateCommand(PyObject *_self, PyO data->func = func; if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) { + Tcl_Condition cond = NULL; CommandEvent *ev = (CommandEvent*)ckalloc(sizeof(CommandEvent)); ev->ev.proc = (Tcl_EventProc*)Tkapp_CommandProc; ev->interp = self->interp; @@ -2106,8 +2113,9 @@ Tkapp_CreateCommand(PyObject *_self, PyO ev->name = cmdName; ev->data = (ClientData)data; ev->status = &err; - ev->done = NULL; - Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->done, &command_mutex); + ev->done = &cond; + Tkapp_ThreadSend(self, (Tcl_Event*)ev, &cond, &command_mutex); + Tcl_ConditionFinalize(&cond); } else { ENTER_TCL @@ -2138,6 +2146,7 @@ Tkapp_DeleteCommand(PyObject *_self, PyO if (!PyArg_ParseTuple(args, "s:deletecommand", &cmdName)) return NULL; if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) { + Tcl_Condition cond = NULL; CommandEvent *ev; ev = (CommandEvent*)ckalloc(sizeof(CommandEvent)); ev->ev.proc = (Tcl_EventProc*)Tkapp_CommandProc; @@ -2145,9 +2154,10 @@ Tkapp_DeleteCommand(PyObject *_self, PyO ev->create = 0; ev->name = cmdName; ev->status = &err; - ev->done = NULL; - Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->done, + ev->done = &cond; + Tkapp_ThreadSend(self, (Tcl_Event*)ev, &cond, &command_mutex); + Tcl_ConditionFinalize(&cond); } else { ENTER_TCL