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

annotate Modules/_threadmodule.c @ 64299:4c978cd3640f 3.1

Merged revisions 84344 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84344 | antoine.pitrou | 2010-08-28 20:17:03 +0200 (sam., 28 août 2010) | 4 lines Issue #1868: Eliminate subtle timing issues in thread-local objects by getting rid of the cached copy of thread-local attribute dictionary. ........

author	Antoine Pitrou <solipsis@pitrou.net>
date	Sat, 28 Aug 2010 18:27:09 +0000
parents	4085cc560e9e
children	0991b40e895d 3c9232a684ae

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

Mercurial > cpython-lru_cache-weakref

annotate Modules/_threadmodule.c @ 64299:4c978cd3640f 3.1