Skip to content

gh-103092: Isolate _tkinter (WIP) #103108

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
erlend-aasland wants to merge 18 commits into from
Closed

gh-103092: Isolate _tkinter (WIP) #103108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
45f3b7d
Establish global state
erlend-aasland Mar 29, 2023
d09999d
DEBUG: disable test restriction
erlend-aasland Mar 29, 2023
ad27a32
Adapt PyTclObject_Type and move it to module state
erlend-aasland Mar 29, 2023
ae833f8
Adapt Tkapp_Type and add it to module state
erlend-aasland Mar 29, 2023
18b1a42
Adapt Tktt_Type and add it to state
erlend-aasland Mar 29, 2023
6bfafcc
Add Tkinter_TclError to state
erlend-aasland Mar 29, 2023
3d8d5df
Add tcl_lock to state
erlend-aasland Mar 29, 2023
02d4b26
Put error handling vars in module state
erlend-aasland Mar 29, 2023
6610e11
Put Tkinter_busywaitinterval into module state
erlend-aasland Mar 29, 2023
b6ac21d
Put HeadFHCD into module state
erlend-aasland Mar 29, 2023
3d3e881
Put stdin_ready into module state
erlend-aasland Mar 29, 2023
686b69a
Put event_tstate into module state
erlend-aasland Mar 29, 2023
525897d
Purge non-existent valInCmd and trbInCmd
erlend-aasland Mar 29, 2023
ef328cf
Make space for module state
erlend-aasland Mar 29, 2023
3349ad3
Add get-state helpers
erlend-aasland Mar 29, 2023
e04df03
Get rid of most GLOBAL_STATE() use
erlend-aasland Mar 29, 2023
6818bb2
Get rid of more GLOBAL_STATE() calls
erlend-aasland Mar 29, 2023
d3b8f5e
Pull in main
erlend-aasland Apr 19, 2023
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
Add tcl_lock to state
  • Loading branch information
@erlend-aasland
erlend-aasland committed Mar 29, 2023
commit 3d8d5dff7a43698ef6947aeb44ab3196ca522661
58 changes: 40 additions & 18 deletions Modules/_tkinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,6 @@ _get_tcl_lib_path()

module_state global_state;

static PyThread_type_lock tcl_lock = 0;

#ifdef TCL_THREADS
static Tcl_ThreadDataKey state_key;
typedef PyThreadState *ThreadSpecificData;
Expand All @@ -253,30 +251,44 @@ static PyThreadState *tcl_tstate = NULL;

#define ENTER_TCL \
{ PyThreadState *tstate = PyThreadState_Get(); \
module_state *st = GLOBAL_STATE(); \
Py_BEGIN_ALLOW_THREADS \
if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1); \
if (st->tcl_lock) { \
PyThread_acquire_lock(st->tcl_lock, 1); \
} \
tcl_tstate = tstate;

#define LEAVE_TCL \
tcl_tstate = NULL; \
if(tcl_lock)PyThread_release_lock(tcl_lock); \
if (st->tcl_lock) { \
PyThread_release_lock(st->tcl_lock); \
} \
Py_END_ALLOW_THREADS}

#define ENTER_OVERLAP \
Py_END_ALLOW_THREADS

#define LEAVE_OVERLAP_TCL \
tcl_tstate = NULL; if(tcl_lock)PyThread_release_lock(tcl_lock); }
tcl_tstate = NULL; \
if (st->tcl_lock) { \
PyThread_release_lock(st->tcl_lock); \
} \
}

#define ENTER_PYTHON \
{ PyThreadState *tstate = tcl_tstate; tcl_tstate = NULL; \
if(tcl_lock) \
PyThread_release_lock(tcl_lock); \
module_state *st = GLOBAL_STATE(); \
if(st->tcl_lock) { \
PyThread_release_lock(st->tcl_lock); \
} \
PyEval_RestoreThread((tstate)); }

#define LEAVE_PYTHON \
{ PyThreadState *tstate = PyEval_SaveThread(); \
if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1); \
module_state *st = GLOBAL_STATE(); \
if (st->tcl_lock) { \
PyThread_acquire_lock(st->tcl_lock, 1); \
} \
tcl_tstate = tstate; }

