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

annotate Modules/_threadmodule.c @ 64289:325d016c19f7

#9689: add links from overview to in-depth class API descriptions.

author	Georg Brandl <georg@python.org>
date	Thu, 26 Aug 2010 14:30:15 +0000
parents	e3df34544db9
children	0265d5f7bd07

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"
56440 29908f2bc93f Merged revisions 74524 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56428 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;
56981 6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	17 static long nb_threads = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	18
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	19 /* Lock objects */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	20
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	21 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	22 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	23 PyThread_type_lock lock_lock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	24 PyObject *in_weakreflist;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	25 } lockobject;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	26
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	27 static void
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	28 lock_dealloc(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	29 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	30 if (self->in_weakreflist != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	31 PyObject_ClearWeakRefs((PyObject *) self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	32 if (self->lock_lock != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	33 /* Unlock the lock so it's safe to free it */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	34 PyThread_acquire_lock(self->lock_lock, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	35 PyThread_release_lock(self->lock_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	36
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	37 PyThread_free_lock(self->lock_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	38 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	39 PyObject_Del(self);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	40 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	41
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	42 static PyObject *
60598 01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59316 diff changeset	43 lock_PyThread_acquire_lock(lockobject self, PyObject args, PyObject *kwds)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	44 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	45 char *kwlist[] = {"blocking", "timeout", NULL};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	46 int blocking = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	47 double timeout = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	48 PY_TIMEOUT_T microseconds;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	49 int r;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	50
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	51 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|id:acquire", kwlist,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	52 &blocking, &timeout))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	53 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	54
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	55 if (!blocking && timeout != -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	56 PyErr_SetString(PyExc_ValueError, "can't specify a timeout "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	57 "for a non-blocking call");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	58 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	59 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	60 if (timeout < 0 && timeout != -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	61 PyErr_SetString(PyExc_ValueError, "timeout value must be "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	62 "strictly positive");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	63 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	64 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	65 if (!blocking)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	66 microseconds = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	67 else if (timeout == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	68 microseconds = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	69 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	70 timeout *= 1e6;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	71 if (timeout >= (double) PY_TIMEOUT_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	72 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	73 "timeout value is too large");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	74 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	75 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	76 microseconds = (PY_TIMEOUT_T) timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	77 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	78
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	79 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	80 r = PyThread_acquire_lock_timed(self->lock_lock, microseconds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	81 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	82
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	83 return PyBool_FromLong(r);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	84 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	85
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	86 PyDoc_STRVAR(acquire_doc,
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	87 "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	88 (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	89 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	90 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	91 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	92 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	93 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	94 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	95 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	96
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	97 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	98 lock_PyThread_release_lock(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	99 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	100 /* Sanity check: the lock must be locked */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	101 if (PyThread_acquire_lock(self->lock_lock, 0)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	102 PyThread_release_lock(self->lock_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	103 PyErr_SetString(ThreadError, "release unlocked lock");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	104 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	105 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	106
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	107 PyThread_release_lock(self->lock_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	108 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	109 return Py_None;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	110 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	111
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	112 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	113 "release()\n\
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36895 diff changeset	114 (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	115 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	116 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	117 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	118 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	119
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	120 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	121 lock_locked_lock(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	122 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	123 if (PyThread_acquire_lock(self->lock_lock, 0)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	124 PyThread_release_lock(self->lock_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	125 return PyBool_FromLong(0L);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	126 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	127 return PyBool_FromLong(1L);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	128 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	129
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	130 PyDoc_STRVAR(locked_doc,
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	131 "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	132 (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	133 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	134 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	135
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	136 static PyMethodDef lock_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	137 {"acquire_lock", (PyCFunction)lock_PyThread_acquire_lock,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	138 METH_VARARGS \| METH_KEYWORDS, acquire_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	139 {"acquire", (PyCFunction)lock_PyThread_acquire_lock,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	140 METH_VARARGS \| METH_KEYWORDS, acquire_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	141 {"release_lock", (PyCFunction)lock_PyThread_release_lock,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	142 METH_NOARGS, release_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	143 {"release", (PyCFunction)lock_PyThread_release_lock,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	144 METH_NOARGS, release_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	145 {"locked_lock", (PyCFunction)lock_locked_lock,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	146 METH_NOARGS, locked_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	147 {"locked", (PyCFunction)lock_locked_lock,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	148 METH_NOARGS, locked_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	149 {"__enter__", (PyCFunction)lock_PyThread_acquire_lock,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	150 METH_VARARGS \| METH_KEYWORDS, acquire_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	151 {"__exit__", (PyCFunction)lock_PyThread_release_lock,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	152 METH_VARARGS, release_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	153 {NULL, NULL} /* sentinel */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	154 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	155
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	156 static PyTypeObject Locktype = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	157 PyVarObject_HEAD_INIT(&PyType_Type, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	158 "_thread.lock", /tp_name/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	159 sizeof(lockobject), /tp_size/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	160 0, /tp_itemsize/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	161 /* methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	162 (destructor)lock_dealloc, /tp_dealloc/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	163 0, /tp_print/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	164 0, /tp_getattr/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	165 0, /tp_setattr/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	166 0, /tp_reserved/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	167 0, /tp_repr/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	168 0, /tp_as_number/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	169 0, /tp_as_sequence/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	170 0, /tp_as_mapping/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	171 0, /tp_hash/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	172 0, /tp_call/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	173 0, /tp_str/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	174 0, /tp_getattro/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	175 0, /tp_setattro/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	176 0, /tp_as_buffer/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	177 Py_TPFLAGS_DEFAULT, /tp_flags/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	178 0, /tp_doc/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	179 0, /tp_traverse/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	180 0, /tp_clear/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	181 0, /tp_richcompare/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	182 offsetof(lockobject, in_weakreflist), /tp_weaklistoffset/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	183 0, /tp_iter/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	184 0, /tp_iternext/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	185 lock_methods, /tp_methods/
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	186 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	187
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	188 /* Recursive lock objects */
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	189
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	190 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	191 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	192 PyThread_type_lock rlock_lock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	193 long rlock_owner;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	194 unsigned long rlock_count;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	195 PyObject *in_weakreflist;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	196 } rlockobject;
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	197
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	198 static void
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	199 rlock_dealloc(rlockobject *self)
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	200 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	201 assert(self->rlock_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	202 if (self->in_weakreflist != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	203 PyObject_ClearWeakRefs((PyObject *) self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	204 /* Unlock the lock so it's safe to free it */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	205 if (self->rlock_count > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	206 PyThread_release_lock(self->rlock_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	207
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	208 PyThread_free_lock(self->rlock_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	209 Py_TYPE(self)->tp_free(self);
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	210 }
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	211
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	212 static PyObject *
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	213 rlock_acquire(rlockobject self, PyObject args, PyObject *kwds)
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	214 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	215 char *kwlist[] = {"blocking", "timeout", NULL};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	216 int blocking = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	217 double timeout = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	218 PY_TIMEOUT_T microseconds;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	219 long tid;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	220 int r = 1;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	221
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	222 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|id:acquire", kwlist,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	223 &blocking, &timeout))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	224 return NULL;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	225
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	226 if (!blocking && timeout != -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	227 PyErr_SetString(PyExc_ValueError, "can't specify a timeout "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	228 "for a non-blocking call");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	229 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	230 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	231 if (timeout < 0 && timeout != -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	232 PyErr_SetString(PyExc_ValueError, "timeout value must be "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	233 "strictly positive");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	234 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	235 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	236 if (!blocking)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	237 microseconds = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	238 else if (timeout == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	239 microseconds = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	240 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	241 timeout *= 1e6;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	242 if (timeout >= (double) PY_TIMEOUT_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	243 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	244 "timeout value is too large");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	245 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	246 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	247 microseconds = (PY_TIMEOUT_T) timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	248 }
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	249
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	250 tid = PyThread_get_thread_ident();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	251 if (self->rlock_count > 0 && tid == self->rlock_owner) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	252 unsigned long count = self->rlock_count + 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	253 if (count <= self->rlock_count) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	254 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	255 "Internal lock count overflowed");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	256 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	257 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	258 self->rlock_count = count;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	259 Py_RETURN_TRUE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	260 }
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	261
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	262 if (self->rlock_count > 0 \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	263 !PyThread_acquire_lock(self->rlock_lock, 0)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	264 if (microseconds == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	265 Py_RETURN_FALSE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	266 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	267 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	268 r = PyThread_acquire_lock_timed(self->rlock_lock, microseconds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	269 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	270 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	271 if (r) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	272 assert(self->rlock_count == 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	273 self->rlock_owner = tid;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	274 self->rlock_count = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	275 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	276
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	277 return PyBool_FromLong(r);
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	278 }
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	279
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	280 PyDoc_STRVAR(rlock_acquire_doc,
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	281 "acquire(blocking=True) -> bool\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	282 \n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	283 Lock the lock. `blocking` indicates whether we should wait\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	284 for the lock to be available or not. If `blocking` is False\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	285 and another thread holds the lock, the method will return False\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	286 immediately. If `blocking` is True and another thread holds\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	287 the lock, the method will wait for the lock to be released,\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	288 take it and then return True.\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	289 (note: the blocking operation is not interruptible.)\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	290 \n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	291 In all other cases, the method will return True immediately.\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	292 Precisely, if the current thread already holds the lock, its\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	293 internal counter is simply incremented. If nobody holds the lock,\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	294 the lock is taken and its internal counter initialized to 1.");
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	295
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	296 static PyObject *
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	297 rlock_release(rlockobject *self)
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	298 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	299 long tid = PyThread_get_thread_ident();
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	300
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	301 if (self->rlock_count == 0 \|\| self->rlock_owner != tid) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	302 PyErr_SetString(PyExc_RuntimeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	303 "cannot release un-acquired lock");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	304 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	305 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	306 if (--self->rlock_count == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	307 self->rlock_owner = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	308 PyThread_release_lock(self->rlock_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	309 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	310 Py_RETURN_NONE;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	311 }
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	312
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	313 PyDoc_STRVAR(rlock_release_doc,
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	314 "release()\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	315 \n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	316 Release the lock, allowing another thread that is blocked waiting for\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	317 the lock to acquire the lock. The lock must be in the locked state,\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	318 and must be locked by the same thread that unlocks it; otherwise a\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	319 `RuntimeError` is raised.\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	320 \n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	321 Do note that if the lock was acquire()d several times in a row by the\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	322 current thread, release() needs to be called as many times for the lock\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	323 to be available for other threads.");
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	324
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	325 static PyObject *
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	326 rlock_acquire_restore(rlockobject self, PyObject arg)
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	327 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	328 long owner;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	329 unsigned long count;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	330 int r = 1;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	331
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	332 if (!PyArg_ParseTuple(arg, "kl:_acquire_restore", &count, &owner))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	333 return NULL;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	334
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	335 if (!PyThread_acquire_lock(self->rlock_lock, 0)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	336 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	337 r = PyThread_acquire_lock(self->rlock_lock, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	338 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	339 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	340 if (!r) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	341 PyErr_SetString(ThreadError, "couldn't acquire lock");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	342 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	343 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	344 assert(self->rlock_count == 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	345 self->rlock_owner = owner;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	346 self->rlock_count = count;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	347 Py_RETURN_NONE;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	348 }
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	349
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	350 PyDoc_STRVAR(rlock_acquire_restore_doc,
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	351 "_acquire_restore(state) -> None\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	352 \n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	353 For internal use by `threading.Condition`.");
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	354
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	355 static PyObject *
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	356 rlock_release_save(rlockobject *self)
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	357 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	358 long owner;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	359 unsigned long count;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	360
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	361 owner = self->rlock_owner;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	362 count = self->rlock_count;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	363 self->rlock_count = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	364 self->rlock_owner = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	365 PyThread_release_lock(self->rlock_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	366 return Py_BuildValue("kl", count, owner);
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	367 }
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	368
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	369 PyDoc_STRVAR(rlock_release_save_doc,
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	370 "_release_save() -> tuple\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	371 \n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	372 For internal use by `threading.Condition`.");
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	373
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	374
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	375 static PyObject *
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	376 rlock_is_owned(rlockobject *self)
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	377 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	378 long tid = PyThread_get_thread_ident();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	379
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	380 if (self->rlock_count > 0 && self->rlock_owner == tid) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	381 Py_RETURN_TRUE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	382 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	383 Py_RETURN_FALSE;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	384 }
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	385
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	386 PyDoc_STRVAR(rlock_is_owned_doc,
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	387 "_is_owned() -> bool\n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	388 \n\
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	389 For internal use by `threading.Condition`.");
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	390
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	391 static PyObject *
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	392 rlock_new(PyTypeObject type, PyObject args, PyObject *kwds)
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	393 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	394 rlockobject *self;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	395
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	396 self = (rlockobject *) type->tp_alloc(type, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	397 if (self != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	398 self->rlock_lock = PyThread_allocate_lock();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	399 if (self->rlock_lock == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	400 type->tp_free(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	401 PyErr_SetString(ThreadError, "can't allocate lock");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	402 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	403 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	404 self->in_weakreflist = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	405 self->rlock_owner = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	406 self->rlock_count = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	407 }
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	408
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	409 return (PyObject *) self;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	410 }
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	411
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	412 static PyObject *
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	413 rlock_repr(rlockobject *self)
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	414 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	415 return PyUnicode_FromFormat("<%s owner=%ld count=%lu>",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	416 Py_TYPE(self)->tp_name, self->rlock_owner, self->rlock_count);
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	417 }
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	418
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	419
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	420 static PyMethodDef rlock_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	421 {"acquire", (PyCFunction)rlock_acquire,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	422 METH_VARARGS \| METH_KEYWORDS, rlock_acquire_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	423 {"release", (PyCFunction)rlock_release,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	424 METH_NOARGS, rlock_release_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	425 {"_is_owned", (PyCFunction)rlock_is_owned,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	426 METH_NOARGS, rlock_is_owned_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	427 {"_acquire_restore", (PyCFunction)rlock_acquire_restore,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	428 METH_O, rlock_acquire_restore_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	429 {"_release_save", (PyCFunction)rlock_release_save,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	430 METH_NOARGS, rlock_release_save_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	431 {"__enter__", (PyCFunction)rlock_acquire,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	432 METH_VARARGS \| METH_KEYWORDS, rlock_acquire_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	433 {"__exit__", (PyCFunction)rlock_release,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	434 METH_VARARGS, rlock_release_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	435 {NULL, NULL} /* sentinel */
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	436 };
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	437
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	438
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	439 static PyTypeObject RLocktype = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	440 PyVarObject_HEAD_INIT(&PyType_Type, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	441 "_thread.RLock", /tp_name/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	442 sizeof(rlockobject), /tp_size/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	443 0, /tp_itemsize/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	444 /* methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	445 (destructor)rlock_dealloc, /tp_dealloc/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	446 0, /tp_print/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	447 0, /tp_getattr/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	448 0, /tp_setattr/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	449 0, /tp_reserved/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	450 (reprfunc)rlock_repr, /tp_repr/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	451 0, /tp_as_number/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	452 0, /tp_as_sequence/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	453 0, /tp_as_mapping/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	454 0, /tp_hash/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	455 0, /tp_call/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	456 0, /tp_str/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	457 0, /tp_getattro/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	458 0, /tp_setattro/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	459 0, /tp_as_buffer/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	460 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	461 0, /tp_doc/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	462 0, /tp_traverse/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	463 0, /tp_clear/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	464 0, /tp_richcompare/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	465 offsetof(rlockobject, in_weakreflist), /tp_weaklistoffset/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	466 0, /tp_iter/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	467 0, /tp_iternext/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	468 rlock_methods, /tp_methods/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	469 0, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	470 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	471 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	472 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	473 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	474 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	475 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	476 0, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	477 PyType_GenericAlloc, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	478 rlock_new /* tp_new */
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	479 };
6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	480
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	481 static lockobject *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	482 newlockobject(void)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	483 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	484 lockobject *self;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	485 self = PyObject_New(lockobject, &Locktype);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	486 if (self == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	487 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	488 self->lock_lock = PyThread_allocate_lock();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	489 self->in_weakreflist = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	490 if (self->lock_lock == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	491 Py_DECREF(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	492 PyErr_SetString(ThreadError, "can't allocate lock");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	493 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	494 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	495 return self;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	496 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	497
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	498 /* Thread-local objects */
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	499
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	500 #include "structmember.h"
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	501
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	502 /* Quick overview:
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	503
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	504 We need to be able to reclaim reference cycles as soon as possible
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	505 (both when a thread is being terminated, or a thread-local object
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	506 becomes unreachable from user data). Constraints:
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	507 - it must not be possible for thread-state dicts to be involved in
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	508 reference cycles (otherwise the cyclic GC will refuse to consider
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	509 objects referenced from a reachable thread-state dict, even though
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	510 local_dealloc would clear them)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	511 - the death of a thread-state dict must still imply destruction of the
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	512 corresponding local dicts in all thread-local objects.
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	513
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	514 Our implementation uses small "localdummy" objects in order to break
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	515 the reference chain. These trivial objects are hashable (using the
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	516 default scheme of identity hashing) and weakrefable.
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	517 Each thread-state holds a separate localdummy for each local object
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	518 (as a /strong reference/),
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	519 and each thread-local object holds a dict mapping /weak references/
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	520 of localdummies to local dicts.
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	521
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	522 Therefore:
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	523 - only the thread-state dict holds a strong reference to the dummies
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	524 - only the thread-local object holds a strong reference to the local dicts
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	525 - only outside objects (application- or library-level) hold strong
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	526 references to the thread-local objects
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	527 - as soon as a thread-state dict is destroyed, the weakref callbacks of all
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	528 dummies attached to that thread are called, and destroy the corresponding
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	529 local dicts from thread-local objects
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	530 - as soon as a thread-local object is destroyed, its local dicts are
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	531 destroyed and its dummies are manually removed from all thread states
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	532 - the GC can do its work correctly when a thread-local object is dangling,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	533 without any interference from the thread-state dicts
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	534
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	535 As an additional optimization, each localdummy holds a borrowed reference
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	536 to the corresponding localdict. This borrowed reference is only used
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	537 by the thread-local object which has created the localdummy, which should
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	538 guarantee that the localdict still exists when accessed.
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	539 */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	540
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	541 typedef struct {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	542 PyObject_HEAD
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	543 PyObject localdict; / Borrowed reference! */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	544 PyObject weakreflist; / List of weak references to self */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	545 } localdummyobject;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	546
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	547 static void
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	548 localdummy_dealloc(localdummyobject *self)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	549 {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	550 if (self->weakreflist != NULL)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	551 PyObject_ClearWeakRefs((PyObject *) self);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	552 Py_TYPE(self)->tp_free((PyObject*)self);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	553 }
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	554
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	555 static PyTypeObject localdummytype = {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	556 PyVarObject_HEAD_INIT(NULL, 0)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	557 /* tp_name */ "_thread._localdummy",
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	558 /* tp_basicsize */ sizeof(localdummyobject),
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	559 /* tp_itemsize */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	560 /* tp_dealloc */ (destructor)localdummy_dealloc,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	561 /* tp_print */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	562 /* tp_getattr */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	563 /* tp_setattr */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	564 /* tp_reserved */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	565 /* tp_repr */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	566 /* tp_as_number */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	567 /* tp_as_sequence */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	568 /* tp_as_mapping */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	569 /* tp_hash */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	570 /* tp_call */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	571 /* tp_str */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	572 /* tp_getattro */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	573 /* tp_setattro */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	574 /* tp_as_buffer */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	575 /* tp_flags */ Py_TPFLAGS_DEFAULT,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	576 /* tp_doc */ "Thread-local dummy",
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	577 /* tp_traverse */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	578 /* tp_clear */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	579 /* tp_richcompare */ 0,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	580 /* tp_weaklistoffset */ offsetof(localdummyobject, weakreflist)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	581 };
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	582
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	583
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	584 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	585 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	586 PyObject *key;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	587 PyObject *args;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	588 PyObject *kw;
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	589 /* The current thread's local dict (necessary for tp_dictoffset) */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	590 PyObject *dict;
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	591 PyObject weakreflist; / List of weak references to self */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	592 /* A {localdummy weakref -> localdict} dict */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	593 PyObject *dummies;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	594 /* The callback for weakrefs to localdummies */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	595 PyObject *wr_callback;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	596 } localobject;
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	597
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	598 /* Forward declaration */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	599 static PyObject _ldict(localobject self);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	600 static PyObject _localdummy_destroyed(PyObject meth_self, PyObject *dummyweakref);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	601
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	602 /* Create and register the dummy for the current thread, as well as the
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	603 corresponding local dict */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	604 static int
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	605 _local_create_dummy(localobject *self)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	606 {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	607 PyObject tdict, ldict = NULL, *wr = NULL;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	608 localdummyobject *dummy = NULL;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	609 int r;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	610
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	611 tdict = PyThreadState_GetDict();
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	612 if (tdict == NULL) {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	613 PyErr_SetString(PyExc_SystemError,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	614 "Couldn't get thread-state dictionary");
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	615 goto err;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	616 }
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	617
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	618 ldict = PyDict_New();
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	619 if (ldict == NULL)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	620 goto err;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	621 dummy = (localdummyobject *) localdummytype.tp_alloc(&localdummytype, 0);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	622 if (dummy == NULL)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	623 goto err;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	624 dummy->localdict = ldict;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	625 wr = PyWeakref_NewRef((PyObject *) dummy, self->wr_callback);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	626 if (wr == NULL)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	627 goto err;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	628
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	629 /* As a side-effect, this will cache the weakref's hash before the
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	630 dummy gets deleted */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	631 r = PyDict_SetItem(self->dummies, wr, ldict);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	632 if (r < 0)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	633 goto err;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	634 Py_CLEAR(wr);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	635 r = PyDict_SetItem(tdict, self->key, (PyObject *) dummy);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	636 if (r < 0)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	637 goto err;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	638 Py_CLEAR(dummy);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	639
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	640 Py_CLEAR(self->dict);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	641 self->dict = ldict;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	642 return 0;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	643
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	644 err:
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	645 Py_XDECREF(ldict);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	646 Py_XDECREF(wr);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	647 Py_XDECREF(dummy);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	648 return -1;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	649 }
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	650
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	651 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	652 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	653 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	654 localobject *self;
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	655 PyObject *wr;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	656 static PyMethodDef wr_callback_def = {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	657 "_localdummy_destroyed", (PyCFunction) _localdummy_destroyed, METH_O
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	658 };
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	659
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	660 if (type->tp_init == PyBaseObject_Type.tp_init
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	661 && ((args && PyObject_IsTrue(args))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	662 \|\| (kw && PyObject_IsTrue(kw)))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	663 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	664 "Initialization arguments are not supported");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	665 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	666 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	667
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	668 self = (localobject *)type->tp_alloc(type, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	669 if (self == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	670 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	671
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	672 Py_XINCREF(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	673 self->args = args;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	674 Py_XINCREF(kw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	675 self->kw = kw;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	676 self->key = PyUnicode_FromFormat("thread.local.%p", self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	677 if (self->key == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	678 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	679
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	680 self->dummies = PyDict_New();
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	681 if (self->dummies == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	682 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	683
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	684 /* We use a weak reference to self in the callback closure
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	685 in order to avoid spurious reference cycles */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	686 wr = PyWeakref_NewRef((PyObject *) self, NULL);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	687 if (wr == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	688 goto err;
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	689 self->wr_callback = PyCFunction_New(&wr_callback_def, wr);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	690 Py_DECREF(wr);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	691 if (self->wr_callback == NULL)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	692 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	693
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	694 if (_local_create_dummy(self) < 0)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	695 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	696
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	697 return (PyObject *)self;
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	698
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	699 err:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	700 Py_DECREF(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	701 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	702 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	703
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	704 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	705 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	706 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	707 Py_VISIT(self->args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	708 Py_VISIT(self->kw);
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	709 Py_VISIT(self->dummies);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	710 Py_VISIT(self->dict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	711 return 0;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	712 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	713
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	714 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	715 local_clear(localobject *self)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	716 {
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	717 PyThreadState *tstate;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	718 Py_CLEAR(self->args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	719 Py_CLEAR(self->kw);
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	720 Py_CLEAR(self->dummies);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	721 Py_CLEAR(self->dict);
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	722 Py_CLEAR(self->wr_callback);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	723 /* Remove all strong references to dummies from the thread states */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	724 if (self->key
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	725 && (tstate = PyThreadState_Get())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	726 && tstate->interp) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	727 for(tstate = PyInterpreterState_ThreadHead(tstate->interp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	728 tstate;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	729 tstate = PyThreadState_Next(tstate))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	730 if (tstate->dict &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	731 PyDict_GetItem(tstate->dict, self->key))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	732 PyDict_DelItem(tstate->dict, self->key);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	733 }
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	734 return 0;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	735 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	736
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	737 static void
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	738 local_dealloc(localobject *self)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	739 {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	740 /* Weakrefs must be invalidated right now, otherwise they can be used
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	741 from code called below, which is very dangerous since Py_REFCNT(self) == 0 */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	742 if (self->weakreflist != NULL)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	743 PyObject_ClearWeakRefs((PyObject *) self);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	744
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	745 PyObject_GC_UnTrack(self);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	746
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	747 local_clear(self);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	748 Py_XDECREF(self->key);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	749 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	750 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	751
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	752 /* 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	753 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	754 _ldict(localobject *self)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	755 {
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	756 PyObject tdict, ldict, *dummy;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	757
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	758 tdict = PyThreadState_GetDict();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	759 if (tdict == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	760 PyErr_SetString(PyExc_SystemError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	761 "Couldn't get thread-state dictionary");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	762 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	763 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	764
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	765 dummy = PyDict_GetItem(tdict, self->key);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	766 if (dummy == NULL) {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	767 if (_local_create_dummy(self) < 0)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	768 return NULL;
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	769 ldict = self->dict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	770
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	771 if (Py_TYPE(self)->tp_init != PyBaseObject_Type.tp_init &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	772 Py_TYPE(self)->tp_init((PyObject*)self,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	773 self->args, self->kw) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	774 /* we need to get rid of ldict from thread so
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	775 we create a new one the next time we do an attr
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	776 acces */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	777 PyDict_DelItem(tdict, self->key);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	778 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	779 }
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	780 }
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	781 else {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	782 assert(Py_TYPE(dummy) == &localdummytype);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	783 ldict = ((localdummyobject *) dummy)->localdict;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	784 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	785
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	786 /* The call to tp_init above may have caused another thread to run.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	787 Install our ldict again. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	788 if (self->dict != ldict) {
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	789 Py_INCREF(ldict);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	790 Py_CLEAR(self->dict);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	791 self->dict = ldict;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	792 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	793
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	794 return ldict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	795 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	796
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	797 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	798 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	799 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	800 PyObject *ldict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	801
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	802 ldict = _ldict(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	803 if (ldict == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	804 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	805
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	806 return PyObject_GenericSetAttr((PyObject *)self, name, v);
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	807 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	808
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	809 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	810 local_getdict(localobject self, void closure)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	811 {
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	812 PyObject *ldict;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	813 ldict = _ldict(self);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	814 Py_XINCREF(ldict);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	815 return ldict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	816 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	817
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	818 static PyGetSetDef local_getset[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	819 {"__dict__", (getter)local_getdict, (setter)NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	820 "Local-data dictionary", NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	821 {NULL} /* Sentinel */
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	822 };
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	823
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	824 static PyObject local_getattro(localobject , PyObject *);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	825
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	826 static PyTypeObject localtype = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	827 PyVarObject_HEAD_INIT(NULL, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	828 /* tp_name */ "_thread._local",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	829 /* tp_basicsize */ sizeof(localobject),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	830 /* tp_itemsize */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	831 /* tp_dealloc */ (destructor)local_dealloc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	832 /* tp_print */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	833 /* tp_getattr */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	834 /* tp_setattr */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	835 /* tp_reserved */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	836 /* tp_repr */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	837 /* tp_as_number */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	838 /* tp_as_sequence */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	839 /* tp_as_mapping */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	840 /* tp_hash */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	841 /* tp_call */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	842 /* tp_str */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	843 /* tp_getattro */ (getattrofunc)local_getattro,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	844 /* tp_setattro */ (setattrofunc)local_setattro,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	845 /* tp_as_buffer */ 0,
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	846 /* tp_flags */ Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	847 \| Py_TPFLAGS_HAVE_GC,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	848 /* tp_doc */ "Thread-local data",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	849 /* tp_traverse */ (traverseproc)local_traverse,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	850 /* tp_clear */ (inquiry)local_clear,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	851 /* tp_richcompare */ 0,
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	852 /* tp_weaklistoffset */ offsetof(localobject, weakreflist),
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	853 /* tp_iter */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	854 /* tp_iternext */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	855 /* tp_methods */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	856 /* tp_members */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	857 /* tp_getset */ local_getset,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	858 /* tp_base */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	859 /* tp_dict / 0, / internal use */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	860 /* tp_descr_get */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	861 /* tp_descr_set */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	862 /* tp_dictoffset */ offsetof(localobject, dict),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	863 /* tp_init */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	864 /* tp_alloc */ 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	865 /* tp_new */ local_new,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	866 /* tp_free / 0, / Low-level free-mem routine */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	867 /* 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	868 };
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	869
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	870 static PyObject *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	871 local_getattro(localobject self, PyObject name)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	872 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	873 PyObject ldict, value;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	874
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	875 ldict = _ldict(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	876 if (ldict == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	877 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	878
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	879 if (Py_TYPE(self) != &localtype)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	880 /* use generic lookup for subtypes */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	881 return PyObject_GenericGetAttr((PyObject *)self, name);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	882
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	883 /* Optimization: just look in dict ourselves */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	884 value = PyDict_GetItem(ldict, name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	885 if (value == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	886 /* Fall back on generic to get __class__ and __dict__ */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	887 return PyObject_GenericGetAttr((PyObject *)self, name);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	888
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	889 Py_INCREF(value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	890 return value;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	891 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	892
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	893 /* Called when a dummy is destroyed. */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	894 static PyObject *
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	895 _localdummy_destroyed(PyObject localweakref, PyObject dummyweakref)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	896 {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	897 PyObject *obj;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	898 localobject *self;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	899 assert(PyWeakref_CheckRef(localweakref));
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	900 obj = PyWeakref_GET_OBJECT(localweakref);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	901 if (obj == Py_None)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	902 Py_RETURN_NONE;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	903 Py_INCREF(obj);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	904 assert(PyObject_TypeCheck(obj, &localtype));
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	905 /* If the thread-local object is still alive and not being cleared,
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	906 remove the corresponding local dict */
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	907 self = (localobject *) obj;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	908 if (self->dummies != NULL) {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	909 PyObject *ldict;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	910 ldict = PyDict_GetItem(self->dummies, dummyweakref);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	911 if (ldict != NULL) {
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	912 if (ldict == self->dict)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	913 Py_CLEAR(self->dict);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	914 PyDict_DelItem(self->dummies, dummyweakref);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	915 }
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	916 if (PyErr_Occurred())
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	917 PyErr_WriteUnraisable(obj);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	918 }
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	919 Py_DECREF(obj);
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	920 Py_RETURN_NONE;
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	921 }
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	922
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	923 /* Module functions */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	924
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	925 struct bootstate {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	926 PyInterpreterState *interp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	927 PyObject *func;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	928 PyObject *args;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	929 PyObject *keyw;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	930 PyThreadState *tstate;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	931 };
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	932
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	933 static void
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	934 t_bootstrap(void *boot_raw)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	935 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	936 struct bootstate boot = (struct bootstate ) boot_raw;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	937 PyThreadState *tstate;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	938 PyObject *res;
961 a31e07847063 New thread.c from Sjoerd, supports _exit_prog(). Use this in goaway() Guido van Rossum <guido@python.org> parents: 926 diff changeset	939
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	940 tstate = boot->tstate;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	941 tstate->thread_id = PyThread_get_thread_ident();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	942 _PyThreadState_Init(tstate);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	943 PyEval_AcquireThread(tstate);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	944 nb_threads++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	945 res = PyEval_CallObjectWithKeywords(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	946 boot->func, boot->args, boot->keyw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	947 if (res == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	948 if (PyErr_ExceptionMatches(PyExc_SystemExit))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	949 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	950 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	951 PyObject *file;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	952 PySys_WriteStderr(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	953 "Unhandled exception in thread started by ");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	954 file = PySys_GetObject("stderr");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	955 if (file != NULL && file != Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	956 PyFile_WriteObject(boot->func, file, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	957 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	958 PyObject_Print(boot->func, stderr, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	959 PySys_WriteStderr("\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	960 PyErr_PrintEx(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	961 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	962 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	963 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	964 Py_DECREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	965 Py_DECREF(boot->func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	966 Py_DECREF(boot->args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	967 Py_XDECREF(boot->keyw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	968 PyMem_DEL(boot_raw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	969 nb_threads--;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	970 PyThreadState_Clear(tstate);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	971 PyThreadState_DeleteCurrent();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	972 PyThread_exit_thread();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	973 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	974
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	975 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	976 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	977 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	978 PyObject func, args, *keyw = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	979 struct bootstate *boot;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	980 long ident;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	981
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	982 if (!PyArg_UnpackTuple(fargs, "start_new_thread", 2, 3,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	983 &func, &args, &keyw))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	984 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	985 if (!PyCallable_Check(func)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	986 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	987 "first arg must be callable");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	988 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	989 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	990 if (!PyTuple_Check(args)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	991 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	992 "2nd arg must be a tuple");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	993 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	994 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	995 if (keyw != NULL && !PyDict_Check(keyw)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	996 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	997 "optional 3rd arg must be a dictionary");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	998 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	999 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1000 boot = PyMem_NEW(struct bootstate, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1001 if (boot == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1002 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1003 boot->interp = PyThreadState_GET()->interp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1004 boot->func = func;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1005 boot->args = args;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1006 boot->keyw = keyw;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1007 boot->tstate = _PyThreadState_Prealloc(boot->interp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1008 if (boot->tstate == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1009 PyMem_DEL(boot);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1010 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1011 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1012 Py_INCREF(func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1013 Py_INCREF(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1014 Py_XINCREF(keyw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1015 PyEval_InitThreads(); /* Start the interpreter's thread-awareness */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1016 ident = PyThread_start_new_thread(t_bootstrap, (void*) boot);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1017 if (ident == -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1018 PyErr_SetString(ThreadError, "can't start new thread");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1019 Py_DECREF(func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1020 Py_DECREF(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1021 Py_XDECREF(keyw);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1022 PyThreadState_Clear(boot->tstate);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1023 PyMem_DEL(boot);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1024 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1025 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1026 return PyLong_FromLong(ident);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1027 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1028
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	1029 PyDoc_STRVAR(start_new_doc,
20266 241ef8a923c7 Fix typo in docstring Andrew M. Kuchling <amk@amk.ca> parents: 16140 diff changeset	1030 "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	1031 (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	1032 \n\
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	1033 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	1034 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	1035 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	1036 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	1037 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	1038 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	1039
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1040 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	1041 thread_PyThread_exit_thread(PyObject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1042 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1043 PyErr_SetNone(PyExc_SystemExit);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1044 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1045 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1046
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	1047 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	1048 "exit()\n\
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	1049 (PyThread_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	1050 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	1051 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	1052 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	1053
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	1054 static PyObject *
29498 1402f265e48f Correct function name. Kurt B. Kaiser <kbk@shore.net> parents: 29444 diff changeset	1055 thread_PyThread_interrupt_main(PyObject * self)
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	1056 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1057 PyErr_SetInterrupt();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1058 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1059 return Py_None;
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	1060 }
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	1061
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	1062 PyDoc_STRVAR(interrupt_doc,
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	1063 "interrupt_main()\n\
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	1064 \n\
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	1065 Raise a KeyboardInterrupt in the main thread.\n\
29498 1402f265e48f Correct function name. Kurt B. Kaiser <kbk@shore.net> parents: 29444 diff changeset	1066 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	1067 );
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	1068
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	1069 static lockobject *newlockobject(void);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	1070
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1071 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	1072 thread_PyThread_allocate_lock(PyObject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1073 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1074 return (PyObject *) newlockobject();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1075 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1076
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	1077 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	1078 "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	1079 (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	1080 \n\
64076 e3df34544db9 Issue #8983: Corrected docstrings. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 63897 diff changeset	1081 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	1082
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1083 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	1084 thread_get_ident(PyObject *self)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	1085 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1086 long ident;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1087 ident = PyThread_get_thread_ident();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1088 if (ident == -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1089 PyErr_SetString(ThreadError, "no current thread ident");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1090 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1091 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1092 return PyLong_FromLong(ident);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	1093 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	1094
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	1095 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	1096 "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	1097 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	1098 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	1099 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	1100 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	1101 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	1102 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	1103 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	1104 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	1105
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1106 static PyObject *
56981 6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	1107 thread__count(PyObject *self)
6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	1108 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1109 return PyLong_FromLong(nb_threads);
56981 6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	1110 }
6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	1111
6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	1112 PyDoc_STRVAR(_count_doc,
6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	1113 "_count() -> integer\n\
6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	1114 \n\
56992 bf93e4df7bfb Merged revisions 75969 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56981 diff changeset	1115 \
bf93e4df7bfb Merged revisions 75969 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56981 diff changeset	1116 Return the number of currently running Python threads, excluding \n\
bf93e4df7bfb Merged revisions 75969 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56981 diff changeset	1117 the main thread. The returned number comprises all threads created\n\
bf93e4df7bfb Merged revisions 75969 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56981 diff changeset	1118 through `start_new_thread()` as well as `threading.Thread`, and not\n\
bf93e4df7bfb Merged revisions 75969 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56981 diff changeset	1119 yet finished.\n\
bf93e4df7bfb Merged revisions 75969 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56981 diff changeset	1120 \n\
bf93e4df7bfb Merged revisions 75969 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56981 diff changeset	1121 This function is meant for internal and specialized purposes only.\n\
bf93e4df7bfb Merged revisions 75969 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56981 diff changeset	1122 In most applications `threading.enumerate()` should be used instead.");
56981 6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	1123
6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	1124 static PyObject *
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1125 thread_stack_size(PyObject self, PyObject args)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1126 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1127 size_t old_size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1128 Py_ssize_t new_size = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1129 int rc;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1130
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1131 if (!PyArg_ParseTuple(args, "\|n:stack_size", &new_size))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1132 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1133
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1134 if (new_size < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1135 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1136 "size must be 0 or a positive value");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1137 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1138 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1139
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1140 old_size = PyThread_get_stacksize();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1141
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1142 rc = PyThread_set_stacksize((size_t) new_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1143 if (rc == -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1144 PyErr_Format(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1145 "size not valid: %zd bytes",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1146 new_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1147 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1148 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1149 if (rc == -2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1150 PyErr_SetString(ThreadError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1151 "setting stack size not supported");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1152 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1153 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1154
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1155 return PyLong_FromSsize_t((Py_ssize_t) old_size);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1156 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1157
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1158 PyDoc_STRVAR(stack_size_doc,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1159 "stack_size([size]) -> size\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1160 \n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1161 Return the thread stack size used when creating new threads. The\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1162 optional size argument specifies the stack size (in bytes) to be used\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1163 for subsequently created threads, and must be 0 (use platform or\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1164 configured default) or a positive integer value of at least 32,768 (32k).\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1165 If changing the thread stack size is unsupported, a ThreadError\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1166 exception is raised. If the specified size is invalid, a ValueError\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1167 exception is raised, and the stack size is unmodified. 32k bytes\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1168 currently the minimum supported stack size value to guarantee\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1169 sufficient stack space for the interpreter itself.\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1170 \n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1171 Note that some platforms may have particular restrictions on values for\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1172 the stack size, such as requiring a minimum stack size larger than 32kB or\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1173 requiring allocation in multiples of the system memory page size\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1174 - platform documentation should be referred to for more information\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1175 (4kB pages are common; using multiples of 4096 for the stack size is\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1176 the suggested approach in the absence of more specific information).");
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1177
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	1178 static PyMethodDef thread_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1179 {"start_new_thread", (PyCFunction)thread_PyThread_start_new_thread,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1180 METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1181 start_new_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1182 {"start_new", (PyCFunction)thread_PyThread_start_new_thread,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1183 METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1184 start_new_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1185 {"allocate_lock", (PyCFunction)thread_PyThread_allocate_lock,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1186 METH_NOARGS, allocate_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1187 {"allocate", (PyCFunction)thread_PyThread_allocate_lock,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1188 METH_NOARGS, allocate_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1189 {"exit_thread", (PyCFunction)thread_PyThread_exit_thread,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1190 METH_NOARGS, exit_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1191 {"exit", (PyCFunction)thread_PyThread_exit_thread,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1192 METH_NOARGS, exit_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1193 {"interrupt_main", (PyCFunction)thread_PyThread_interrupt_main,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1194 METH_NOARGS, interrupt_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1195 {"get_ident", (PyCFunction)thread_get_ident,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1196 METH_NOARGS, get_ident_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1197 {"_count", (PyCFunction)thread__count,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1198 METH_NOARGS, _count_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1199 {"stack_size", (PyCFunction)thread_stack_size,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1200 METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1201 stack_size_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1202 {NULL, NULL} /* sentinel */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1203 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1204
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1205
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1206 /* Initialization function */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1207
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	1208 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	1209 "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	1210 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	1211
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	1212 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	1213 "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	1214 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	1215 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	1216 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	1217 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	1218 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	1219 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	1220 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	1221 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	1222 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	1223
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47285 diff changeset	1224 static struct PyModuleDef threadmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1225 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1226 "_thread",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1227 thread_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1228 -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1229 thread_methods,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1230 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1231 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1232 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1233 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47285 diff changeset	1234 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47285 diff changeset	1235
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47285 diff changeset	1236
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24280 diff changeset	1237 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47285 diff changeset	1238 PyInit__thread(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1239 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1240 PyObject m, d, *timeout_max;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1241
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1242 /* Initialize types: */
63897 37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	1243 if (PyType_Ready(&localdummytype) < 0)
37156907f359 Issue #3757: thread-local objects now support cyclic garbage collection. Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	1244 return NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1245 if (PyType_Ready(&localtype) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1246 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1247 if (PyType_Ready(&Locktype) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1248 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1249 if (PyType_Ready(&RLocktype) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1250 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1251
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1252 /* Create the module and add the functions */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1253 m = PyModule_Create(&threadmodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1254 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1255 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1256
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1257 timeout_max = PyFloat_FromDouble(PY_TIMEOUT_MAX / 1000000);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1258 if (!timeout_max)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1259 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1260 if (PyModule_AddObject(m, "TIMEOUT_MAX", timeout_max) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1261 return NULL;
60598 01d1fd775d16 Issue #7316: the acquire() method of lock objects in the :mod:`threading` Antoine Pitrou <solipsis@pitrou.net> parents: 59316 diff changeset	1262
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1263 /* Add a symbolic constant */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1264 d = PyModule_GetDict(m);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1265 ThreadError = PyErr_NewException("_thread.error", NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1266 PyDict_SetItemString(d, "error", ThreadError);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1267 Locktype.tp_doc = lock_doc;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1268 Py_INCREF(&Locktype);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1269 PyDict_SetItemString(d, "LockType", (PyObject *)&Locktype);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1270
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1271 Py_INCREF(&RLocktype);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1272 if (PyModule_AddObject(m, "RLock", (PyObject *)&RLocktype) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1273 return NULL;
57172 6d91aaadddd0 Issue #3001: Add a C implementation of recursive locks which is used by Antoine Pitrou <solipsis@pitrou.net> parents: 56992 diff changeset	1274
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1275 Py_INCREF(&localtype);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1276 if (PyModule_AddObject(m, "_local", (PyObject *)&localtype) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1277 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	1278
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1279 nb_threads = 0;
56981 6cf84e5a6dd7 Merged revisions 75958 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56440 diff changeset	1280
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1281 /* Initialize the C thread library */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1282 PyThread_init_thread();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60598 diff changeset	1283 return m;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1284 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_threadmodule.c @ 64289:325d016c19f7