cpython-lru_cache-weakref: Python/pystate.c annotate

annotate Python/pystate.c @ 76451:ea46ebba8a0f

Issue #13959: Re-implement imp.source_from_cache() in Lib/imp.py.

author	Brett Cannon <brett@python.org>
date	Sat, 21 Apr 2012 18:52:52 -0400
parents	2dd046be2c88
children	eb68502731dd

rev	line source
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	1
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Thread and interpreter state structures and their interfaces */
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	3
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	4 #include "Python.h"
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	5
33713 517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	6 /* --------------------------------------------------------------------------
517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	7 CAUTION
517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	8
517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	9 Always use malloc() and free() directly in this file. A number of these
517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	10 functions are advertised as safe to call when the GIL isn't held, and in
517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	11 a debug build Python redirects (e.g.) PyMem_NEW (etc) to Python's debugging
517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	12 obmalloc functions. Those aren't thread-safe (they rely on the GIL to avoid
517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	13 the expense of doing their own locking).
517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	14 -------------------------------------------------------------------------- */
517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	15
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	16 #ifdef HAVE_DLOPEN
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	17 #ifdef HAVE_DLFCN_H
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	18 #include <dlfcn.h>
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	19 #endif
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	20 #ifndef RTLD_LAZY
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	21 #define RTLD_LAZY 1
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	22 #endif
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	23 #endif
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	24
76285 5cc359804d61 take linkage def outside of WITH_THREAD conditional (closes #14569) Benjamin Peterson <benjamin@python.org> parents: 73694 diff changeset	25 #ifdef __cplusplus
5cc359804d61 take linkage def outside of WITH_THREAD conditional (closes #14569) Benjamin Peterson <benjamin@python.org> parents: 73694 diff changeset	26 extern "C" {
5cc359804d61 take linkage def outside of WITH_THREAD conditional (closes #14569) Benjamin Peterson <benjamin@python.org> parents: 73694 diff changeset	27 #endif
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	28
11011 3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	29 #ifdef WITH_THREAD
3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	30 #include "pythread.h"
3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	31 static PyThread_type_lock head_mutex = NULL; /* Protects interp->tstate_head */
13866 dfdb601cee1c Removing warnings by gcc -Wall -- cast ugly \|\| to void. Moshe Zadka <moshez@math.huji.ac.il> parents: 13658 diff changeset	32 #define HEAD_INIT() (void)(head_mutex \|\| (head_mutex = PyThread_allocate_lock()))
11011 3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	33 #define HEAD_LOCK() PyThread_acquire_lock(head_mutex, WAIT_LOCK)
3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	34 #define HEAD_UNLOCK() PyThread_release_lock(head_mutex)
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	35
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	36 /* The single PyInterpreterState used by this process'
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	37 GILState implementation
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	38 */
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	39 static PyInterpreterState *autoInterpreterState = NULL;
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	40 static int autoTLSkey = 0;
11011 3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	41 #else
3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	42 #define HEAD_INIT() /* Nothing */
3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	43 #define HEAD_LOCK() /* Nothing */
3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	44 #define HEAD_UNLOCK() /* Nothing */
3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	45 #endif
3b3c7b8ade7f CRITICAL PATCH! Guido van Rossum <guido@python.org> parents: 9667 diff changeset	46
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	47 static PyInterpreterState *interp_head = NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	48
61184 4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer. Jeffrey Yasskin <jyasskin@gmail.com> parents: 59316 diff changeset	49 /* Assuming the current thread holds the GIL, this is the
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer. Jeffrey Yasskin <jyasskin@gmail.com> parents: 59316 diff changeset	50 PyThreadState for the current thread. */
4fd3ab5fa71d Make (most of) Python's tests pass under Thread Sanitizer. Jeffrey Yasskin <jyasskin@gmail.com> parents: 59316 diff changeset	51 _Py_atomic_address _PyThreadState_Current = {NULL};
27978 4b99a701defe - PyEval_GetFrame() is now declared to return a PyFrameObject * Guido van Rossum <guido@python.org> parents: 26109 diff changeset	52 PyThreadFrameGetter _PyThreadState_GetFrame = NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	53
35661 85651eb3d9a9 Forward port bugfix: Michael W. Hudson <mwh@python.net> parents: 35117 diff changeset	54 #ifdef WITH_THREAD
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	55 static void _PyGILState_NoteThreadState(PyThreadState* tstate);
35661 85651eb3d9a9 Forward port bugfix: Michael W. Hudson <mwh@python.net> parents: 35117 diff changeset	56 #endif
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	57
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	58
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	59 PyInterpreterState *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	60 PyInterpreterState_New(void)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	61 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	62 PyInterpreterState interp = (PyInterpreterState )
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	63 malloc(sizeof(PyInterpreterState));
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	64
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	65 if (interp != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	66 HEAD_INIT();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	67 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	68 if (head_mutex == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	69 Py_FatalError("Can't initialize threads for interpreter");
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	70 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	71 interp->modules = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	72 interp->modules_reloading = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	73 interp->modules_by_index = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	74 interp->sysdict = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	75 interp->builtins = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	76 interp->tstate_head = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	77 interp->codec_search_path = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	78 interp->codec_search_cache = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	79 interp->codec_error_registry = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	80 interp->codecs_initialized = 0;
69708 2caf82aee7a4 Issue #10914: Initialize correctly the filesystem codec when creating a new Victor Stinner <victor.stinner@haypocalc.com> parents: 69637 diff changeset	81 interp->fscodec_initialized = 0;
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 76292 diff changeset	82 interp->importlib = NULL;
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	83 #ifdef HAVE_DLOPEN
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	84 #ifdef RTLD_NOW
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	85 interp->dlopenflags = RTLD_NOW;
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	86 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	87 interp->dlopenflags = RTLD_LAZY;
18689 064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	88 #endif
064de84385ca Patch #412229: Add functions sys.getdlopenflags and sys.setdlopenflags. Martin v. Löwis <martin@v.loewis.de> parents: 18374 diff changeset	89 #endif
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	90 #ifdef WITH_TSC
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	91 interp->tscdump = 0;
32301 41c59d80bbc5 Patch #510695: Add TSC profiling for the VM. Martin v. Löwis <martin@v.loewis.de> parents: 31797 diff changeset	92 #endif
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	93
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	94 HEAD_LOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	95 interp->next = interp_head;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	96 interp_head = interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	97 HEAD_UNLOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	98 }
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	99
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	100 return interp;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	101 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	102
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	103
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	104 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	105 PyInterpreterState_Clear(PyInterpreterState *interp)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	106 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	107 PyThreadState *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	108 HEAD_LOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	109 for (p = interp->tstate_head; p != NULL; p = p->next)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	110 PyThreadState_Clear(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	111 HEAD_UNLOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	112 Py_CLEAR(interp->codec_search_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	113 Py_CLEAR(interp->codec_search_cache);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	114 Py_CLEAR(interp->codec_error_registry);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	115 Py_CLEAR(interp->modules);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	116 Py_CLEAR(interp->modules_by_index);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	117 Py_CLEAR(interp->modules_reloading);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	118 Py_CLEAR(interp->sysdict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	119 Py_CLEAR(interp->builtins);
76303 2dd046be2c88 Issue #2377: Make importlib the implementation of __import__(). Brett Cannon <brett@python.org> parents: 76292 diff changeset	120 Py_CLEAR(interp->importlib);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	121 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	122
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	123
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	124 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	125 zapthreads(PyInterpreterState *interp)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	126 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	127 PyThreadState *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	128 /* No need to lock the mutex here because this should only happen
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	129 when the threads are all really dead (XXX famous last words). */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	130 while ((p = interp->tstate_head) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	131 PyThreadState_Delete(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	132 }
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	133 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	134
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	135
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	136 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	137 PyInterpreterState_Delete(PyInterpreterState *interp)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	138 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	139 PyInterpreterState **p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	140 zapthreads(interp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	141 HEAD_LOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	142 for (p = &interp_head; ; p = &(*p)->next) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	143 if (*p == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	144 Py_FatalError(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	145 "PyInterpreterState_Delete: invalid interp");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	146 if (*p == interp)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	147 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	148 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	149 if (interp->tstate_head != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	150 Py_FatalError("PyInterpreterState_Delete: remaining threads");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	151 *p = interp->next;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	152 HEAD_UNLOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	153 free(interp);
73205 608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 69708 diff changeset	154 #ifdef WITH_THREAD
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 69708 diff changeset	155 if (interp_head == NULL && head_mutex != NULL) {
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 69708 diff changeset	156 PyThread_free_lock(head_mutex);
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 69708 diff changeset	157 head_mutex = NULL;
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 69708 diff changeset	158 }
608975eafe86 Issue #10363: Deallocate global locks in Py_Finalize(). Antoine Pitrou <solipsis@pitrou.net> parents: 69708 diff changeset	159 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	160 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	161
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	162
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 25111 diff changeset	163 /* Default implementation for _PyThreadState_GetFrame */
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 25111 diff changeset	164 static struct _frame *
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 25111 diff changeset	165 threadstate_getframe(PyThreadState *self)
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 25111 diff changeset	166 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	167 return self->frame;
26109 e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 25111 diff changeset	168 }
e61b946474df Assorted patches from Armin Rigo: Michael W. Hudson <mwh@python.net> parents: 25111 diff changeset	169
59317 d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	170 static PyThreadState *
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	171 new_threadstate(PyInterpreterState *interp, int init)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	172 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	173 PyThreadState tstate = (PyThreadState )malloc(sizeof(PyThreadState));
33713 517e4ec0df89 PyInterpreterState_New(), PyThreadState_New(): use malloc/free directly. Tim Peters <tim.peters@gmail.com> parents: 33711 diff changeset	174
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	175 if (_PyThreadState_GetFrame == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	176 _PyThreadState_GetFrame = threadstate_getframe;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	177
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	178 if (tstate != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	179 tstate->interp = interp;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	180
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	181 tstate->frame = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	182 tstate->recursion_depth = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	183 tstate->overflowed = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	184 tstate->recursion_critical = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	185 tstate->tracing = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	186 tstate->use_tracing = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	187 tstate->tick_counter = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	188 tstate->gilstate_counter = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	189 tstate->async_exc = NULL;
29842 014cc362aa91 Initialize thread_id to 0 in unthreaded build. Fixes #770247. Martin v. Löwis <martin@v.loewis.de> parents: 29643 diff changeset	190 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	191 tstate->thread_id = PyThread_get_thread_ident();
29842 014cc362aa91 Initialize thread_id to 0 in unthreaded build. Fixes #770247. Martin v. Löwis <martin@v.loewis.de> parents: 29643 diff changeset	192 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	193 tstate->thread_id = 0;
29842 014cc362aa91 Initialize thread_id to 0 in unthreaded build. Fixes #770247. Martin v. Löwis <martin@v.loewis.de> parents: 29643 diff changeset	194 #endif
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	195
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	196 tstate->dict = NULL;
7970 4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	197
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	198 tstate->curexc_type = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	199 tstate->curexc_value = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	200 tstate->curexc_traceback = NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	201
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	202 tstate->exc_type = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	203 tstate->exc_value = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	204 tstate->exc_traceback = NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	205
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	206 tstate->c_profilefunc = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	207 tstate->c_tracefunc = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	208 tstate->c_profileobj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	209 tstate->c_traceobj = NULL;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	210
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	211 if (init)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	212 _PyThreadState_Init(tstate);
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	213
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	214 HEAD_LOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	215 tstate->next = interp->tstate_head;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	216 interp->tstate_head = tstate;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	217 HEAD_UNLOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	218 }
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	219
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	220 return tstate;
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	221 }
8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	222
59317 d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	223 PyThreadState *
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	224 PyThreadState_New(PyInterpreterState *interp)
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	225 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	226 return new_threadstate(interp, 1);
59317 d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	227 }
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	228
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	229 PyThreadState *
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	230 _PyThreadState_Prealloc(PyInterpreterState *interp)
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	231 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	232 return new_threadstate(interp, 0);
59317 d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	233 }
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	234
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	235 void
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	236 _PyThreadState_Init(PyThreadState *tstate)
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	237 {
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	238 #ifdef WITH_THREAD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	239 _PyGILState_NoteThreadState(tstate);
59317 d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	240 #endif
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	241 }
d7a62c16505b Merged revisions 78639 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 49736 diff changeset	242
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44834 diff changeset	243 PyObject*
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44834 diff changeset	244 PyState_FindModule(struct PyModuleDef* m)
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44834 diff changeset	245 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	246 Py_ssize_t index = m->m_base.m_index;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	247 PyInterpreterState *state = PyThreadState_GET()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	248 PyObject *res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	249 if (index == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	250 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	251 if (state->modules_by_index == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	252 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	253 if (index > PyList_GET_SIZE(state->modules_by_index))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	254 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	255 res = PyList_GET_ITEM(state->modules_by_index, index);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	256 return res==Py_None ? NULL : res;
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44834 diff changeset	257 }
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44834 diff changeset	258
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44834 diff changeset	259 int
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44834 diff changeset	260 _PyState_AddModule(PyObject* module, struct PyModuleDef* def)
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44834 diff changeset	261 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	262 PyInterpreterState *state = PyThreadState_GET()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	263 if (!def)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	264 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	265 if (!state->modules_by_index) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	266 state->modules_by_index = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	267 if (!state->modules_by_index)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	268 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	269 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	270 while(PyList_GET_SIZE(state->modules_by_index) <= def->m_base.m_index)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	271 if (PyList_Append(state->modules_by_index, Py_None) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	272 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	273 Py_INCREF(module);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	274 return PyList_SetItem(state->modules_by_index,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	275 def->m_base.m_index, module);
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 44834 diff changeset	276 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	277
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	278 void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	279 PyThreadState_Clear(PyThreadState *tstate)
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	280 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	281 if (Py_VerboseFlag && tstate->frame != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	282 fprintf(stderr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	283 "PyThreadState_Clear: warning: thread still has a frame\n");
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	284
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	285 Py_CLEAR(tstate->frame);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	286
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	287 Py_CLEAR(tstate->dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	288 Py_CLEAR(tstate->async_exc);
7970 4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	289
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	290 Py_CLEAR(tstate->curexc_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	291 Py_CLEAR(tstate->curexc_value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	292 Py_CLEAR(tstate->curexc_traceback);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	293
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	294 Py_CLEAR(tstate->exc_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	295 Py_CLEAR(tstate->exc_value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	296 Py_CLEAR(tstate->exc_traceback);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	297
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	298 tstate->c_profilefunc = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	299 tstate->c_tracefunc = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	300 Py_CLEAR(tstate->c_profileobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	301 Py_CLEAR(tstate->c_traceobj);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	302 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	303
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	304
16139 d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	305 /* Common code for PyThreadState_Delete() and PyThreadState_DeleteCurrent() */
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	306 static void
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	307 tstate_delete_common(PyThreadState *tstate)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	308 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	309 PyInterpreterState *interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	310 PyThreadState **p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	311 PyThreadState *prev_p = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	312 if (tstate == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	313 Py_FatalError("PyThreadState_Delete: NULL tstate");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	314 interp = tstate->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	315 if (interp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	316 Py_FatalError("PyThreadState_Delete: NULL interp");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	317 HEAD_LOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	318 for (p = &interp->tstate_head; ; p = &(*p)->next) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	319 if (*p == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	320 Py_FatalError(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	321 "PyThreadState_Delete: invalid tstate");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	322 if (*p == tstate)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	323 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	324 /* Sanity check. These states should never happen but if
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	325 * they do we must abort. Otherwise we'll end up spinning in
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	326 * in a tight loop with the lock held. A similar check is done
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	327 * in thread.c find_key(). */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	328 if (*p == prev_p)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	329 Py_FatalError(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	330 "PyThreadState_Delete: small circular list(!)"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	331 " and tstate not found.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	332 prev_p = *p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	333 if ((*p)->next == interp->tstate_head)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	334 Py_FatalError(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	335 "PyThreadState_Delete: circular list(!) and"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	336 " tstate not found.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	337 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	338 *p = tstate->next;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	339 HEAD_UNLOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	340 free(tstate);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	341 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	342
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	343
16139 d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	344 void
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	345 PyThreadState_Delete(PyThreadState *tstate)
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	346 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	347 if (tstate == _Py_atomic_load_relaxed(&_PyThreadState_Current))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	348 Py_FatalError("PyThreadState_Delete: tstate is still current");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	349 tstate_delete_common(tstate);
36683 da2a1049215d Patch 1413181, by Gabriel Becedillas. Tim Peters <tim.peters@gmail.com> parents: 35661 diff changeset	350 #ifdef WITH_THREAD
64563 dc5986d0e5a4 Merged revisions 84623 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	351 if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	352 PyThread_delete_key_value(autoTLSkey);
36683 da2a1049215d Patch 1413181, by Gabriel Becedillas. Tim Peters <tim.peters@gmail.com> parents: 35661 diff changeset	353 #endif /* WITH_THREAD */
16139 d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	354 }
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	355
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	356
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	357 #ifdef WITH_THREAD
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	358 void
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	359 PyThreadState_DeleteCurrent()
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	360 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	361 PyThreadState tstate = (PyThreadState)_Py_atomic_load_relaxed(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	362 &_PyThreadState_Current);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	363 if (tstate == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	364 Py_FatalError(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	365 "PyThreadState_DeleteCurrent: no current tstate");
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	366 _Py_atomic_store_relaxed(&_PyThreadState_Current, NULL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	367 tstate_delete_common(tstate);
64563 dc5986d0e5a4 Merged revisions 84623 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	368 if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	369 PyThread_delete_key_value(autoTLSkey);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	370 PyEval_ReleaseLock();
16139 d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	371 }
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	372 #endif /* WITH_THREAD */
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	373
d96ce9708c00 Add a new API, PyThreadState_DeleteCurrent() that combines Guido van Rossum <guido@python.org> parents: 14378 diff changeset	374
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	375 PyThreadState *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	376 PyThreadState_Get(void)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	377 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	378 PyThreadState tstate = (PyThreadState)_Py_atomic_load_relaxed(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	379 &_PyThreadState_Current);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	380 if (tstate == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	381 Py_FatalError("PyThreadState_Get: no current thread");
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	382
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	383 return tstate;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	384 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	385
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	386
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	387 PyThreadState *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36683 diff changeset	388 PyThreadState_Swap(PyThreadState *newts)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	389 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	390 PyThreadState oldts = (PyThreadState)_Py_atomic_load_relaxed(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	391 &_PyThreadState_Current);
5926 8d2194e22e67 The last of the mass checkins for separate (sub)interpreters. Guido van Rossum <guido@python.org> parents: 5849 diff changeset	392
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	393 _Py_atomic_store_relaxed(&_PyThreadState_Current, newts);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	394 /* It should not be possible for more than one thread state
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	395 to be used for a thread. Check this the best we can in debug
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	396 builds.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	397 */
28914 33475661823d Patch #729300: Disable error message if Python is not built for threads. Martin v. Löwis <martin@v.loewis.de> parents: 28694 diff changeset	398 #if defined(Py_DEBUG) && defined(WITH_THREAD)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	399 if (newts) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	400 /* This can be called from PyEval_RestoreThread(). Similar
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	401 to it, we need to ensure errno doesn't change.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	402 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	403 int err = errno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	404 PyThreadState *check = PyGILState_GetThisThreadState();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	405 if (check && check->interp == newts->interp && check != newts)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	406 Py_FatalError("Invalid thread state for this thread");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	407 errno = err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	408 }
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	409 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	410 return oldts;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: diff changeset	411 }
7970 4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	412
4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	413 /* An extension mechanism to store arbitrary additional per-thread state.
4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	414 PyThreadState_GetDict() returns a dictionary that can be used to hold such
4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	415 state; the caller should pick a unique key and store its state there. If
28616 4f0b7acffc7d - pythunrun.c, Py_Finalize(): move the call to _Py_PrintReferences() Guido van Rossum <guido@python.org> parents: 28325 diff changeset	416 PyThreadState_GetDict() returns NULL, an exception has not been raised
4f0b7acffc7d - pythunrun.c, Py_Finalize(): move the call to _Py_PrintReferences() Guido van Rossum <guido@python.org> parents: 28325 diff changeset	417 and the caller should assume no per-thread state is available. */
7970 4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	418
4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	419 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	420 PyThreadState_GetDict(void)
7970 4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	421 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	422 PyThreadState tstate = (PyThreadState)_Py_atomic_load_relaxed(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	423 &_PyThreadState_Current);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	424 if (tstate == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	425 return NULL;
7970 4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	426
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	427 if (tstate->dict == NULL) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	428 PyObject *d;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	429 tstate->dict = d = PyDict_New();
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	430 if (d == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	431 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	432 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	433 return tstate->dict;
7970 4ceee1ef99b0 /* An extension mechanism to store arbitrary additional per-thread state. Guido van Rossum <guido@python.org> parents: 6549 diff changeset	434 }
18733 b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	435
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	436
29643 fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 28914 diff changeset	437 /* Asynchronously raise an exception in a thread.
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 28914 diff changeset	438 Requested by Just van Rossum and Alex Martelli.
34568 ff3ca656c281 Backport 2.39: Guido van Rossum <guido@python.org> parents: 33940 diff changeset	439 To prevent naive misuse, you must write your own extension
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	440 to call this, or use ctypes. Must be called with the GIL held.
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	441 Returns the number of tstates modified (normally 1, but 0 if `id` didn't
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	442 match any known thread id). Can be called with exc=NULL to clear an
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	443 existing async exception. This raises no exceptions. */
29643 fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 28914 diff changeset	444
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 28914 diff changeset	445 int
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 28914 diff changeset	446 PyThreadState_SetAsyncExc(long id, PyObject *exc) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	447 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	448 PyInterpreterState *interp = tstate->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	449 PyThreadState *p;
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	450
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	451 /* Although the GIL is held, a few C API functions can be called
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	452 * without the GIL held, and in particular some that create and
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	453 * destroy thread and interpreter states. Those can mutate the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	454 * list of thread states we're traversing, so to prevent that we lock
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	455 * head_mutex for the duration.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	456 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	457 HEAD_LOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	458 for (p = interp->tstate_head; p != NULL; p = p->next) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	459 if (p->thread_id == id) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	460 /* Tricky: we need to decref the current value
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	461 * (if any) in p->async_exc, but that can in turn
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	462 * allow arbitrary Python code to run, including
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	463 * perhaps calls to this function. To prevent
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	464 * deadlock, we need to release head_mutex before
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	465 * the decref.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	466 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	467 PyObject *old_exc = p->async_exc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	468 Py_XINCREF(exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	469 p->async_exc = exc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	470 HEAD_UNLOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	471 Py_XDECREF(old_exc);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	472 _PyEval_SignalAsyncExc();
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	473 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	474 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	475 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	476 HEAD_UNLOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	477 return 0;
29643 fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 28914 diff changeset	478 }
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 28914 diff changeset	479
fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 28914 diff changeset	480
18733 b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	481 /* Routines for advanced debuggers, requested by David Beazley.
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	482 Don't use unless you know what you are doing! */
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	483
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	484 PyInterpreterState *
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	485 PyInterpreterState_Head(void)
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	486 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	487 return interp_head;
18733 b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	488 }
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	489
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	490 PyInterpreterState *
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	491 PyInterpreterState_Next(PyInterpreterState *interp) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	492 return interp->next;
18733 b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	493 }
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	494
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	495 PyThreadState *
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	496 PyInterpreterState_ThreadHead(PyInterpreterState *interp) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	497 return interp->tstate_head;
18733 b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	498 }
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	499
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	500 PyThreadState *
b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	501 PyThreadState_Next(PyThreadState *tstate) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	502 return tstate->next;
18733 b0329649b8cf Add a low-level API to access interpreters, for David Beazley. Guido van Rossum <guido@python.org> parents: 18689 diff changeset	503 }
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	504
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	505 /* The implementation of sys._current_frames(). This is intended to be
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	506 called with the GIL held, as it will be when called via
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	507 sys._current_frames(). It's possible it would work fine even without
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	508 the GIL held, but haven't thought enough about that.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	509 */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	510 PyObject *
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	511 _PyThread_CurrentFrames(void)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	512 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	513 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	514 PyInterpreterState *i;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	515
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	516 result = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	517 if (result == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	518 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	519
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	520 /* for i in all interpreters:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	521 * for t in all of i's thread states:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	522 * if t's frame isn't NULL, map t's id to its frame
68585 bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 64563 diff changeset	523 * Because these lists can mutate even when the GIL is held, we
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	524 * need to grab head_mutex for the duration.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	525 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	526 HEAD_LOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	527 for (i = interp_head; i != NULL; i = i->next) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	528 PyThreadState *t;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	529 for (t = i->tstate_head; t != NULL; t = t->next) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	530 PyObject *id;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	531 int stat;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	532 struct _frame *frame = t->frame;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	533 if (frame == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	534 continue;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	535 id = PyLong_FromLong(t->thread_id);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	536 if (id == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	537 goto Fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	538 stat = PyDict_SetItem(result, id, (PyObject *)frame);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	539 Py_DECREF(id);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	540 if (stat < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	541 goto Fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	542 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	543 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	544 HEAD_UNLOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	545 return result;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	546
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	547 Fail:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	548 HEAD_UNLOCK();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	549 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	550 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	551 }
29643 fa97293533a9 Add PyThreadState_SetAsyncExc(long, PyObject ). Guido van Rossum <guido@python.org>* parents: 28914 diff changeset	552
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	553 /* Python "auto thread state" API. */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	554 #ifdef WITH_THREAD
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	555
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	556 /* Keep this as a static, as it is not reliable! It can only
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	557 ever be compared to the state for the current thread.
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	558 * If not equal, then it doesn't matter that the actual
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	559 value may change immediately after comparison, as it can't
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	560 possibly change to the current thread's state.
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	561 * If equal, then the current thread holds the lock, so the value can't
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	562 change until we yield the lock.
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	563 */
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	564 static int
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	565 PyThreadState_IsCurrent(PyThreadState *tstate)
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	566 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	567 /* Must be the tstate for this thread */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	568 assert(PyGILState_GetThisThreadState()==tstate);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61184 diff changeset	569 return tstate == _Py_atomic_load_relaxed(&_PyThreadState_Current);
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	570 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	571
33698 090ffcb83f0a Trim trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32301 diff changeset	572 /* Internal initialization/finalization functions called by
090ffcb83f0a Trim trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32301 diff changeset	573 Py_Initialize/Py_Finalize
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	574 */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33698 diff changeset	575 void
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33698 diff changeset	576 _PyGILState_Init(PyInterpreterState i, PyThreadState t)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	577 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	578 assert(i && t); /* must init with valid states */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	579 autoTLSkey = PyThread_create_key();
64844 8e428b8e7d81 issue 9786 Native TLS support for pthreads Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 64558 diff changeset	580 if (autoTLSkey == -1)
8e428b8e7d81 issue 9786 Native TLS support for pthreads Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 64558 diff changeset	581 Py_FatalError("Could not allocate TLS entry");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	582 autoInterpreterState = i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	583 assert(PyThread_get_key_value(autoTLSkey) == NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	584 assert(t->gilstate_counter == 0);
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	585
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	586 _PyGILState_NoteThreadState(t);
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	587 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	588
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33698 diff changeset	589 void
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33698 diff changeset	590 _PyGILState_Fini(void)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	591 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	592 PyThread_delete_key(autoTLSkey);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	593 autoInterpreterState = NULL;
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	594 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	595
73694 ba90839c4993 Issue #13156: _PyGILState_Reinit(): Re-associate the auto thread state with the Charles-François Natali <neologix@free.fr> parents: 73205 diff changeset	596 /* Reset the TLS key - called by PyOS_AfterFork().
69637 7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	597 * This should not be necessary, but some - buggy - pthread implementations
73694 ba90839c4993 Issue #13156: _PyGILState_Reinit(): Re-associate the auto thread state with the Charles-François Natali <neologix@free.fr> parents: 73205 diff changeset	598 * don't reset TLS upon fork(), see issue #10517.
69637 7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	599 */
7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	600 void
7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	601 _PyGILState_Reinit(void)
7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	602 {
7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	603 PyThreadState *tstate = PyGILState_GetThisThreadState();
7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	604 PyThread_delete_key(autoTLSkey);
7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	605 if ((autoTLSkey = PyThread_create_key()) == -1)
7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	606 Py_FatalError("Could not allocate TLS entry");
7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	607
73694 ba90839c4993 Issue #13156: _PyGILState_Reinit(): Re-associate the auto thread state with the Charles-François Natali <neologix@free.fr> parents: 73205 diff changeset	608 /* If the thread had an associated auto thread state, reassociate it with
ba90839c4993 Issue #13156: _PyGILState_Reinit(): Re-associate the auto thread state with the Charles-François Natali <neologix@free.fr> parents: 73205 diff changeset	609 * the new key. */
ba90839c4993 Issue #13156: _PyGILState_Reinit(): Re-associate the auto thread state with the Charles-François Natali <neologix@free.fr> parents: 73205 diff changeset	610 if (tstate && PyThread_set_key_value(autoTLSkey, (void *)tstate) < 0)
69637 7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	611 Py_FatalError("Couldn't create autoTLSkey mapping");
7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	612 }
7b7ad9a88451 Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_* Antoine Pitrou <solipsis@pitrou.net> parents: 68586 diff changeset	613
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	614 /* When a thread state is created for a thread by some mechanism other than
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	615 PyGILState_Ensure, it's important that the GILState machinery knows about
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	616 it so it doesn't try to create another thread state for the thread (this is
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	617 a better fix for SF bug #1010677 than the first one attempted).
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	618 */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	619 static void
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	620 _PyGILState_NoteThreadState(PyThreadState* tstate)
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	621 {
64563 dc5986d0e5a4 Merged revisions 84623 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	622 /* If autoTLSkey isn't initialized, this must be the very first
dc5986d0e5a4 Merged revisions 84623 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	623 threadstate created in Py_Initialize(). Don't do anything for now
dc5986d0e5a4 Merged revisions 84623 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	624 (we'll be back here when _PyGILState_Init is called). */
dc5986d0e5a4 Merged revisions 84623 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	625 if (!autoInterpreterState)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	626 return;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	627
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	628 /* Stick the thread state for this thread in thread local storage.
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	629
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	630 The only situation where you can legitimately have more than one
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	631 thread state for an OS level thread is when there are multiple
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	632 interpreters, when:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	633
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	634 a) You shouldn't really be using the PyGILState_ APIs anyway,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	635 and:
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	636
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	637 b) The slightly odd way PyThread_set_key_value works (see
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	638 comments by its implementation) means that the first thread
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	639 state created for that given OS level thread will "win",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	640 which seems reasonable behaviour.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	641 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	642 if (PyThread_set_key_value(autoTLSkey, (void *)tstate) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	643 Py_FatalError("Couldn't create autoTLSkey mapping");
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	644
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	645 /* PyGILState_Release must not try to delete this thread state. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	646 tstate->gilstate_counter = 1;
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	647 }
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35095 diff changeset	648
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	649 /* The public functions */
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33698 diff changeset	650 PyThreadState *
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33698 diff changeset	651 PyGILState_GetThisThreadState(void)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	652 {
64563 dc5986d0e5a4 Merged revisions 84623 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	653 if (autoInterpreterState == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	654 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	655 return (PyThreadState *)PyThread_get_key_value(autoTLSkey);
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	656 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	657
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33698 diff changeset	658 PyGILState_STATE
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33698 diff changeset	659 PyGILState_Ensure(void)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	660 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	661 int current;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	662 PyThreadState *tcur;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	663 /* Note that we do not auto-init Python here - apart from
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	664 potential races with 2 threads auto-initializing, pep-311
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	665 spells out other issues. Embedders are expected to have
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	666 called Py_Initialize() and usually PyEval_InitThreads().
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	667 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	668 assert(autoInterpreterState); /* Py_Initialize() hasn't been called! */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	669 tcur = (PyThreadState *)PyThread_get_key_value(autoTLSkey);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	670 if (tcur == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	671 /* Create a new thread state for this thread */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	672 tcur = PyThreadState_New(autoInterpreterState);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	673 if (tcur == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	674 Py_FatalError("Couldn't create thread-state for new thread");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	675 /* This is our thread state! We'll need to delete it in the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	676 matching call to PyGILState_Release(). */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	677 tcur->gilstate_counter = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	678 current = 0; /* new thread state is never current */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	679 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	680 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	681 current = PyThreadState_IsCurrent(tcur);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	682 if (current == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	683 PyEval_RestoreThread(tcur);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	684 /* Update our counter in the thread-state - no need for locks:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	685 - tcur will remain valid as we hold the GIL.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	686 - the counter is safe as we are the only thread "allowed"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	687 to modify this value
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	688 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	689 ++tcur->gilstate_counter;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	690 return current ? PyGILState_LOCKED : PyGILState_UNLOCKED;
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	691 }
a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	692
33699 0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33698 diff changeset	693 void
0c26db381673 Style guide & consistency changes. No semantic changes. Tim Peters <tim.peters@gmail.com> parents: 33698 diff changeset	694 PyGILState_Release(PyGILState_STATE oldstate)
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	695 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	696 PyThreadState tcur = (PyThreadState )PyThread_get_key_value(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	697 autoTLSkey);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	698 if (tcur == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	699 Py_FatalError("auto-releasing thread-state, "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	700 "but no thread-state for this thread");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	701 /* We must hold the GIL and have our thread state current */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	702 /* XXX - remove the check - the assert should be fine,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	703 but while this is very new (April 2003), the extra check
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	704 by release-only users can't hurt.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	705 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	706 if (! PyThreadState_IsCurrent(tcur))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	707 Py_FatalError("This thread state must be current when releasing");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	708 assert(PyThreadState_IsCurrent(tcur));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	709 --tcur->gilstate_counter;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	710 assert(tcur->gilstate_counter >= 0); /* illegal counter value */
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	711
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	712 /* If we're going to destroy this thread-state, we must
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	713 * clear it while the GIL is held, as destructors may run.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	714 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	715 if (tcur->gilstate_counter == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	716 /* can't have been locked when we created it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	717 assert(oldstate == PyGILState_UNLOCKED);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	718 PyThreadState_Clear(tcur);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	719 /* Delete the thread-state. Note this releases the GIL too!
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	720 * It's vital that the GIL be held here, to avoid shutdown
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	721 * races; see bugs 225673 and 1061968 (that nasty bug has a
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	722 * habit of coming back).
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	723 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	724 PyThreadState_DeleteCurrent();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	725 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	726 /* Release the lock if necessary */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	727 else if (oldstate == PyGILState_UNLOCKED)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	728 PyEval_SaveThread();
28694 a4154dd5939a New PyGILState_ API - implements pep 311, from patch 684256. Mark Hammond <mhammond@skippinet.com.au> parents: 28616 diff changeset	729 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36683 diff changeset	730
76291 49f52d14b65c move outside WITH_THREAD conditional Benjamin Peterson <benjamin@python.org> parents: 76285 diff changeset	731 #endif /* WITH_THREAD */
49f52d14b65c move outside WITH_THREAD conditional Benjamin Peterson <benjamin@python.org> parents: 76285 diff changeset	732
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36683 diff changeset	733 #ifdef __cplusplus
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36683 diff changeset	734 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36683 diff changeset	735 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36683 diff changeset	736
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36683 diff changeset	737

Mercurial > cpython-lru_cache-weakref

annotate Python/pystate.c @ 76451:ea46ebba8a0f