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

annotate Modules/_threadmodule.c @ 63898:109bde5e41b9 3.1

Merged revisions 83918 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83918 | antoine.pitrou | 2010-08-10 00:38:19 +0200 (mar., 10 août 2010) | 5 lines Issue #3757: thread-local objects now support cyclic garbage collection. Thread-local objects involved in reference cycles will be deallocated timely by the cyclic GC, even if the underlying thread is still running. ........

author	Antoine Pitrou <solipsis@pitrou.net>
date	Mon, 09 Aug 2010 22:41:38 +0000
parents	f197407bdba2
children	4085cc560e9e

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"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	6
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	7 #ifndef WITH_THREAD
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	8 #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	9 #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	10 #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	11 #endif
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	12
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 8823 diff changeset	13 #include "pythread.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	14
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	15 static PyObject *ThreadError;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	16
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	17
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	18 /* Lock objects */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	19
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	20 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	21 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	22 PyThread_type_lock lock_lock;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	23 } lockobject;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	24
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	25 static void
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	26 lock_dealloc(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	27 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	28 if (self->lock_lock != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	29 /* Unlock the lock so it's safe to free it */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	30 PyThread_acquire_lock(self->lock_lock, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	31 PyThread_release_lock(self->lock_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	32
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	33 PyThread_free_lock(self->lock_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	34 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	35 PyObject_Del(self);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	36 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	37
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	38 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	39 lock_PyThread_acquire_lock(lockobject self, PyObject args)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	40 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	41 int i = 1;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	42
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	43 if (!PyArg_ParseTuple(args, "\|i:acquire", &i))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	44 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	45
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	46 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	47 i = PyThread_acquire_lock(self->lock_lock, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	48 Py_END_ALLOW_THREADS
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	49
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	50 return PyBool_FromLong((long)i);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	51 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	52
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	53 PyDoc_STRVAR(acquire_doc,
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	54 "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	55 (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	56 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	57 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	58 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	59 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	60 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	61 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	62 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	63
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	64 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	65 lock_PyThread_release_lock(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	66 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	67 /* Sanity check: the lock must be locked */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	68 if (PyThread_acquire_lock(self->lock_lock, 0)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	69 PyThread_release_lock(self->lock_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	70 PyErr_SetString(ThreadError, "release unlocked lock");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	71 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	72 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	73
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	74 PyThread_release_lock(self->lock_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	75 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	76 return Py_None;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	77 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	78
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	79 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	80 "release()\n\
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36895 diff changeset	81 (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	82 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	83 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	84 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	85 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	86
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	87 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	88 lock_locked_lock(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	89 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	90 if (PyThread_acquire_lock(self->lock_lock, 0)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	91 PyThread_release_lock(self->lock_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	92 return PyBool_FromLong(0L);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	93 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	94 return PyBool_FromLong(1L);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	95 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	96
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	97 PyDoc_STRVAR(locked_doc,
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	98 "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	99 (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	100 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	101 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	102
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	103 static PyMethodDef lock_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	104 {"acquire_lock", (PyCFunction)lock_PyThread_acquire_lock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	105 METH_VARARGS, acquire_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	106 {"acquire", (PyCFunction)lock_PyThread_acquire_lock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	107 METH_VARARGS, acquire_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	108 {"release_lock", (PyCFunction)lock_PyThread_release_lock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	109 METH_NOARGS, release_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	110 {"release", (PyCFunction)lock_PyThread_release_lock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	111 METH_NOARGS, release_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	112 {"locked_lock", (PyCFunction)lock_locked_lock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	113 METH_NOARGS, locked_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	114 {"locked", (PyCFunction)lock_locked_lock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	115 METH_NOARGS, locked_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	116 {"__enter__", (PyCFunction)lock_PyThread_acquire_lock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	117 METH_VARARGS, acquire_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	118 {"__exit__", (PyCFunction)lock_PyThread_release_lock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	119 METH_VARARGS, release_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	120 {NULL, NULL} /* sentinel */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	121 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	122
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	123 static PyTypeObject Locktype = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	124 PyVarObject_HEAD_INIT(&PyType_Type, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	125 "_thread.lock", /tp_name/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	126 sizeof(lockobject), /tp_size/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	127 0, /tp_itemsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	128 /* methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	129 (destructor)lock_dealloc, /tp_dealloc/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	130 0, /tp_print/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	131 0, /tp_getattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	132 0, /tp_setattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	133 0, /tp_reserved/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	134 0, /tp_repr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	135 0, /tp_as_number/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	136 0, /tp_as_sequence/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	137 0, /tp_as_mapping/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	138 0, /tp_hash/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	139 0, /tp_call/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	140 0, /tp_str/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	141 0, /tp_getattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	142 0, /tp_setattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	143 0, /tp_as_buffer/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	144 Py_TPFLAGS_DEFAULT, /tp_flags/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	145 0, /tp_doc/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	146 0, /tp_traverse/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	147 0, /tp_clear/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	148 0, /tp_richcompare/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	149 0, /tp_weaklistoffset/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	150 0, /tp_iter/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	151 0, /tp_iternext/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	152 lock_methods, /tp_methods/
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	153 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	154
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	155 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	156 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	157 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	158 lockobject *self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	159 self = PyObject_New(lockobject, &Locktype);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	160 if (self == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	161 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	162 self->lock_lock = PyThread_allocate_lock();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	163 if (self->lock_lock == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	164 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	165 PyErr_SetString(ThreadError, "can't allocate lock");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	166 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	167 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	168 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	169 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36926 diff changeset	170
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	171 /* Thread-local objects */
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	172
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	173 #include "structmember.h"
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	174
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	175 /* Quick overview:
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	176
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	177 We need to be able to reclaim reference cycles as soon as possible
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	178 (both when a thread is being terminated, or a thread-local object
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	179 becomes unreachable from user data). Constraints:
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	180 - it must not be possible for thread-state dicts to be involved in
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	181 reference cycles (otherwise the cyclic GC will refuse to consider
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	182 objects referenced from a reachable thread-state dict, even though
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	183 local_dealloc would clear them)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	184 - the death of a thread-state dict must still imply destruction of the
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	185 corresponding local dicts in all thread-local objects.
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	186
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	187 Our implementation uses small "localdummy" objects in order to break
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	188 the reference chain. These trivial objects are hashable (using the
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	189 default scheme of identity hashing) and weakrefable.
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	190 Each thread-state holds a separate localdummy for each local object
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	191 (as a /strong reference/),
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	192 and each thread-local object holds a dict mapping /weak references/
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	193 of localdummies to local dicts.
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	194
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	195 Therefore:
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	196 - only the thread-state dict holds a strong reference to the dummies
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	197 - only the thread-local object holds a strong reference to the local dicts
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	198 - only outside objects (application- or library-level) hold strong
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	199 references to the thread-local objects
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	200 - as soon as a thread-state dict is destroyed, the weakref callbacks of all
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	201 dummies attached to that thread are called, and destroy the corresponding
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	202 local dicts from thread-local objects
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	203 - as soon as a thread-local object is destroyed, its local dicts are
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	204 destroyed and its dummies are manually removed from all thread states
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	205 - the GC can do its work correctly when a thread-local object is dangling,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	206 without any interference from the thread-state dicts
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	207
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	208 As an additional optimization, each localdummy holds a borrowed reference
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	209 to the corresponding localdict. This borrowed reference is only used
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	210 by the thread-local object which has created the localdummy, which should
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	211 guarantee that the localdict still exists when accessed.
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	212 */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	213
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	214 typedef struct {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	215 PyObject_HEAD
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	216 PyObject localdict; / Borrowed reference! */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	217 PyObject weakreflist; / List of weak references to self */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	218 } localdummyobject;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	219
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	220 static void
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	221 localdummy_dealloc(localdummyobject *self)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	222 {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	223 if (self->weakreflist != NULL)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	224 PyObject_ClearWeakRefs((PyObject *) self);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	225 Py_TYPE(self)->tp_free((PyObject*)self);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	226 }
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	227
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	228 static PyTypeObject localdummytype = {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	229 PyVarObject_HEAD_INIT(NULL, 0)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	230 /* tp_name */ "_thread._localdummy",
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	231 /* tp_basicsize */ sizeof(localdummyobject),
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	232 /* tp_itemsize */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	233 /* tp_dealloc */ (destructor)localdummy_dealloc,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	234 /* tp_print */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	235 /* tp_getattr */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	236 /* tp_setattr */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	237 /* tp_reserved */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	238 /* tp_repr */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	239 /* tp_as_number */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	240 /* tp_as_sequence */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	241 /* tp_as_mapping */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	242 /* tp_hash */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	243 /* tp_call */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	244 /* tp_str */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	245 /* tp_getattro */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	246 /* tp_setattro */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	247 /* tp_as_buffer */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	248 /* tp_flags */ Py_TPFLAGS_DEFAULT,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	249 /* tp_doc */ "Thread-local dummy",
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	250 /* tp_traverse */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	251 /* tp_clear */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	252 /* tp_richcompare */ 0,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	253 /* tp_weaklistoffset */ offsetof(localdummyobject, weakreflist)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	254 };
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	255
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	256
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	257 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	258 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	259 PyObject *key;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	260 PyObject *args;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	261 PyObject *kw;
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	262 /* The current thread's local dict (necessary for tp_dictoffset) */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	263 PyObject *dict;
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	264 PyObject weakreflist; / List of weak references to self */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	265 /* A {localdummy weakref -> localdict} dict */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	266 PyObject *dummies;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	267 /* The callback for weakrefs to localdummies */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	268 PyObject *wr_callback;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	269 } localobject;
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	270
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	271 /* Forward declaration */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	272 static PyObject _ldict(localobject self);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	273 static PyObject _localdummy_destroyed(PyObject meth_self, PyObject *dummyweakref);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	274
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	275 /* Create and register the dummy for the current thread, as well as the
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	276 corresponding local dict */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	277 static int
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	278 _local_create_dummy(localobject *self)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	279 {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	280 PyObject tdict, ldict = NULL, *wr = NULL;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	281 localdummyobject *dummy = NULL;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	282 int r;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	283
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	284 tdict = PyThreadState_GetDict();
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	285 if (tdict == NULL) {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	286 PyErr_SetString(PyExc_SystemError,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	287 "Couldn't get thread-state dictionary");
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	288 goto err;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	289 }
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	290
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	291 ldict = PyDict_New();
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	292 if (ldict == NULL)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	293 goto err;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	294 dummy = (localdummyobject *) localdummytype.tp_alloc(&localdummytype, 0);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	295 if (dummy == NULL)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	296 goto err;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	297 dummy->localdict = ldict;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	298 wr = PyWeakref_NewRef((PyObject *) dummy, self->wr_callback);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	299 if (wr == NULL)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	300 goto err;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	301
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	302 /* As a side-effect, this will cache the weakref's hash before the
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	303 dummy gets deleted */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	304 r = PyDict_SetItem(self->dummies, wr, ldict);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	305 if (r < 0)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	306 goto err;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	307 Py_CLEAR(wr);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	308 r = PyDict_SetItem(tdict, self->key, (PyObject *) dummy);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	309 if (r < 0)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	310 goto err;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	311 Py_CLEAR(dummy);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	312
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	313 Py_CLEAR(self->dict);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	314 self->dict = ldict;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	315 return 0;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	316
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	317 err:
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	318 Py_XDECREF(ldict);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	319 Py_XDECREF(wr);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	320 Py_XDECREF(dummy);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	321 return -1;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	322 }
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	323
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	324 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	325 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	326 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	327 localobject *self;
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	328 PyObject *wr;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	329 static PyMethodDef wr_callback_def = {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	330 "_localdummy_destroyed", (PyCFunction) _localdummy_destroyed, METH_O
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	331 };
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	332
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	333 if (type->tp_init == PyBaseObject_Type.tp_init
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	334 && ((args && PyObject_IsTrue(args))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	335 \|\| (kw && PyObject_IsTrue(kw)))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	336 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	337 "Initialization arguments are not supported");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	338 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	339 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	340
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	341 self = (localobject *)type->tp_alloc(type, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	342 if (self == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	343 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	344
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	345 Py_XINCREF(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	346 self->args = args;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	347 Py_XINCREF(kw);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	348 self->kw = kw;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	349 self->key = PyUnicode_FromFormat("thread.local.%p", self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	350 if (self->key == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	351 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	352
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	353 self->dummies = PyDict_New();
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	354 if (self->dummies == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	355 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	356
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	357 /* We use a weak reference to self in the callback closure
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	358 in order to avoid spurious reference cycles */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	359 wr = PyWeakref_NewRef((PyObject *) self, NULL);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	360 if (wr == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	361 goto err;
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	362 self->wr_callback = PyCFunction_New(&wr_callback_def, wr);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	363 Py_DECREF(wr);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	364 if (self->wr_callback == NULL)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	365 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	366
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	367 if (_local_create_dummy(self) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	368 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	369
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	370 return (PyObject *)self;
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	371
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	372 err:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	373 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	374 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	375 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	376
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	377 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	378 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	379 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	380 Py_VISIT(self->args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	381 Py_VISIT(self->kw);
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	382 Py_VISIT(self->dummies);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	383 Py_VISIT(self->dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	384 return 0;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	385 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	386
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	387 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	388 local_clear(localobject *self)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	389 {
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	390 PyThreadState *tstate;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	391 Py_CLEAR(self->args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	392 Py_CLEAR(self->kw);
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	393 Py_CLEAR(self->dummies);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	394 Py_CLEAR(self->dict);
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	395 Py_CLEAR(self->wr_callback);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	396 /* Remove all strong references to dummies from the thread states */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	397 if (self->key
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	398 && (tstate = PyThreadState_Get())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	399 && tstate->interp) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	400 for(tstate = PyInterpreterState_ThreadHead(tstate->interp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	401 tstate;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	402 tstate = PyThreadState_Next(tstate))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	403 if (tstate->dict &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	404 PyDict_GetItem(tstate->dict, self->key))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	405 PyDict_DelItem(tstate->dict, self->key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	406 }
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	407 return 0;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	408 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	409
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	410 static void
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	411 local_dealloc(localobject *self)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	412 {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	413 /* Weakrefs must be invalidated right now, otherwise they can be used
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	414 from code called below, which is very dangerous since Py_REFCNT(self) == 0 */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	415 if (self->weakreflist != NULL)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	416 PyObject_ClearWeakRefs((PyObject *) self);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	417
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	418 PyObject_GC_UnTrack(self);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	419
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	420 local_clear(self);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	421 Py_XDECREF(self->key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	422 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	423 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	424
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	425 /* 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	426 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	427 _ldict(localobject *self)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	428 {
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	429 PyObject tdict, ldict, *dummy;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	430
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	431 tdict = PyThreadState_GetDict();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	432 if (tdict == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	433 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	434 "Couldn't get thread-state dictionary");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	435 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	436 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	437
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	438 dummy = PyDict_GetItem(tdict, self->key);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	439 if (dummy == NULL) {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	440 if (_local_create_dummy(self) < 0)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	441 return NULL;
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	442 ldict = self->dict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	443
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	444 if (Py_TYPE(self)->tp_init != PyBaseObject_Type.tp_init &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	445 Py_TYPE(self)->tp_init((PyObject*)self,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	446 self->args, self->kw) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	447 /* we need to get rid of ldict from thread so
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	448 we create a new one the next time we do an attr
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	449 acces */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	450 PyDict_DelItem(tdict, self->key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	451 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	452 }
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	453 }
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	454 else {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	455 assert(Py_TYPE(dummy) == &localdummytype);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	456 ldict = ((localdummyobject *) dummy)->localdict;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	457 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	458
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	459 /* The call to tp_init above may have caused another thread to run.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	460 Install our ldict again. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	461 if (self->dict != ldict) {
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	462 Py_INCREF(ldict);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	463 Py_CLEAR(self->dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	464 self->dict = ldict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	465 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	466
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	467 return ldict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	468 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	469
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	470 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	471 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	472 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	473 PyObject *ldict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	474
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	475 ldict = _ldict(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	476 if (ldict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	477 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	478
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	479 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	480 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	481
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	482 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	483 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	484 {
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	485 PyObject *ldict;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	486 ldict = _ldict(self);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	487 Py_XINCREF(ldict);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	488 return ldict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	489 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	490
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	491 static PyGetSetDef local_getset[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	492 {"__dict__", (getter)local_getdict, (setter)NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	493 "Local-data dictionary", NULL},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	494 {NULL} /* Sentinel */
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	495 };
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	496
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	497 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	498
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	499 static PyTypeObject localtype = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	500 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	501 /* tp_name */ "_thread._local",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	502 /* tp_basicsize */ sizeof(localobject),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	503 /* tp_itemsize */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	504 /* tp_dealloc */ (destructor)local_dealloc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	505 /* tp_print */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	506 /* tp_getattr */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	507 /* tp_setattr */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	508 /* tp_reserved */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	509 /* tp_repr */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	510 /* tp_as_number */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	511 /* tp_as_sequence */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	512 /* tp_as_mapping */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	513 /* tp_hash */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	514 /* tp_call */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	515 /* tp_str */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	516 /* tp_getattro */ (getattrofunc)local_getattro,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	517 /* tp_setattro */ (setattrofunc)local_setattro,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	518 /* tp_as_buffer */ 0,
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	519 /* tp_flags */ Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	520 \| Py_TPFLAGS_HAVE_GC,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	521 /* tp_doc */ "Thread-local data",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	522 /* tp_traverse */ (traverseproc)local_traverse,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	523 /* tp_clear */ (inquiry)local_clear,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	524 /* tp_richcompare */ 0,
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	525 /* tp_weaklistoffset */ offsetof(localobject, weakreflist),
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	526 /* tp_iter */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	527 /* tp_iternext */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	528 /* tp_methods */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	529 /* tp_members */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	530 /* tp_getset */ local_getset,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	531 /* tp_base */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	532 /* tp_dict / 0, / internal use */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	533 /* tp_descr_get */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	534 /* tp_descr_set */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	535 /* tp_dictoffset */ offsetof(localobject, dict),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	536 /* tp_init */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	537 /* tp_alloc */ 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	538 /* tp_new */ local_new,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	539 /* tp_free / 0, / Low-level free-mem routine */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	540 /* 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	541 };
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	542
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	543 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	544 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	545 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	546 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	547
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	548 ldict = _ldict(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	549 if (ldict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	550 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	551
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	552 if (Py_TYPE(self) != &localtype)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	553 /* use generic lookup for subtypes */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	554 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	555
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	556 /* Optimization: just look in dict ourselves */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	557 value = PyDict_GetItem(ldict, name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	558 if (value == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	559 /* Fall back on generic to get __class__ and __dict__ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	560 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	561
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	562 Py_INCREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	563 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	564 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	565
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	566 /* Called when a dummy is destroyed. */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	567 static PyObject *
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	568 _localdummy_destroyed(PyObject localweakref, PyObject dummyweakref)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	569 {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	570 PyObject *obj;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	571 localobject *self;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	572 assert(PyWeakref_CheckRef(localweakref));
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	573 obj = PyWeakref_GET_OBJECT(localweakref);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	574 if (obj == Py_None)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	575 Py_RETURN_NONE;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	576 Py_INCREF(obj);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	577 assert(PyObject_TypeCheck(obj, &localtype));
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	578 /* If the thread-local object is still alive and not being cleared,
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	579 remove the corresponding local dict */
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	580 self = (localobject *) obj;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	581 if (self->dummies != NULL) {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	582 PyObject *ldict;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	583 ldict = PyDict_GetItem(self->dummies, dummyweakref);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	584 if (ldict != NULL) {
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	585 if (ldict == self->dict)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	586 Py_CLEAR(self->dict);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	587 PyDict_DelItem(self->dummies, dummyweakref);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	588 }
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	589 if (PyErr_Occurred())
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	590 PyErr_WriteUnraisable(obj);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	591 }
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	592 Py_DECREF(obj);
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	593 Py_RETURN_NONE;
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	594 }
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	595
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	596 /* Module functions */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	597
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	598 struct bootstate {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	599 PyInterpreterState *interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	600 PyObject *func;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	601 PyObject *args;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	602 PyObject *keyw;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	603 PyThreadState *tstate;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	604 };
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	605
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	606 static void
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	607 t_bootstrap(void *boot_raw)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	608 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	609 struct bootstate boot = (struct bootstate ) boot_raw;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	610 PyThreadState *tstate;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	611 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	612
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	613 tstate = boot->tstate;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	614 tstate->thread_id = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	615 _PyThreadState_Init(tstate);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	616 PyEval_AcquireThread(tstate);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	617 res = PyEval_CallObjectWithKeywords(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	618 boot->func, boot->args, boot->keyw);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	619 if (res == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	620 if (PyErr_ExceptionMatches(PyExc_SystemExit))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	621 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	622 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	623 PyObject *file;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	624 PySys_WriteStderr(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	625 "Unhandled exception in thread started by ");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	626 file = PySys_GetObject("stderr");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	627 if (file != NULL && file != Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	628 PyFile_WriteObject(boot->func, file, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	629 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	630 PyObject_Print(boot->func, stderr, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	631 PySys_WriteStderr("\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	632 PyErr_PrintEx(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	633 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	634 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	635 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	636 Py_DECREF(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	637 Py_DECREF(boot->func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	638 Py_DECREF(boot->args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	639 Py_XDECREF(boot->keyw);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	640 PyMem_DEL(boot_raw);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	641 PyThreadState_Clear(tstate);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	642 PyThreadState_DeleteCurrent();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	643 PyThread_exit_thread();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	644 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	645
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	646 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	647 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	648 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	649 PyObject func, args, *keyw = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	650 struct bootstate *boot;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	651 long ident;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	652
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	653 if (!PyArg_UnpackTuple(fargs, "start_new_thread", 2, 3,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	654 &func, &args, &keyw))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	655 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	656 if (!PyCallable_Check(func)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	657 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	658 "first arg must be callable");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	659 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	660 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	661 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	662 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	663 "2nd arg must be a tuple");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	664 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	665 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	666 if (keyw != NULL && !PyDict_Check(keyw)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	667 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	668 "optional 3rd arg must be a dictionary");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	669 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	670 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	671 boot = PyMem_NEW(struct bootstate, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	672 if (boot == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	673 return PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	674 boot->interp = PyThreadState_GET()->interp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	675 boot->func = func;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	676 boot->args = args;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	677 boot->keyw = keyw;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	678 boot->tstate = _PyThreadState_Prealloc(boot->interp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	679 if (boot->tstate == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	680 PyMem_DEL(boot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	681 return PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	682 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	683 Py_INCREF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	684 Py_INCREF(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	685 Py_XINCREF(keyw);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	686 PyEval_InitThreads(); /* Start the interpreter's thread-awareness */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	687 ident = PyThread_start_new_thread(t_bootstrap, (void*) boot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	688 if (ident == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	689 PyErr_SetString(ThreadError, "can't start new thread");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	690 Py_DECREF(func);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	691 Py_DECREF(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	692 Py_XDECREF(keyw);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	693 PyThreadState_Clear(boot->tstate);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	694 PyMem_DEL(boot);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	695 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	696 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	697 return PyLong_FromLong(ident);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	698 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	699
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	700 PyDoc_STRVAR(start_new_doc,
20266 241ef8a923c7 Fix typo in docstring Andrew M. Kuchling <amk@amk.ca> parents: 16140 diff changeset	701 "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	702 (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	703 \n\
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	704 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	705 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	706 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	707 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	708 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	709 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	710
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	711 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	712 thread_PyThread_exit_thread(PyObject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	713 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	714 PyErr_SetNone(PyExc_SystemExit);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	715 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	716 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	717
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	718 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	719 "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	720 (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	721 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	722 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	723 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	724
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	725 static PyObject *
29498 1402f265e48f Correct function name. Kurt B. Kaiser <kbk@shore.net> parents: 29444 diff changeset	726 thread_PyThread_interrupt_main(PyObject * self)
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	727 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	728 PyErr_SetInterrupt();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	729 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	730 return Py_None;
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	731 }
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	732
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	733 PyDoc_STRVAR(interrupt_doc,
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	734 "interrupt_main()\n\
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	735 \n\
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	736 Raise a KeyboardInterrupt in the main thread.\n\
29498 1402f265e48f Correct function name. Kurt B. Kaiser <kbk@shore.net> parents: 29444 diff changeset	737 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	738 );
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	739
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	740 #ifndef NO_EXIT_PROG
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	741 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	742 thread_PyThread_exit_prog(PyObject self, PyObject args)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	743 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	744 int sts;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	745 if (!PyArg_ParseTuple(args, "i:exit_prog", &sts))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	746 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	747 Py_Exit(sts); /* Calls PyThread_exit_prog(sts) or _PyThread_exit_prog(sts) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	748 for (;;) { } /* Should not be reached */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	749 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	750 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	751
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	752 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	753
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	754 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	755 thread_PyThread_allocate_lock(PyObject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	756 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	757 return (PyObject *) newlockobject();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	758 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	759
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	760 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	761 "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	762 (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	763 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	764 Create a new lock object. See LockType.__doc__ 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	765
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	766 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	767 thread_get_ident(PyObject *self)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	768 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	769 long ident;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	770 ident = PyThread_get_thread_ident();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	771 if (ident == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	772 PyErr_SetString(ThreadError, "no current thread ident");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	773 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	774 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	775 return PyLong_FromLong(ident);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	776 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	777
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	778 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	779 "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	780 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	781 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	782 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	783 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	784 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	785 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	786 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	787 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	788
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	789 static PyObject *
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	790 thread_stack_size(PyObject self, PyObject args)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	791 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	792 size_t old_size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	793 Py_ssize_t new_size = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	794 int rc;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	795
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	796 if (!PyArg_ParseTuple(args, "\|n:stack_size", &new_size))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	797 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	798
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	799 if (new_size < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	800 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	801 "size must be 0 or a positive value");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	802 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	803 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	804
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	805 old_size = PyThread_get_stacksize();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	806
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	807 rc = PyThread_set_stacksize((size_t) new_size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	808 if (rc == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	809 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	810 "size not valid: %zd bytes",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	811 new_size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	812 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	813 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	814 if (rc == -2) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	815 PyErr_SetString(ThreadError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	816 "setting stack size not supported");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	817 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	818 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	819
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	820 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	821 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	822
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	823 PyDoc_STRVAR(stack_size_doc,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	824 "stack_size([size]) -> size\n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	825 \n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	826 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	827 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	828 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	829 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	830 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	831 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	832 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	833 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	834 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	835 \n\
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	836 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	837 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	838 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	839 - 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	840 (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	841 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	842
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	843 static PyMethodDef thread_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	844 {"start_new_thread", (PyCFunction)thread_PyThread_start_new_thread,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	845 METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	846 start_new_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	847 {"start_new", (PyCFunction)thread_PyThread_start_new_thread,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	848 METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	849 start_new_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	850 {"allocate_lock", (PyCFunction)thread_PyThread_allocate_lock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	851 METH_NOARGS, allocate_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	852 {"allocate", (PyCFunction)thread_PyThread_allocate_lock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	853 METH_NOARGS, allocate_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	854 {"exit_thread", (PyCFunction)thread_PyThread_exit_thread,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	855 METH_NOARGS, exit_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	856 {"exit", (PyCFunction)thread_PyThread_exit_thread,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	857 METH_NOARGS, exit_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	858 {"interrupt_main", (PyCFunction)thread_PyThread_interrupt_main,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	859 METH_NOARGS, interrupt_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	860 {"get_ident", (PyCFunction)thread_get_ident,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	861 METH_NOARGS, get_ident_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	862 {"stack_size", (PyCFunction)thread_stack_size,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	863 METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	864 stack_size_doc},
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	865 #ifndef NO_EXIT_PROG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	866 {"exit_prog", (PyCFunction)thread_PyThread_exit_prog,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	867 METH_VARARGS},
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	868 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	869 {NULL, NULL} /* sentinel */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	870 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	871
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	872
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	873 /* Initialization function */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	874
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	875 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	876 "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	877 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	878
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	879 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	880 "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	881 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	882 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	883 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	884 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	885 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	886 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	887 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	888 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	889 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	890
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47285 diff changeset	891 static struct PyModuleDef threadmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	892 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	893 "_thread",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	894 thread_doc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	895 -1,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	896 thread_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	897 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	898 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	899 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	900 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47285 diff changeset	901 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47285 diff changeset	902
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47285 diff changeset	903
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24280 diff changeset	904 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	905 PyInit__thread(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	906 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	907 PyObject m, d;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	908
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	909 /* Initialize types: */
63898 109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	910 if (PyType_Ready(&localdummytype) < 0)
109bde5e41b9 Merged revisions 83918 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	911 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	912 if (PyType_Ready(&localtype) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	913 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	914 if (PyType_Ready(&Locktype) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	915 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	916
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	917 /* Create the module and add the functions */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	918 m = PyModule_Create(&threadmodule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	919 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	920 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	921
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	922 /* Add a symbolic constant */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	923 d = PyModule_GetDict(m);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	924 ThreadError = PyErr_NewException("_thread.error", NULL, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	925 PyDict_SetItemString(d, "error", ThreadError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	926 Locktype.tp_doc = lock_doc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	927 Py_INCREF(&Locktype);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	928 PyDict_SetItemString(d, "LockType", (PyObject *)&Locktype);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	929
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	930 Py_INCREF(&localtype);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	931 if (PyModule_AddObject(m, "_local", (PyObject *)&localtype) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	932 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	933
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	934 /* Initialize the C thread library */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	935 PyThread_init_thread();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59317 diff changeset	936 return m;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	937 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_threadmodule.c @ 63898:109bde5e41b9 3.1