#define CHECK_TCL_APPARTMENT \
Expand Down Expand Up @@ -589,10 +601,10 @@ Tkapp_New(const char *screenName, const char *className,
return 0;
}
#endif
if (v->threaded && tcl_lock) {
if (v->threaded && st->tcl_lock) {
/* If Tcl is threaded, we don't need the lock. */
PyThread_free_lock(tcl_lock);
tcl_lock = NULL;
PyThread_free_lock(st->tcl_lock);
st->tcl_lock = NULL;
}

v->OldBooleanType = Tcl_GetObjType("boolean");
Expand Down Expand Up @@ -2716,6 +2728,7 @@ _tkinter_tkapp_mainloop_impl(TkappObject *self, int threshold)
CHECK_TCL_APPARTMENT;
self->dispatching = 1;

module_state *st = GLOBAL_STATE();
quitMainLoop = 0;
while (Tk_GetNumMainWindows() > threshold &&
!quitMainLoop &&
Expand All @@ -2731,11 +2744,15 @@ _tkinter_tkapp_mainloop_impl(TkappObject *self, int threshold)
}
else {
Py_BEGIN_ALLOW_THREADS
if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1);
if (st->tcl_lock) {
PyThread_acquire_lock(st->tcl_lock, 1);
}
tcl_tstate = tstate;
result = Tcl_DoOneEvent(TCL_DONT_WAIT);
tcl_tstate = NULL;
if(tcl_lock)PyThread_release_lock(tcl_lock);
if (st->tcl_lock) {
PyThread_release_lock(st->tcl_lock);
}
if (result == 0)
Sleep(Tkinter_busywaitinterval);
Py_END_ALLOW_THREADS
Expand Down Expand Up @@ -3199,6 +3216,7 @@ EventHook(void)
tfile = fileno(stdin);
Tcl_CreateFileHandler(tfile, TCL_READABLE, MyFileProc, NULL);
#endif
module_state *st = GLOBAL_STATE();
while (!errorInCmd && !stdin_ready) {
int result;
#ifdef MS_WINDOWS
Expand All @@ -3208,13 +3226,17 @@ EventHook(void)
}
#endif
Py_BEGIN_ALLOW_THREADS
if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1);
if (st->tcl_lock) {
PyThread_acquire_lock(st->tcl_lock, 1);
}
tcl_tstate = event_tstate;

result = Tcl_DoOneEvent(TCL_DONT_WAIT);

tcl_tstate = NULL;
if(tcl_lock)PyThread_release_lock(tcl_lock);
if (st->tcl_lock) {
PyThread_release_lock(st->tcl_lock);
}
if (result == 0)
Sleep(Tkinter_busywaitinterval);
Py_END_ALLOW_THREADS
Expand Down Expand Up @@ -3276,8 +3298,9 @@ PyInit__tkinter(void)
{
PyObject *m, *uexe, *cexe, *o;

tcl_lock = PyThread_allocate_lock();
if (tcl_lock == NULL)
module_state *st = GLOBAL_STATE();
st->tcl_lock = PyThread_allocate_lock();
if (st->tcl_lock == NULL)
return NULL;

m = PyModule_Create(&_tkintermodule);
Expand All @@ -3294,7 +3317,6 @@ PyInit__tkinter(void)
Py_DECREF(m);
return NULL;
}
module_state *st = GLOBAL_STATE();
st->Tkinter_TclError = o;

if (PyModule_AddIntConstant(m, "READABLE", TCL_READABLE)) {
Expand Down
1 change: 1 addition & 0 deletions Modules/tkinter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ typedef struct {
PyObject *Tkapp_Type;
PyObject *Tktt_Type;
PyObject *Tkinter_TclError;
PyThread_type_lock tcl_lock;
} module_state;

extern module_state global_state;
Expand Down
1 change: 0 additions & 1 deletion Tools/c-analyzer/cpython/globals-to-fix.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,6 @@ Modules/arraymodule.c array_array___reduce_ex___impl array_reconstructor -
Modules/_asynciomodule.c - fi_freelist -
Modules/_asynciomodule.c - fi_freelist_len -
Modules/_ctypes/_ctypes.c - _ctypes_ptrtype_cache -
Modules/_tkinter.c - tcl_lock -
Modules/_tkinter.c - excInCmd -
Modules/_tkinter.c - valInCmd -
Modules/_tkinter.c - trbInCmd -
Expand Down