cpython-lru_cache-weakref: Modules/threadmodule.c annotate

annotate Modules/threadmodule.c @ 76067:d552016fc07c 2.7

protect this call, too

author	Benjamin Peterson <benjamin@python.org>
date	Mon, 02 Apr 2012 11:18:18 -0400
parents	8609d7fcdcc7
children	20f0c5398e97

rev	line source
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Thread module */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	3 /* Interface to Sjoerd's portable C thread library */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	4
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	5 #include "Python.h"
55704 e21c4c527e66 Add weakref support to the thread.lock type. Gregory P. Smith <greg@mad-scientist.com> parents: 54321 diff changeset	6 #include "structmember.h" /* offsetof */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	7
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	8 #ifndef WITH_THREAD
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	9 #error "Error! The rest of Python is not compiled with thread support."
25127 5165a0ee84c6 --with(out)-thread is deprecated according to configure --help Neal Norwitz <nnorwitz@gmail.com> parents: 24471 diff changeset	10 #error "Rerun configure, adding a --with-threads option."
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	11 #error "Then run `make clean' followed by `make'."
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	12 #endif
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	13
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 8823 diff changeset	14 #include "pythread.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	15
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	16 static PyObject *ThreadError;
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	17 static PyObject *str_dict;
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	18 static long nb_threads = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	19
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	20 /* Lock objects */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	21
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	22 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	23 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	24 PyThread_type_lock lock_lock;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	25 PyObject *in_weakreflist;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	26 } lockobject;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	27
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	28 static void
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	29 lock_dealloc(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	30 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	31 if (self->in_weakreflist != NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	32 PyObject_ClearWeakRefs((PyObject *) self);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	33 if (self->lock_lock != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	34 /* Unlock the lock so it's safe to free it */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	35 PyThread_acquire_lock(self->lock_lock, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	36 PyThread_release_lock(self->lock_lock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	37
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	38 PyThread_free_lock(self->lock_lock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	39 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	40 PyObject_Del(self);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	41 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	42
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	43 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	44 lock_PyThread_acquire_lock(lockobject self, PyObject args)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	45 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	46 int i = 1;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	47
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	48 if (!PyArg_ParseTuple(args, "\|i:acquire", &i))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	49 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	50
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	51 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	52 i = PyThread_acquire_lock(self->lock_lock, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	53 Py_END_ALLOW_THREADS
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	54
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	55 return PyBool_FromLong((long)i);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	56 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	57
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	58 PyDoc_STRVAR(acquire_doc,
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	59 "acquire([wait]) -> None or bool\n\
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36895 diff changeset	60 (acquire_lock() is an obsolete synonym)\n\
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	61 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	62 Lock the lock. Without argument, this blocks if the lock is already\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	63 locked (even by the same thread), waiting for another thread to release\n\
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	64 the lock, and return None once the lock is acquired.\n\
7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	65 With an argument, this will only block if the argument is true,\n\
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	66 and the return value reflects whether the lock is acquired.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	67 The blocking operation is not interruptible.");
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	68
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	69 static PyObject *
22561 043ad7adc896 Remove many uses of PyArg_NoArgs macro, change METH_OLDARGS to METH_NOARGS. Neal Norwitz <nnorwitz@gmail.com> parents: 21313 diff changeset	70 lock_PyThread_release_lock(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	71 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	72 /* Sanity check: the lock must be locked */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	73 if (PyThread_acquire_lock(self->lock_lock, 0)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	74 PyThread_release_lock(self->lock_lock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	75 PyErr_SetString(ThreadError, "release unlocked lock");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	76 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	77 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	78
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	79 PyThread_release_lock(self->lock_lock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	80 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	81 return Py_None;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	82 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	83
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	84 PyDoc_STRVAR(release_doc,
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	85 "release()\n\
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36895 diff changeset	86 (release_lock() is an obsolete synonym)\n\
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	87 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	88 Release the lock, allowing another thread that is blocked waiting for\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	89 the lock to acquire the lock. The lock must be in the locked state,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	90 but it needn't be locked by the same thread that unlocks it.");
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	91
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	92 static PyObject *
22561 043ad7adc896 Remove many uses of PyArg_NoArgs macro, change METH_OLDARGS to METH_NOARGS. Neal Norwitz <nnorwitz@gmail.com> parents: 21313 diff changeset	93 lock_locked_lock(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	94 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	95 if (PyThread_acquire_lock(self->lock_lock, 0)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	96 PyThread_release_lock(self->lock_lock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	97 return PyBool_FromLong(0L);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	98 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	99 return PyBool_FromLong(1L);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	100 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	101
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	102 PyDoc_STRVAR(locked_doc,
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	103 "locked() -> bool\n\
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	104 (locked_lock() is an obsolete synonym)\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	105 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	106 Return whether the lock is in the locked state.");
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	107
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	108 static PyMethodDef lock_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	109 {"acquire_lock", (PyCFunction)lock_PyThread_acquire_lock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	110 METH_VARARGS, acquire_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	111 {"acquire", (PyCFunction)lock_PyThread_acquire_lock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	112 METH_VARARGS, acquire_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	113 {"release_lock", (PyCFunction)lock_PyThread_release_lock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	114 METH_NOARGS, release_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	115 {"release", (PyCFunction)lock_PyThread_release_lock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	116 METH_NOARGS, release_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	117 {"locked_lock", (PyCFunction)lock_locked_lock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	118 METH_NOARGS, locked_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	119 {"locked", (PyCFunction)lock_locked_lock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	120 METH_NOARGS, locked_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	121 {"__enter__", (PyCFunction)lock_PyThread_acquire_lock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	122 METH_VARARGS, acquire_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	123 {"__exit__", (PyCFunction)lock_PyThread_release_lock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	124 METH_VARARGS, release_doc},
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	125 {NULL} /* sentinel */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	126 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	127
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	128 static PyTypeObject Locktype = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	129 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	130 "thread.lock", /tp_name/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	131 sizeof(lockobject), /tp_size/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	132 0, /tp_itemsize/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	133 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	134 (destructor)lock_dealloc, /tp_dealloc/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	135 0, /tp_print/
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	136 0, /tp_getattr/
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	137 0, /tp_setattr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	138 0, /tp_compare/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	139 0, /tp_repr/
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	140 0, /* tp_as_number */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	141 0, /* tp_as_sequence */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	142 0, /* tp_as_mapping */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	143 0, /* tp_hash */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	144 0, /* tp_call */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	145 0, /* tp_str */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	146 0, /* tp_getattro */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	147 0, /* tp_setattro */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	148 0, /* tp_as_buffer */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	149 Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	150 0, /* tp_doc */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	151 0, /* tp_traverse */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	152 0, /* tp_clear */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	153 0, /* tp_richcompare */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	154 offsetof(lockobject, in_weakreflist), /* tp_weaklistoffset */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	155 0, /* tp_iter */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	156 0, /* tp_iternext */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	157 lock_methods, /* tp_methods */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	158 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	159
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	160 static lockobject *
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	161 newlockobject(void)
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	162 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	163 lockobject *self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	164 self = PyObject_New(lockobject, &Locktype);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	165 if (self == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	166 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	167 self->lock_lock = PyThread_allocate_lock();
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	168 self->in_weakreflist = NULL;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	169 if (self->lock_lock == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	170 Py_DECREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	171 PyErr_SetString(ThreadError, "can't allocate lock");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	172 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	173 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	174 return self;
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	175 }
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	176
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	177 /* Thread-local objects */
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	178
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	179 #include "structmember.h"
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	180
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	181 /* Quick overview:
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	182
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	183 We need to be able to reclaim reference cycles as soon as possible
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	184 (both when a thread is being terminated, or a thread-local object
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	185 becomes unreachable from user data). Constraints:
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	186 - it must not be possible for thread-state dicts to be involved in
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	187 reference cycles (otherwise the cyclic GC will refuse to consider
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	188 objects referenced from a reachable thread-state dict, even though
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	189 local_dealloc would clear them)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	190 - the death of a thread-state dict must still imply destruction of the
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	191 corresponding local dicts in all thread-local objects.
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	192
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	193 Our implementation uses small "localdummy" objects in order to break
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	194 the reference chain. These trivial objects are hashable (using the
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	195 default scheme of identity hashing) and weakrefable.
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	196 Each thread-state holds a separate localdummy for each local object
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	197 (as a /strong reference/),
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	198 and each thread-local object holds a dict mapping /weak references/
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	199 of localdummies to local dicts.
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	200
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	201 Therefore:
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	202 - only the thread-state dict holds a strong reference to the dummies
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	203 - only the thread-local object holds a strong reference to the local dicts
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	204 - only outside objects (application- or library-level) hold strong
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	205 references to the thread-local objects
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	206 - as soon as a thread-state dict is destroyed, the weakref callbacks of all
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	207 dummies attached to that thread are called, and destroy the corresponding
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	208 local dicts from thread-local objects
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	209 - as soon as a thread-local object is destroyed, its local dicts are
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	210 destroyed and its dummies are manually removed from all thread states
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	211 - the GC can do its work correctly when a thread-local object is dangling,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	212 without any interference from the thread-state dicts
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	213
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	214 As an additional optimization, each localdummy holds a borrowed reference
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	215 to the corresponding localdict. This borrowed reference is only used
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	216 by the thread-local object which has created the localdummy, which should
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	217 guarantee that the localdict still exists when accessed.
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	218 */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	219
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	220 typedef struct {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	221 PyObject_HEAD
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	222 PyObject localdict; / Borrowed reference! */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	223 PyObject weakreflist; / List of weak references to self */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	224 } localdummyobject;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	225
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	226 static void
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	227 localdummy_dealloc(localdummyobject *self)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	228 {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	229 if (self->weakreflist != NULL)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	230 PyObject_ClearWeakRefs((PyObject *) self);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	231 Py_TYPE(self)->tp_free((PyObject*)self);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	232 }
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	233
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	234 static PyTypeObject localdummytype = {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	235 PyVarObject_HEAD_INIT(NULL, 0)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	236 /* tp_name */ "_thread._localdummy",
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	237 /* tp_basicsize */ sizeof(localdummyobject),
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	238 /* tp_itemsize */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	239 /* tp_dealloc */ (destructor)localdummy_dealloc,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	240 /* tp_print */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	241 /* tp_getattr */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	242 /* tp_setattr */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	243 /* tp_reserved */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	244 /* tp_repr */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	245 /* tp_as_number */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	246 /* tp_as_sequence */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	247 /* tp_as_mapping */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	248 /* tp_hash */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	249 /* tp_call */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	250 /* tp_str */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	251 /* tp_getattro */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	252 /* tp_setattro */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	253 /* tp_as_buffer */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	254 /* tp_flags */ Py_TPFLAGS_DEFAULT,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	255 /* tp_doc */ "Thread-local dummy",
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	256 /* tp_traverse */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	257 /* tp_clear */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	258 /* tp_richcompare */ 0,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	259 /* tp_weaklistoffset */ offsetof(localdummyobject, weakreflist)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	260 };
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	261
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	262
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	263 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	264 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	265 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	266 PyObject *args;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	267 PyObject *kw;
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	268 PyObject weakreflist; / List of weak references to self */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	269 /* A {localdummy weakref -> localdict} dict */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	270 PyObject *dummies;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	271 /* The callback for weakrefs to localdummies */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	272 PyObject *wr_callback;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	273 } localobject;
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	274
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	275 /* Forward declaration */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	276 static PyObject _ldict(localobject self);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	277 static PyObject _localdummy_destroyed(PyObject meth_self, PyObject *dummyweakref);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	278
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	279 /* Create and register the dummy for the current thread.
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	280 Returns a borrowed reference of the corresponding local dict */
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	281 static PyObject *
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	282 _local_create_dummy(localobject *self)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	283 {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	284 PyObject tdict, ldict = NULL, *wr = NULL;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	285 localdummyobject *dummy = NULL;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	286 int r;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	287
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	288 tdict = PyThreadState_GetDict();
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	289 if (tdict == NULL) {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	290 PyErr_SetString(PyExc_SystemError,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	291 "Couldn't get thread-state dictionary");
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	292 goto err;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	293 }
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	294
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	295 ldict = PyDict_New();
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	296 if (ldict == NULL)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	297 goto err;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	298 dummy = (localdummyobject *) localdummytype.tp_alloc(&localdummytype, 0);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	299 if (dummy == NULL)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	300 goto err;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	301 dummy->localdict = ldict;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	302 wr = PyWeakref_NewRef((PyObject *) dummy, self->wr_callback);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	303 if (wr == NULL)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	304 goto err;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	305
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	306 /* As a side-effect, this will cache the weakref's hash before the
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	307 dummy gets deleted */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	308 r = PyDict_SetItem(self->dummies, wr, ldict);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	309 if (r < 0)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	310 goto err;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	311 Py_CLEAR(wr);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	312 r = PyDict_SetItem(tdict, self->key, (PyObject *) dummy);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	313 if (r < 0)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	314 goto err;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	315 Py_CLEAR(dummy);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	316
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	317 Py_DECREF(ldict);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	318 return ldict;
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	319
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	320 err:
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	321 Py_XDECREF(ldict);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	322 Py_XDECREF(wr);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	323 Py_XDECREF(dummy);
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	324 return NULL;
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	325 }
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	326
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	327 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	328 local_new(PyTypeObject type, PyObject args, PyObject *kw)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	329 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	330 localobject *self;
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	331 PyObject *wr;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	332 static PyMethodDef wr_callback_def = {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	333 "_localdummy_destroyed", (PyCFunction) _localdummy_destroyed, METH_O
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	334 };
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	335
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	336 if (type->tp_init == PyBaseObject_Type.tp_init
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	337 && ((args && PyObject_IsTrue(args))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	338 \|\| (kw && PyObject_IsTrue(kw)))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	339 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	340 "Initialization arguments are not supported");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	341 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	342 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	343
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	344 self = (localobject *)type->tp_alloc(type, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	345 if (self == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	346 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	347
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	348 Py_XINCREF(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	349 self->args = args;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	350 Py_XINCREF(kw);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	351 self->kw = kw;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	352 self->key = PyString_FromFormat("thread.local.%p", self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	353 if (self->key == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	354 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	355
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	356 self->dummies = PyDict_New();
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	357 if (self->dummies == NULL)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	358 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	359
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	360 /* We use a weak reference to self in the callback closure
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	361 in order to avoid spurious reference cycles */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	362 wr = PyWeakref_NewRef((PyObject *) self, NULL);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	363 if (wr == NULL)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	364 goto err;
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	365 self->wr_callback = PyCFunction_New(&wr_callback_def, wr);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	366 Py_DECREF(wr);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	367 if (self->wr_callback == NULL)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	368 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	369
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	370 if (_local_create_dummy(self) == NULL)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	371 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	372
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	373 return (PyObject *)self;
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	374
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	375 err:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	376 Py_DECREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	377 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	378 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	379
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	380 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	381 local_traverse(localobject self, visitproc visit, void arg)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	382 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	383 Py_VISIT(self->args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	384 Py_VISIT(self->kw);
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	385 Py_VISIT(self->dummies);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	386 return 0;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	387 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	388
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	389 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	390 local_clear(localobject *self)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	391 {
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	392 PyThreadState *tstate;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	393 Py_CLEAR(self->args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	394 Py_CLEAR(self->kw);
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	395 Py_CLEAR(self->dummies);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	396 Py_CLEAR(self->wr_callback);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	397 /* Remove all strong references to dummies from the thread states */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	398 if (self->key
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	399 && (tstate = PyThreadState_Get())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	400 && tstate->interp) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	401 for(tstate = PyInterpreterState_ThreadHead(tstate->interp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	402 tstate;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	403 tstate = PyThreadState_Next(tstate))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	404 if (tstate->dict &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	405 PyDict_GetItem(tstate->dict, self->key))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	406 PyDict_DelItem(tstate->dict, self->key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	407 }
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	408 return 0;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	409 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	410
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	411 static void
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	412 local_dealloc(localobject *self)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	413 {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	414 /* Weakrefs must be invalidated right now, otherwise they can be used
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	415 from code called below, which is very dangerous since Py_REFCNT(self) == 0 */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	416 if (self->weakreflist != NULL)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	417 PyObject_ClearWeakRefs((PyObject *) self);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	418
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	419 PyObject_GC_UnTrack(self);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	420
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	421 local_clear(self);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	422 Py_XDECREF(self->key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	423 Py_TYPE(self)->tp_free((PyObject*)self);
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	424 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	425
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	426 /* Returns a borrowed reference to the local dict, creating it if necessary */
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	427 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	428 _ldict(localobject *self)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	429 {
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	430 PyObject tdict, ldict, *dummy;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	431
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	432 tdict = PyThreadState_GetDict();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	433 if (tdict == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	434 PyErr_SetString(PyExc_SystemError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	435 "Couldn't get thread-state dictionary");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	436 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	437 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	438
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	439 dummy = PyDict_GetItem(tdict, self->key);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	440 if (dummy == NULL) {
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	441 ldict = _local_create_dummy(self);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	442 if (ldict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	443 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	444
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	445 if (Py_TYPE(self)->tp_init != PyBaseObject_Type.tp_init &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	446 Py_TYPE(self)->tp_init((PyObject*)self,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	447 self->args, self->kw) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	448 /* we need to get rid of ldict from thread so
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	449 we create a new one the next time we do an attr
68503 ee5350f1d0c2 #11515: fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 68256 diff changeset	450 access */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	451 PyDict_DelItem(tdict, self->key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	452 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	453 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	454 }
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	455 else {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	456 assert(Py_TYPE(dummy) == &localdummytype);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	457 ldict = ((localdummyobject *) dummy)->localdict;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	458 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	459
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	460 return ldict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	461 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	462
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	463 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	464 local_setattro(localobject self, PyObject name, PyObject *v)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	465 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	466 PyObject *ldict;
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	467 int r;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	468
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	469 ldict = _ldict(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	470 if (ldict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	471 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	472
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	473 r = PyObject_RichCompareBool(name, str_dict, Py_EQ);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	474 if (r == 1) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	475 PyErr_Format(PyExc_AttributeError,
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	476 "'%.50s' object attribute '__dict__' is read-only",
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	477 Py_TYPE(self)->tp_name);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	478 return -1;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	479 }
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	480 if (r == -1)
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	481 return -1;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	482
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	483 return _PyObject_GenericSetAttrWithDict((PyObject *)self, name, v, ldict);
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	484 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	485
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	486 static PyObject local_getattro(localobject , PyObject *);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	487
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	488 static PyTypeObject localtype = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	489 PyVarObject_HEAD_INIT(NULL, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	490 /* tp_name */ "thread._local",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	491 /* tp_basicsize */ sizeof(localobject),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	492 /* tp_itemsize */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	493 /* tp_dealloc */ (destructor)local_dealloc,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	494 /* tp_print */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	495 /* tp_getattr */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	496 /* tp_setattr */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	497 /* tp_compare */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	498 /* tp_repr */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	499 /* tp_as_number */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	500 /* tp_as_sequence */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	501 /* tp_as_mapping */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	502 /* tp_hash */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	503 /* tp_call */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	504 /* tp_str */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	505 /* tp_getattro */ (getattrofunc)local_getattro,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	506 /* tp_setattro */ (setattrofunc)local_setattro,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	507 /* tp_as_buffer */ 0,
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	508 /* tp_flags */ Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	509 \| Py_TPFLAGS_HAVE_GC,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	510 /* tp_doc */ "Thread-local data",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	511 /* tp_traverse */ (traverseproc)local_traverse,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	512 /* tp_clear */ (inquiry)local_clear,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	513 /* tp_richcompare */ 0,
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	514 /* tp_weaklistoffset */ offsetof(localobject, weakreflist),
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	515 /* tp_iter */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	516 /* tp_iternext */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	517 /* tp_methods */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	518 /* tp_members */ 0,
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	519 /* tp_getset */ 0,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	520 /* tp_base */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	521 /* tp_dict / 0, / internal use */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	522 /* tp_descr_get */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	523 /* tp_descr_set */ 0,
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	524 /* tp_dictoffset */ 0,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	525 /* tp_init */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	526 /* tp_alloc */ 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	527 /* tp_new */ local_new,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	528 /* tp_free / 0, / Low-level free-mem routine */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	529 /* tp_is_gc / 0, / For PyObject_IS_GC */
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	530 };
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	531
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	532 static PyObject *
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	533 local_getattro(localobject self, PyObject name)
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	534 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	535 PyObject ldict, value;
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	536 int r;
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	537
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	538 ldict = _ldict(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	539 if (ldict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	540 return NULL;
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	541
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	542 r = PyObject_RichCompareBool(name, str_dict, Py_EQ);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	543 if (r == 1) {
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	544 Py_INCREF(ldict);
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	545 return ldict;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	546 }
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	547 if (r == -1)
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	548 return NULL;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	549
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	550 if (Py_TYPE(self) != &localtype)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	551 /* use generic lookup for subtypes */
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	552 return _PyObject_GenericGetAttrWithDict((PyObject *)self, name, ldict);
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	553
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	554 /* Optimization: just look in dict ourselves */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	555 value = PyDict_GetItem(ldict, name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	556 if (value == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	557 /* Fall back on generic to get __class__ and __dict__ */
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	558 return _PyObject_GenericGetAttrWithDict((PyObject *)self, name, ldict);
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	559
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	560 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	561 return value;
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	562 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	563
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	564 /* Called when a dummy is destroyed. */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	565 static PyObject *
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	566 _localdummy_destroyed(PyObject localweakref, PyObject dummyweakref)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	567 {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	568 PyObject *obj;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	569 localobject *self;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	570 assert(PyWeakref_CheckRef(localweakref));
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	571 obj = PyWeakref_GET_OBJECT(localweakref);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	572 if (obj == Py_None)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	573 Py_RETURN_NONE;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	574 Py_INCREF(obj);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	575 assert(PyObject_TypeCheck(obj, &localtype));
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	576 /* If the thread-local object is still alive and not being cleared,
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	577 remove the corresponding local dict */
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	578 self = (localobject *) obj;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	579 if (self->dummies != NULL) {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	580 PyObject *ldict;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	581 ldict = PyDict_GetItem(self->dummies, dummyweakref);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	582 if (ldict != NULL) {
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	583 PyDict_DelItem(self->dummies, dummyweakref);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	584 }
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	585 if (PyErr_Occurred())
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	586 PyErr_WriteUnraisable(obj);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	587 }
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	588 Py_DECREF(obj);
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	589 Py_RETURN_NONE;
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	590 }
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	591
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	592 /* Module functions */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	593
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	594 struct bootstate {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	595 PyInterpreterState *interp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	596 PyObject *func;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	597 PyObject *args;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	598 PyObject *keyw;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	599 PyThreadState *tstate;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	600 };
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	601
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	602 static void
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	603 t_bootstrap(void *boot_raw)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	604 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	605 struct bootstate boot = (struct bootstate ) boot_raw;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	606 PyThreadState *tstate;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	607 PyObject *res;
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35086 diff changeset	608
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	609 tstate = boot->tstate;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	610 tstate->thread_id = PyThread_get_thread_ident();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	611 _PyThreadState_Init(tstate);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	612 PyEval_AcquireThread(tstate);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	613 nb_threads++;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	614 res = PyEval_CallObjectWithKeywords(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	615 boot->func, boot->args, boot->keyw);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	616 if (res == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	617 if (PyErr_ExceptionMatches(PyExc_SystemExit))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	618 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	619 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	620 PyObject *file;
76066 8609d7fcdcc7 prevent writing to stderr from messing up the exception state (closes #14474) Benjamin Peterson <benjamin@python.org> parents: 70578 diff changeset	621 PyObject exc, value, *tb;
8609d7fcdcc7 prevent writing to stderr from messing up the exception state (closes #14474) Benjamin Peterson <benjamin@python.org> parents: 70578 diff changeset	622 PyErr_Fetch(&exc, &value, &tb);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	623 PySys_WriteStderr(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	624 "Unhandled exception in thread started by ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	625 file = PySys_GetObject("stderr");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	626 if (file)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	627 PyFile_WriteObject(boot->func, file, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	628 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	629 PyObject_Print(boot->func, stderr, 0);
76067 d552016fc07c protect this call, too Benjamin Peterson <benjamin@python.org> parents: 76066 diff changeset	630 PySys_WriteStderr("\n");
76066 8609d7fcdcc7 prevent writing to stderr from messing up the exception state (closes #14474) Benjamin Peterson <benjamin@python.org> parents: 70578 diff changeset	631 PyErr_Restore(exc, value, tb);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	632 PyErr_PrintEx(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	633 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	634 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	635 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	636 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	637 Py_DECREF(boot->func);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	638 Py_DECREF(boot->args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	639 Py_XDECREF(boot->keyw);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	640 PyMem_DEL(boot_raw);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	641 nb_threads--;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	642 PyThreadState_Clear(tstate);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	643 PyThreadState_DeleteCurrent();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	644 PyThread_exit_thread();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	645 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	646
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	647 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	648 thread_PyThread_start_new_thread(PyObject self, PyObject fargs)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	649 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	650 PyObject func, args, *keyw = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	651 struct bootstate *boot;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	652 long ident;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	653
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	654 if (!PyArg_UnpackTuple(fargs, "start_new_thread", 2, 3,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	655 &func, &args, &keyw))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	656 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	657 if (!PyCallable_Check(func)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	658 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	659 "first arg must be callable");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	660 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	661 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	662 if (!PyTuple_Check(args)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	663 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	664 "2nd arg must be a tuple");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	665 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	666 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	667 if (keyw != NULL && !PyDict_Check(keyw)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	668 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	669 "optional 3rd arg must be a dictionary");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	670 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	671 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	672 boot = PyMem_NEW(struct bootstate, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	673 if (boot == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	674 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	675 boot->interp = PyThreadState_GET()->interp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	676 boot->func = func;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	677 boot->args = args;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	678 boot->keyw = keyw;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	679 boot->tstate = _PyThreadState_Prealloc(boot->interp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	680 if (boot->tstate == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	681 PyMem_DEL(boot);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	682 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	683 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	684 Py_INCREF(func);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	685 Py_INCREF(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	686 Py_XINCREF(keyw);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	687 PyEval_InitThreads(); /* Start the interpreter's thread-awareness */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	688 ident = PyThread_start_new_thread(t_bootstrap, (void*) boot);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	689 if (ident == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	690 PyErr_SetString(ThreadError, "can't start new thread");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	691 Py_DECREF(func);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	692 Py_DECREF(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	693 Py_XDECREF(keyw);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	694 PyThreadState_Clear(boot->tstate);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	695 PyMem_DEL(boot);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	696 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	697 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	698 return PyInt_FromLong(ident);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	699 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	700
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	701 PyDoc_STRVAR(start_new_doc,
20266 241ef8a923c7 Fix typo in docstring Andrew M. Kuchling <amk@amk.ca> parents: 16140 diff changeset	702 "start_new_thread(function, args[, kwargs])\n\
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	703 (start_new() is an obsolete synonym)\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	704 \n\
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	705 Start a new thread and return its identifier. The thread will call the\n\
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	706 function with positional arguments from the tuple args and keyword arguments\n\
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	707 taken from the optional dictionary kwargs. The thread exits when the\n\
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	708 function returns; the return value is ignored. The thread will also exit\n\
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	709 when the function raises an unhandled exception; a stack trace will be\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	710 printed unless the exception is SystemExit.\n");
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	711
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	712 static PyObject *
22561 043ad7adc896 Remove many uses of PyArg_NoArgs macro, change METH_OLDARGS to METH_NOARGS. Neal Norwitz <nnorwitz@gmail.com> parents: 21313 diff changeset	713 thread_PyThread_exit_thread(PyObject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	714 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	715 PyErr_SetNone(PyExc_SystemExit);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	716 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	717 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	718
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	719 PyDoc_STRVAR(exit_doc,
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	720 "exit()\n\
70578 7d3e0a0b0b8f Fix error message to use the Python name instead of the C name Éric Araujo <merwok@netwok.org> parents: 68503 diff changeset	721 (exit_thread() is an obsolete synonym)\n\
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	722 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	723 This is synonymous to ``raise SystemExit''. It will cause the current\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	724 thread to exit silently unless the exception is caught.");
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	725
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	726 static PyObject *
29498 1402f265e48f Correct function name. Kurt B. Kaiser <kbk@shore.net> parents: 29444 diff changeset	727 thread_PyThread_interrupt_main(PyObject * self)
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	728 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	729 PyErr_SetInterrupt();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	730 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	731 return Py_None;
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	732 }
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	733
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	734 PyDoc_STRVAR(interrupt_doc,
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	735 "interrupt_main()\n\
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	736 \n\
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	737 Raise a KeyboardInterrupt in the main thread.\n\
29498 1402f265e48f Correct function name. Kurt B. Kaiser <kbk@shore.net> parents: 29444 diff changeset	738 A subthread can use this function to interrupt the main thread."
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	739 );
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	740
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	741 static lockobject *newlockobject(void);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	742
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	743 static PyObject *
22561 043ad7adc896 Remove many uses of PyArg_NoArgs macro, change METH_OLDARGS to METH_NOARGS. Neal Norwitz <nnorwitz@gmail.com> parents: 21313 diff changeset	744 thread_PyThread_allocate_lock(PyObject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	745 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	746 return (PyObject *) newlockobject();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	747 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	748
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	749 PyDoc_STRVAR(allocate_doc,
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	750 "allocate_lock() -> lock object\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	751 (allocate() is an obsolete synonym)\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	752 \n\
64078 756f8b398230 Merged revisions 84106 via svnmerge from Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 63899 diff changeset	753 Create a new lock object. See help(LockType) for information about locks.");
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	754
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	755 static PyObject *
22561 043ad7adc896 Remove many uses of PyArg_NoArgs macro, change METH_OLDARGS to METH_NOARGS. Neal Norwitz <nnorwitz@gmail.com> parents: 21313 diff changeset	756 thread_get_ident(PyObject *self)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	757 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	758 long ident;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	759 ident = PyThread_get_thread_ident();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	760 if (ident == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	761 PyErr_SetString(ThreadError, "no current thread ident");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	762 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	763 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	764 return PyInt_FromLong(ident);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	765 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	766
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	767 PyDoc_STRVAR(get_ident_doc,
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	768 "get_ident() -> integer\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	769 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	770 Return a non-zero integer that uniquely identifies the current thread\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	771 amongst other threads that exist simultaneously.\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	772 This may be used to identify per-thread resources.\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	773 Even though on some platforms threads identities may appear to be\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	774 allocated consecutive numbers starting at 1, this behavior should not\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	775 be relied upon, and the number should be seen purely as a magic cookie.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	776 A thread's identity may be reused for another thread after it exits.");
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	777
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	778 static PyObject *
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	779 thread__count(PyObject *self)
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	780 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	781 return PyInt_FromLong(nb_threads);
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	782 }
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	783
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	784 PyDoc_STRVAR(_count_doc,
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	785 "_count() -> integer\n\
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	786 \n\
56991 d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	787 \
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	788 Return the number of currently running Python threads, excluding \n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	789 the main thread. The returned number comprises all threads created\n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	790 through `start_new_thread()` as well as `threading.Thread`, and not\n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	791 yet finished.\n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	792 \n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	793 This function is meant for internal and specialized purposes only.\n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	794 In most applications `threading.enumerate()` should be used instead.");
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	795
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	796 static PyObject *
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	797 thread_stack_size(PyObject self, PyObject args)
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	798 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	799 size_t old_size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	800 Py_ssize_t new_size = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	801 int rc;
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	802
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	803 if (!PyArg_ParseTuple(args, "\|n:stack_size", &new_size))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	804 return NULL;
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	805
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	806 if (new_size < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	807 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	808 "size must be 0 or a positive value");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	809 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	810 }
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	811
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	812 old_size = PyThread_get_stacksize();
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	813
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	814 rc = PyThread_set_stacksize((size_t) new_size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	815 if (rc == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	816 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	817 "size not valid: %zd bytes",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	818 new_size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	819 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	820 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	821 if (rc == -2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	822 PyErr_SetString(ThreadError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	823 "setting stack size not supported");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	824 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	825 }
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	826
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	827 return PyInt_FromSsize_t((Py_ssize_t) old_size);
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	828 }
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	829
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	830 PyDoc_STRVAR(stack_size_doc,
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	831 "stack_size([size]) -> size\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	832 \n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	833 Return the thread stack size used when creating new threads. The\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	834 optional size argument specifies the stack size (in bytes) to be used\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	835 for subsequently created threads, and must be 0 (use platform or\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	836 configured default) or a positive integer value of at least 32,768 (32k).\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	837 If changing the thread stack size is unsupported, a ThreadError\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	838 exception is raised. If the specified size is invalid, a ValueError\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	839 exception is raised, and the stack size is unmodified. 32k bytes\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	840 currently the minimum supported stack size value to guarantee\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	841 sufficient stack space for the interpreter itself.\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	842 \n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	843 Note that some platforms may have particular restrictions on values for\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	844 the stack size, such as requiring a minimum stack size larger than 32kB or\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	845 requiring allocation in multiples of the system memory page size\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	846 - platform documentation should be referred to for more information\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	847 (4kB pages are common; using multiples of 4096 for the stack size is\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	848 the suggested approach in the absence of more specific information).");
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	849
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	850 static PyMethodDef thread_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	851 {"start_new_thread", (PyCFunction)thread_PyThread_start_new_thread,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	852 METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	853 start_new_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	854 {"start_new", (PyCFunction)thread_PyThread_start_new_thread,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	855 METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	856 start_new_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	857 {"allocate_lock", (PyCFunction)thread_PyThread_allocate_lock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	858 METH_NOARGS, allocate_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	859 {"allocate", (PyCFunction)thread_PyThread_allocate_lock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	860 METH_NOARGS, allocate_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	861 {"exit_thread", (PyCFunction)thread_PyThread_exit_thread,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	862 METH_NOARGS, exit_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	863 {"exit", (PyCFunction)thread_PyThread_exit_thread,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	864 METH_NOARGS, exit_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	865 {"interrupt_main", (PyCFunction)thread_PyThread_interrupt_main,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	866 METH_NOARGS, interrupt_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	867 {"get_ident", (PyCFunction)thread_get_ident,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	868 METH_NOARGS, get_ident_doc},
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	869 {"_count", (PyCFunction)thread__count,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	870 METH_NOARGS, _count_doc},
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	871 {"stack_size", (PyCFunction)thread_stack_size,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	872 METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	873 stack_size_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	874 {NULL, NULL} /* sentinel */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	875 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	876
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	877
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	878 /* Initialization function */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	879
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	880 PyDoc_STRVAR(thread_doc,
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	881 "This module provides primitive operations to write multi-threaded programs.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	882 The 'threading' module provides a more convenient interface.");
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	883
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	884 PyDoc_STRVAR(lock_doc,
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	885 "A lock object is a synchronization primitive. To create a lock,\n\
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	886 call the PyThread_allocate_lock() function. Methods are:\n\
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	887 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	888 acquire() -- lock the lock, possibly blocking until it can be obtained\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	889 release() -- unlock of the lock\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	890 locked() -- test whether the lock is currently locked\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	891 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	892 A lock is not owned by the thread that locked it; another thread may\n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	893 unlock it. A thread attempting to lock a lock that it has already locked\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	894 will block until another thread unlocks it. Deadlocks may ensue.");
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	895
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24280 diff changeset	896 PyMODINIT_FUNC
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13497 diff changeset	897 initthread(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	898 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	899 PyObject m, d;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	900
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	901 /* Initialize types: */
63899 b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	902 if (PyType_Ready(&localdummytype) < 0)
b65dce5902a2 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	903 return;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	904 if (PyType_Ready(&localtype) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	905 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	906
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	907 /* Create the module and add the functions */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	908 m = Py_InitModule3("thread", thread_methods, thread_doc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	909 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	910 return;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	911
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	912 /* Add a symbolic constant */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	913 d = PyModule_GetDict(m);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	914 ThreadError = PyErr_NewException("thread.error", NULL, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	915 PyDict_SetItemString(d, "error", ThreadError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	916 Locktype.tp_doc = lock_doc;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	917 if (PyType_Ready(&Locktype) < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	918 return;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	919 Py_INCREF(&Locktype);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	920 PyDict_SetItemString(d, "LockType", (PyObject *)&Locktype);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	921
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	922 Py_INCREF(&localtype);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	923 if (PyModule_AddObject(m, "_local", (PyObject *)&localtype) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	924 return;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	925
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59315 diff changeset	926 nb_threads = 0;
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	927
64300 b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	928 str_dict = PyString_InternFromString("__dict__");
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	929 if (str_dict == NULL)
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	930 return;
b2e8dcd15040 Merged revisions 84344 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64078 diff changeset	931
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	932 /* Initialize the C thread library */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59817 diff changeset	933 PyThread_init_thread();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	934 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/threadmodule.c @ 76067:d552016fc07c 2.7