Skip to content

bpo-33257: Fix race conditions for non-threaded Tcl #6444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
native-api wants to merge 17 commits into from
Closed

bpo-33257: Fix race conditions for non-threaded Tcl #6444

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c7e4b83
Fix race conditions for non-threaded Tcl when passing data to/from it
native-api Apr 10, 2018
6696aae
Document the added complexity of TCL bracket macros more clearly
native-api Apr 10, 2018
2c4c3e9
Add NEWS entry for bpo-33257
native-api Apr 13, 2018
e828ea7
* Tkapp_CallArgs, Tkapp_CallResult, AsObj require both locks
native-api Apr 15, 2018
a67255a
Regrtest bpo-33257
native-api May 12, 2018
6ccdccb
* PythonCmd_Error doesn't use the arg and thus can do without Tcl lock
native-api Apr 15, 2018
0caf355
Make all Tcl lock operations into macros for easier tracking
native-api Apr 24, 2018
028b32a
Make Tcl lock reentrant
native-api May 16, 2018
ccf51ec
Don't release Tcl lock in Tcl custom commands
native-api Apr 29, 2018
10c6711
Document locking changes for handlers
native-api May 16, 2018
41ac64c
cosmetic changes for readability
native-api May 17, 2018
534c57d
replace test case
native-api May 16, 2018
0b1a8b6
code style
native-api May 17, 2018
c500908
alter NEWS to include the 2nd fix
native-api May 18, 2018
29853b9
Merge branch 'main' into tcltk_race_master
native-api Apr 6, 2025
6bbee2d
Merge branch 'main' into tcltk_race_master
native-api Apr 6, 2025
90e73a9
lint error fix
native-api Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
* Tkapp_CallArgs, Tkapp_CallResult, AsObj require both locks 
* Tkapp_CallDeallocArgs requires Tcl lock
  • Loading branch information
@native-api
native-api committed May 17, 2018
commit e828ea7ff6becc178dd7611a721d0e53b605c54a
30 changes: 22 additions & 8 deletions Modules/_tkinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,13 @@ static PyThreadState *tcl_tstate = NULL;
{ PyThreadState *tstate = PyEval_SaveThread(); \
if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1); tcl_tstate = tstate; }

#define ENTER_PYTHON_OVERLAP \
{ PyThreadState *tstate = tcl_tstate; tcl_tstate = NULL; PyEval_RestoreThread((tstate)); }

#define LEAVE_PYTHON_OVERLAP \
{ PyThreadState *tstate = PyEval_SaveThread(); tcl_tstate = tstate; }


#define CHECK_TCL_APPARTMENT \
if (((TkappObject *)self)->threaded && \
((TkappObject *)self)->thread_id != Tcl_GetCurrentThread()) { \
Expand Down Expand Up @@ -1405,17 +1412,17 @@ Tkapp_CallProc(Tkapp_CallEvent *e, int flags)
Tcl_Obj **objv;
int objc;
int i;
ENTER_PYTHON
ENTER_PYTHON_OVERLAP
objv = Tkapp_CallArgs(e->args, objStore, &objc);
if (!objv) {
PyErr_Fetch(e->exc_type, e->exc_value, e->exc_tb);
*(e->res) = NULL;
}
LEAVE_PYTHON
LEAVE_PYTHON_OVERLAP
if (!objv)
goto done;
i = Tcl_EvalObjv(e->self->interp, objc, objv, e->flags);
ENTER_PYTHON
ENTER_PYTHON_OVERLAP
if (i == TCL_ERROR) {
*(e->res) = NULL;
*(e->exc_type) = NULL;
Expand All @@ -1427,7 +1434,7 @@ Tkapp_CallProc(Tkapp_CallEvent *e, int flags)
else {
*(e->res) = Tkapp_CallResult(e->self);
}
LEAVE_PYTHON
LEAVE_PYTHON_OVERLAP

Tkapp_CallDeallocArgs(objv, objStore, objc);
done:
Expand Down Expand Up @@ -1520,7 +1527,11 @@ Tkapp_Call(PyObject *selfptr, PyObject *args)
else
res = Tkapp_CallResult(self);

LEAVE_OVERLAP

Tkapp_CallDeallocArgs(objv, objStore, objc);

ENTER_OVERLAP

}
LEAVE_OVERLAP_TCL
Expand Down Expand Up @@ -2379,15 +2390,18 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[
if (res == NULL)
return PythonCmd_Error(interp);

ENTER_TCL
ENTER_OVERLAP
obj_res = AsObj(res);
if (obj_res) {
Tcl_SetObjResult(interp, obj_res);
rv = TCL_OK;
}
LEAVE_OVERLAP_TCL
if (obj_res == NULL) {
Py_DECREF(res);
return PythonCmd_Error(interp);
}
else {
Tcl_SetObjResult(interp, obj_res);
rv = TCL_OK;
}

Py_DECREF(res);

Expand Down