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

annotate Modules/threadmodule.c @ 58973:db86bf39ccaa legacy-trunk

Issue 7970: When email.Parser.Parser parses a MIME message of type message/rfc822 it turns it into an object whose body consists of a list containing a single Message object. HeaderParser, on the other hand, just copies the body as a string. Generator.flatten has a special handler for the message mime type that expected the body to be the one item list. This fails if the message was parsed by HeaderParser. So we now check to see if the body is a string first, and if so just we just emit it.

author	R. David Murray <rdmurray@bitdance.com>
date	Sun, 21 Feb 2010 04:23:00 +0000
parents	d56b103490a5
children	df5719c298db

rev	line source
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Thread module */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	3 /* Interface to Sjoerd's portable C thread library */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	4
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	5 #include "Python.h"
55704 e21c4c527e66 Add weakref support to the thread.lock type. Gregory P. Smith <greg@mad-scientist.com> parents: 54321 diff changeset	6 #include "structmember.h" /* offsetof */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	7
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	8 #ifndef WITH_THREAD
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	9 #error "Error! The rest of Python is not compiled with thread support."
25127 5165a0ee84c6 --with(out)-thread is deprecated according to configure --help Neal Norwitz <nnorwitz@gmail.com> parents: 24471 diff changeset	10 #error "Rerun configure, adding a --with-threads option."
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	11 #error "Then run `make clean' followed by `make'."
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	12 #endif
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	13
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 8823 diff changeset	14 #include "pythread.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	15
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	16 static PyObject *ThreadError;
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	17 static long nb_threads = 0;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	18
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	19 /* Lock objects */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	20
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	21 typedef struct {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	22 PyObject_HEAD
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	23 PyThread_type_lock lock_lock;
55704 e21c4c527e66 Add weakref support to the thread.lock type. Gregory P. Smith <greg@mad-scientist.com> parents: 54321 diff changeset	24 PyObject *in_weakreflist;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	25 } lockobject;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	26
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	27 static void
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	28 lock_dealloc(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	29 {
40224 c58d1b969843 Add some asserts. In sysmodule, I think these were to try to silence Neal Norwitz <nnorwitz@gmail.com> parents: 38795 diff changeset	30 assert(self->lock_lock);
55704 e21c4c527e66 Add weakref support to the thread.lock type. Gregory P. Smith <greg@mad-scientist.com> parents: 54321 diff changeset	31 if (self->in_weakreflist != NULL)
e21c4c527e66 Add weakref support to the thread.lock type. Gregory P. Smith <greg@mad-scientist.com> parents: 54321 diff changeset	32 PyObject_ClearWeakRefs((PyObject *) self);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	33 /* Unlock the lock so it's safe to free it */
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	34 PyThread_acquire_lock(self->lock_lock, 0);
877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	35 PyThread_release_lock(self->lock_lock);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	36
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	37 PyThread_free_lock(self->lock_lock);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	38 PyObject_Del(self);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	39 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	40
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	41 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	42 lock_PyThread_acquire_lock(lockobject self, PyObject args)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	43 {
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	44 int i = 1;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	45
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	46 if (!PyArg_ParseTuple(args, "\|i:acquire", &i))
3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	47 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	48
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	49 Py_BEGIN_ALLOW_THREADS
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	50 i = PyThread_acquire_lock(self->lock_lock, i);
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	51 Py_END_ALLOW_THREADS
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	52
34998 25a0e1faa8a5 Delete some vestigial code; execution will never reach the 'if' statement if args is NULL Andrew M. Kuchling <amk@amk.ca> parents: 34619 diff changeset	53 return PyBool_FromLong((long)i);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	54 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	55
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	56 PyDoc_STRVAR(acquire_doc,
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	57 "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	58 (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	59 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	60 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	61 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	62 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	63 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	64 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	65 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	66
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	67 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	68 lock_PyThread_release_lock(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	69 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	70 /* Sanity check: the lock must be locked */
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	71 if (PyThread_acquire_lock(self->lock_lock, 0)) {
877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	72 PyThread_release_lock(self->lock_lock);
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	73 PyErr_SetString(ThreadError, "release unlocked lock");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	74 return NULL;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	75 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	76
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	77 PyThread_release_lock(self->lock_lock);
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	78 Py_INCREF(Py_None);
7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	79 return Py_None;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	80 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	81
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	82 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	83 "release()\n\
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36895 diff changeset	84 (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	85 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	86 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	87 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	88 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	89
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	90 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	91 lock_locked_lock(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	92 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	93 if (PyThread_acquire_lock(self->lock_lock, 0)) {
877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	94 PyThread_release_lock(self->lock_lock);
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	95 return PyBool_FromLong(0L);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	96 }
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	97 return PyBool_FromLong(1L);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	98 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	99
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	100 PyDoc_STRVAR(locked_doc,
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	101 "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	102 (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	103 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	104 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	105
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	106 static PyMethodDef lock_methods[] = {
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	107 {"acquire_lock", (PyCFunction)lock_PyThread_acquire_lock,
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	108 METH_VARARGS, acquire_doc},
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	109 {"acquire", (PyCFunction)lock_PyThread_acquire_lock,
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	110 METH_VARARGS, acquire_doc},
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	111 {"release_lock", (PyCFunction)lock_PyThread_release_lock,
22561 043ad7adc896 Remove many uses of PyArg_NoArgs macro, change METH_OLDARGS to METH_NOARGS. Neal Norwitz <nnorwitz@gmail.com> parents: 21313 diff changeset	112 METH_NOARGS, release_doc},
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	113 {"release", (PyCFunction)lock_PyThread_release_lock,
22562 303b6ad13a32 Missed change METH_OLDARGS to METH_NOARGS for two aliased functions Neal Norwitz <nnorwitz@gmail.com> parents: 22561 diff changeset	114 METH_NOARGS, release_doc},
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	115 {"locked_lock", (PyCFunction)lock_locked_lock,
22561 043ad7adc896 Remove many uses of PyArg_NoArgs macro, change METH_OLDARGS to METH_NOARGS. Neal Norwitz <nnorwitz@gmail.com> parents: 21313 diff changeset	116 METH_NOARGS, locked_doc},
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	117 {"locked", (PyCFunction)lock_locked_lock,
22562 303b6ad13a32 Missed change METH_OLDARGS to METH_NOARGS for two aliased functions Neal Norwitz <nnorwitz@gmail.com> parents: 22561 diff changeset	118 METH_NOARGS, locked_doc},
36737 fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 36324 diff changeset	119 {"__enter__", (PyCFunction)lock_PyThread_acquire_lock,
fa92fe15251a Updates to the with-statement: Guido van Rossum <guido@python.org> parents: 36324 diff changeset	120 METH_VARARGS, acquire_doc},
36926 fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36895 diff changeset	121 {"__exit__", (PyCFunction)lock_PyThread_release_lock,
fc10ff322df1 Um, I thought I'd already checked this in. Guido van Rossum <guido@python.org> parents: 36895 diff changeset	122 METH_VARARGS, release_doc},
54321 d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	123 {NULL} /* sentinel */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	124 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	125
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	126 static PyTypeObject Locktype = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 40224 diff changeset	127 PyVarObject_HEAD_INIT(&PyType_Type, 0)
21313 91dd223829c6 Patch supplied by Burton Radons for his own SF bug #487390: Modifying Guido van Rossum <guido@python.org> parents: 20468 diff changeset	128 "thread.lock", /tp_name/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	129 sizeof(lockobject), /tp_size/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	130 0, /tp_itemsize/
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	131 /* methods */
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	132 (destructor)lock_dealloc, /tp_dealloc/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	133 0, /tp_print/
54321 d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	134 0, /tp_getattr/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	135 0, /tp_setattr/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	136 0, /tp_compare/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	137 0, /tp_repr/
54321 d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	138 0, /* tp_as_number */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	139 0, /* tp_as_sequence */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	140 0, /* tp_as_mapping */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	141 0, /* tp_hash */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	142 0, /* tp_call */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	143 0, /* tp_str */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	144 0, /* tp_getattro */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	145 0, /* tp_setattro */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	146 0, /* tp_as_buffer */
55704 e21c4c527e66 Add weakref support to the thread.lock type. Gregory P. Smith <greg@mad-scientist.com> parents: 54321 diff changeset	147 Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
54321 d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	148 0, /* tp_doc */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	149 0, /* tp_traverse */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	150 0, /* tp_clear */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	151 0, /* tp_richcompare */
55704 e21c4c527e66 Add weakref support to the thread.lock type. Gregory P. Smith <greg@mad-scientist.com> parents: 54321 diff changeset	152 offsetof(lockobject, in_weakreflist), /* tp_weaklistoffset */
54321 d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	153 0, /* tp_iter */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	154 0, /* tp_iternext */
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	155 lock_methods, /* tp_methods */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	156 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	157
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	158 static lockobject *
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	159 newlockobject(void)
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	160 {
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	161 lockobject *self;
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	162 self = PyObject_New(lockobject, &Locktype);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	163 if (self == NULL)
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	164 return NULL;
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	165 self->lock_lock = PyThread_allocate_lock();
55704 e21c4c527e66 Add weakref support to the thread.lock type. Gregory P. Smith <greg@mad-scientist.com> parents: 54321 diff changeset	166 self->in_weakreflist = NULL;
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	167 if (self->lock_lock == NULL) {
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	168 PyObject_Del(self);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	169 self = NULL;
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	170 PyErr_SetString(ThreadError, "can't allocate lock");
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	171 }
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	172 return self;
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	173 }
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	174
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	175 /* Thread-local objects */
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	176
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	177 #include "structmember.h"
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	178
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	179 typedef struct {
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	180 PyObject_HEAD
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	181 PyObject *key;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	182 PyObject *args;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	183 PyObject *kw;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	184 PyObject *dict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	185 } localobject;
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	186
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	187 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	188 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	189 {
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	190 localobject *self;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	191 PyObject *tdict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	192
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	193 if (type->tp_init == PyBaseObject_Type.tp_init
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	194 && ((args && PyObject_IsTrue(args))
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	195 \|\| (kw && PyObject_IsTrue(kw)))) {
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	196 PyErr_SetString(PyExc_TypeError,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	197 "Initialization arguments are not supported");
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	198 return NULL;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	199 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	200
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	201 self = (localobject *)type->tp_alloc(type, 0);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	202 if (self == NULL)
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	203 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	204
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	205 Py_XINCREF(args);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	206 self->args = args;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	207 Py_XINCREF(kw);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	208 self->kw = kw;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	209 self->dict = NULL; /* making sure */
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	210 self->key = PyString_FromFormat("thread.local.%p", self);
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	211 if (self->key == NULL)
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	212 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	213
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	214 self->dict = PyDict_New();
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	215 if (self->dict == NULL)
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	216 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	217
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	218 tdict = PyThreadState_GetDict();
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	219 if (tdict == NULL) {
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	220 PyErr_SetString(PyExc_SystemError,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	221 "Couldn't get thread-state dictionary");
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	222 goto err;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	223 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	224
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	225 if (PyDict_SetItem(tdict, self->key, self->dict) < 0)
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	226 goto err;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	227
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	228 return (PyObject *)self;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	229
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	230 err:
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	231 Py_DECREF(self);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	232 return NULL;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	233 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	234
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	235 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	236 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	237 {
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	238 Py_VISIT(self->args);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	239 Py_VISIT(self->kw);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	240 Py_VISIT(self->dict);
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	241 return 0;
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	242 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	243
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	244 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	245 local_clear(localobject *self)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	246 {
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	247 Py_CLEAR(self->args);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	248 Py_CLEAR(self->kw);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	249 Py_CLEAR(self->dict);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	250 return 0;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	251 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	252
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	253 static void
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	254 local_dealloc(localobject *self)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	255 {
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	256 PyThreadState *tstate;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	257 if (self->key
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	258 && (tstate = PyThreadState_Get())
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	259 && tstate->interp) {
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	260 for(tstate = PyInterpreterState_ThreadHead(tstate->interp);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	261 tstate;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	262 tstate = PyThreadState_Next(tstate))
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	263 if (tstate->dict &&
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	264 PyDict_GetItem(tstate->dict, self->key))
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	265 PyDict_DelItem(tstate->dict, self->key);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	266 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	267
56274 eebf3d51d3a4 #6990: clear threading.local's key only after its thread state is removed: Philip Jenvey <pjenvey@underboss.org> parents: 55704 diff changeset	268 Py_XDECREF(self->key);
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	269 local_clear(self);
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 42333 diff changeset	270 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	271 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	272
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	273 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	274 _ldict(localobject *self)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	275 {
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	276 PyObject tdict, ldict;
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	277
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	278 tdict = PyThreadState_GetDict();
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	279 if (tdict == NULL) {
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	280 PyErr_SetString(PyExc_SystemError,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	281 "Couldn't get thread-state dictionary");
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	282 return NULL;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	283 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	284
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	285 ldict = PyDict_GetItem(tdict, self->key);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	286 if (ldict == NULL) {
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	287 ldict = PyDict_New(); /* we own ldict */
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	288
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	289 if (ldict == NULL)
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	290 return NULL;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	291 else {
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	292 int i = PyDict_SetItem(tdict, self->key, ldict);
36895 fd735596f69c typo Georg Brandl <georg@python.org> parents: 36737 diff changeset	293 Py_DECREF(ldict); /* now ldict is borrowed */
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	294 if (i < 0)
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	295 return NULL;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	296 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	297
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	298 Py_CLEAR(self->dict);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	299 Py_INCREF(ldict);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	300 self->dict = ldict; /* still borrowed */
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	301
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 42333 diff changeset	302 if (Py_TYPE(self)->tp_init != PyBaseObject_Type.tp_init &&
26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 42333 diff changeset	303 Py_TYPE(self)->tp_init((PyObject*)self,
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	304 self->args, self->kw) < 0) {
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	305 /* we need to get rid of ldict from thread so
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	306 we create a new one the next time we do an attr
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	307 acces */
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	308 PyDict_DelItem(tdict, self->key);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	309 return NULL;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	310 }
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	311
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	312 }
47859 8ccb35739a96 #Issue3088 in-progress: Race condition with instances of classes derived from threading.local: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	313
8ccb35739a96 #Issue3088 in-progress: Race condition with instances of classes derived from threading.local: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	314 /* The call to tp_init above may have caused another thread to run.
8ccb35739a96 #Issue3088 in-progress: Race condition with instances of classes derived from threading.local: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	315 Install our ldict again. */
8ccb35739a96 #Issue3088 in-progress: Race condition with instances of classes derived from threading.local: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	316 if (self->dict != ldict) {
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	317 Py_CLEAR(self->dict);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	318 Py_INCREF(ldict);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	319 self->dict = ldict;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	320 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	321
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	322 return ldict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	323 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	324
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	325 static int
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	326 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	327 {
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	328 PyObject *ldict;
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	329
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	330 ldict = _ldict(self);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	331 if (ldict == NULL)
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	332 return -1;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	333
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	334 return PyObject_GenericSetAttr((PyObject *)self, name, v);
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	335 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	336
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	337 static PyObject *
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	338 local_getdict(localobject self, void closure)
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	339 {
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	340 if (self->dict == NULL) {
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	341 PyErr_SetString(PyExc_AttributeError, "__dict__");
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	342 return NULL;
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	343 }
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	344
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	345 Py_INCREF(self->dict);
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	346 return self->dict;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	347 }
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	348
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	349 static PyGetSetDef local_getset[] = {
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	350 {"__dict__", (getter)local_getdict, (setter)NULL,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	351 "Local-data dictionary", NULL},
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	352 {NULL} /* Sentinel */
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	353 };
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	354
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	355 static PyObject local_getattro(localobject , PyObject *);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	356
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	357 static PyTypeObject localtype = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 40224 diff changeset	358 PyVarObject_HEAD_INIT(NULL, 0)
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	359 /* tp_name */ "thread._local",
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	360 /* tp_basicsize */ sizeof(localobject),
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	361 /* tp_itemsize */ 0,
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	362 /* tp_dealloc */ (destructor)local_dealloc,
37305 5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	363 /* tp_print */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	364 /* tp_getattr */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	365 /* tp_setattr */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	366 /* tp_compare */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	367 /* tp_repr */ 0,
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	368 /* tp_as_number */ 0,
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	369 /* tp_as_sequence */ 0,
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	370 /* tp_as_mapping */ 0,
37305 5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	371 /* tp_hash */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	372 /* tp_call */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	373 /* tp_str */ 0,
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	374 /* tp_getattro */ (getattrofunc)local_getattro,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	375 /* tp_setattro */ (setattrofunc)local_setattro,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	376 /* tp_as_buffer */ 0,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	377 /* tp_flags */ Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE,
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	378 /* tp_doc */ "Thread-local data",
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	379 /* tp_traverse */ (traverseproc)local_traverse,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	380 /* tp_clear */ (inquiry)local_clear,
37305 5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	381 /* tp_richcompare */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	382 /* tp_weaklistoffset */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	383 /* tp_iter */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	384 /* tp_iternext */ 0,
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	385 /* tp_methods */ 0,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	386 /* tp_members */ 0,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	387 /* tp_getset */ local_getset,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	388 /* tp_base */ 0,
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	389 /* tp_dict / 0, / internal use */
37305 5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	390 /* tp_descr_get */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	391 /* tp_descr_set */ 0,
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	392 /* tp_dictoffset */ offsetof(localobject, dict),
37305 5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	393 /* tp_init */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	394 /* tp_alloc */ 0,
5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	395 /* tp_new */ local_new,
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	396 /* tp_free / 0, / Low-level free-mem routine */
37305 5e1b6f553763 Remove unnecessary casts from type object initializers. Georg Brandl <georg@python.org> parents: 36926 diff changeset	397 /* 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	398 };
97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	399
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	400 static PyObject *
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	401 local_getattro(localobject self, PyObject name)
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	402 {
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	403 PyObject ldict, value;
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	404
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	405 ldict = _ldict(self);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	406 if (ldict == NULL)
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	407 return NULL;
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	408
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 42333 diff changeset	409 if (Py_TYPE(self) != &localtype)
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	410 /* use generic lookup for subtypes */
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	411 return PyObject_GenericGetAttr((PyObject *)self, name);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	412
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	413 /* Optimization: just look in dict ourselves */
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	414 value = PyDict_GetItem(ldict, name);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	415 if (value == NULL)
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	416 /* Fall back on generic to get __class__ and __dict__ */
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	417 return PyObject_GenericGetAttr((PyObject *)self, name);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	418
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	419 Py_INCREF(value);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	420 return value;
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	421 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	422
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	423 /* Module functions */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	424
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	425 struct bootstate {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	426 PyInterpreterState *interp;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	427 PyObject *func;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	428 PyObject *args;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	429 PyObject *keyw;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	430 };
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	431
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	432 static void
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	433 t_bootstrap(void *boot_raw)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	434 {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	435 struct bootstate boot = (struct bootstate ) boot_raw;
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35086 diff changeset	436 PyThreadState *tstate;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	437 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	438
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35086 diff changeset	439 tstate = PyThreadState_New(boot->interp);
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35086 diff changeset	440
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35086 diff changeset	441 PyEval_AcquireThread(tstate);
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	442 nb_threads++;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	443 res = PyEval_CallObjectWithKeywords(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	444 boot->func, boot->args, boot->keyw);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	445 if (res == NULL) {
8433 7cdff8aa8318 t_bootstrap(): Use PyErr_ExceptionMatches(...) instead of PyErr_Occurred(...). Fred Drake <fdrake@acm.org> parents: 7211 diff changeset	446 if (PyErr_ExceptionMatches(PyExc_SystemExit))
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	447 PyErr_Clear();
2568 2c61786327cf implement exit_thread through SystemExit exception Guido van Rossum <guido@python.org> parents: 2123 diff changeset	448 else {
28889 96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	449 PyObject *file;
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	450 PySys_WriteStderr(
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	451 "Unhandled exception in thread started by ");
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	452 file = PySys_GetObject("stderr");
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	453 if (file)
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	454 PyFile_WriteObject(boot->func, file, 0);
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	455 else
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	456 PyObject_Print(boot->func, stderr, 0);
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	457 PySys_WriteStderr("\n");
7211 c764217ae6eb Don't store the exception info from an unhandled exception in a thread Guido van Rossum <guido@python.org> parents: 6367 diff changeset	458 PyErr_PrintEx(0);
2568 2c61786327cf implement exit_thread through SystemExit exception Guido van Rossum <guido@python.org> parents: 2123 diff changeset	459 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	460 }
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1746 diff changeset	461 else
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	462 Py_DECREF(res);
28889 96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	463 Py_DECREF(boot->func);
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	464 Py_DECREF(boot->args);
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	465 Py_XDECREF(boot->keyw);
96b6cc5d408b When an unhandled exception happens, report the repr() of the function Guido van Rossum <guido@python.org> parents: 25127 diff changeset	466 PyMem_DEL(boot_raw);
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	467 nb_threads--;
35117 7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35086 diff changeset	468 PyThreadState_Clear(tstate);
7ea2be2c0e1d Fix bug: Michael W. Hudson <mwh@python.net> parents: 35086 diff changeset	469 PyThreadState_DeleteCurrent();
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8567 diff changeset	470 PyThread_exit_thread();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	471 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	472
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	473 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	474 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	475 {
14363 5da406ebef55 The second argument to start_new_thread() is not a tuple, as pointed Guido van Rossum <guido@python.org> parents: 13820 diff changeset	476 PyObject func, args, *keyw = NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	477 struct bootstate *boot;
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	478 long ident;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	479
38489 3fe3ccdf0155 Make use of METH_O and METH_NOARGS where possible. Georg Brandl <georg@python.org> parents: 38084 diff changeset	480 if (!PyArg_UnpackTuple(fargs, "start_new_thread", 2, 3,
3fe3ccdf0155 Make use of METH_O and METH_NOARGS where possible. Georg Brandl <georg@python.org> parents: 38084 diff changeset	481 &func, &args, &keyw))
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	482 return NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	483 if (!PyCallable_Check(func)) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	484 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	485 "first arg must be callable");
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	486 return NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	487 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	488 if (!PyTuple_Check(args)) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	489 PyErr_SetString(PyExc_TypeError,
14363 5da406ebef55 The second argument to start_new_thread() is not a tuple, as pointed Guido van Rossum <guido@python.org> parents: 13820 diff changeset	490 "2nd arg must be a tuple");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	491 return NULL;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	492 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	493 if (keyw != NULL && !PyDict_Check(keyw)) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	494 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	495 "optional 3rd arg must be a dictionary");
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	496 return NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	497 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	498 boot = PyMem_NEW(struct bootstate, 1);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	499 if (boot == NULL)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	500 return PyErr_NoMemory();
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 29498 diff changeset	501 boot->interp = PyThreadState_GET()->interp;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	502 boot->func = func;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	503 boot->args = args;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	504 boot->keyw = keyw;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	505 Py_INCREF(func);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	506 Py_INCREF(args);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	507 Py_XINCREF(keyw);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	508 PyEval_InitThreads(); /* Start the interpreter's thread-awareness */
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	509 ident = PyThread_start_new_thread(t_bootstrap, (void*) boot);
ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	510 if (ident == -1) {
34619 0dd146fed9dd The error message "can't start new thread" should not end in a Guido van Rossum <guido@python.org> parents: 33254 diff changeset	511 PyErr_SetString(ThreadError, "can't start new thread");
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	512 Py_DECREF(func);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	513 Py_DECREF(args);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	514 Py_XDECREF(keyw);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	515 PyMem_DEL(boot);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	516 return NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	517 }
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	518 return PyInt_FromLong(ident);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	519 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	520
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	521 PyDoc_STRVAR(start_new_doc,
20266 241ef8a923c7 Fix typo in docstring Andrew M. Kuchling <amk@amk.ca> parents: 16140 diff changeset	522 "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	523 (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	524 \n\
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	525 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	526 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	527 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	528 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	529 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	530 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	531
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	532 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	533 thread_PyThread_exit_thread(PyObject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	534 {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	535 PyErr_SetNone(PyExc_SystemExit);
2568 2c61786327cf implement exit_thread through SystemExit exception Guido van Rossum <guido@python.org> parents: 2123 diff changeset	536 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	537 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	538
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	539 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	540 "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	541 (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	542 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	543 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	544 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	545
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	546 static PyObject *
29498 1402f265e48f Correct function name. Kurt B. Kaiser <kbk@shore.net> parents: 29444 diff changeset	547 thread_PyThread_interrupt_main(PyObject * self)
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	548 {
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	549 PyErr_SetInterrupt();
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	550 Py_INCREF(Py_None);
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	551 return Py_None;
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	552 }
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	553
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	554 PyDoc_STRVAR(interrupt_doc,
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	555 "interrupt_main()\n\
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	556 \n\
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	557 Raise a KeyboardInterrupt in the main thread.\n\
29498 1402f265e48f Correct function name. Kurt B. Kaiser <kbk@shore.net> parents: 29444 diff changeset	558 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	559 );
8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	560
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	561 #ifndef NO_EXIT_PROG
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	562 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	563 thread_PyThread_exit_prog(PyObject self, PyObject args)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	564 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	565 int sts;
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	566 if (!PyArg_ParseTuple(args, "i:exit_prog", &sts))
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	567 return NULL;
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	568 Py_Exit(sts); /* Calls PyThread_exit_prog(sts) or _PyThread_exit_prog(sts) */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	569 for (;;) { } /* Should not be reached */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	570 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	571 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	572
37616 1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	573 static lockobject *newlockobject(void);
1e9d7e66c1bc remove forward declarations, move constructor functions. makes code C++ safe. Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	574
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	575 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	576 thread_PyThread_allocate_lock(PyObject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	577 {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	578 return (PyObject *) newlockobject();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	579 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	580
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	581 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	582 "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	583 (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	584 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	585 Create a new lock object. See LockType.__doc__ for information about locks.");
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	586
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	587 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	588 thread_get_ident(PyObject *self)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	589 {
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	590 long ident;
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	591 ident = PyThread_get_thread_ident();
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	592 if (ident == -1) {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	593 PyErr_SetString(ThreadError, "no current thread ident");
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	594 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	595 }
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	596 return PyInt_FromLong(ident);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	597 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	598
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	599 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	600 "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	601 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	602 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	603 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	604 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	605 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	606 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	607 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	608 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	609
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	610 static PyObject *
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	611 thread__count(PyObject *self)
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	612 {
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	613 return PyInt_FromLong(nb_threads);
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	614 }
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	615
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	616 PyDoc_STRVAR(_count_doc,
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	617 "_count() -> integer\n\
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	618 \n\
56991 d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	619 \
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	620 Return the number of currently running Python threads, excluding \n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	621 the main thread. The returned number comprises all threads created\n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	622 through `start_new_thread()` as well as `threading.Thread`, and not\n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	623 yet finished.\n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	624 \n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	625 This function is meant for internal and specialized purposes only.\n\
d56b103490a5 Remove official documentation entry for thread._count() and make the Antoine Pitrou <solipsis@pitrou.net> parents: 56980 diff changeset	626 In most applications `threading.enumerate()` should be used instead.");
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	627
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	628 static PyObject *
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	629 thread_stack_size(PyObject self, PyObject args)
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	630 {
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	631 size_t old_size;
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	632 Py_ssize_t new_size = 0;
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	633 int rc;
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	634
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	635 if (!PyArg_ParseTuple(args, "\|n:stack_size", &new_size))
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	636 return NULL;
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	637
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	638 if (new_size < 0) {
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	639 PyErr_SetString(PyExc_ValueError,
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	640 "size must be 0 or a positive value");
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	641 return NULL;
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	642 }
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	643
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	644 old_size = PyThread_get_stacksize();
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	645
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	646 rc = PyThread_set_stacksize((size_t) new_size);
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	647 if (rc == -1) {
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	648 PyErr_Format(PyExc_ValueError,
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	649 "size not valid: %zd bytes",
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	650 new_size);
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	651 return NULL;
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	652 }
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	653 if (rc == -2) {
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	654 PyErr_SetString(ThreadError,
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	655 "setting stack size not supported");
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	656 return NULL;
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	657 }
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	658
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	659 return PyInt_FromSsize_t((Py_ssize_t) old_size);
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	660 }
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	661
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	662 PyDoc_STRVAR(stack_size_doc,
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	663 "stack_size([size]) -> size\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	664 \n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	665 Return the thread stack size used when creating new threads. The\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	666 optional size argument specifies the stack size (in bytes) to be used\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	667 for subsequently created threads, and must be 0 (use platform or\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	668 configured default) or a positive integer value of at least 32,768 (32k).\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	669 If changing the thread stack size is unsupported, a ThreadError\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	670 exception is raised. If the specified size is invalid, a ValueError\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	671 exception is raised, and the stack size is unmodified. 32k bytes\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	672 currently the minimum supported stack size value to guarantee\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	673 sufficient stack space for the interpreter itself.\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	674 \n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	675 Note that some platforms may have particular restrictions on values for\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	676 the stack size, such as requiring a minimum stack size larger than 32kB or\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	677 requiring allocation in multiples of the system memory page size\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	678 - platform documentation should be referred to for more information\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	679 (4kB pages are common; using multiples of 4096 for the stack size is\n\
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	680 the suggested approach in the absence of more specific information).");
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	681
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	682 static PyMethodDef thread_methods[] = {
13817 3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	683 {"start_new_thread", (PyCFunction)thread_PyThread_start_new_thread,
3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	684 METH_VARARGS,
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	685 start_new_doc},
13817 3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	686 {"start_new", (PyCFunction)thread_PyThread_start_new_thread,
3c0f75a2198f Use METH_VARARGS instead of numeric constant 1 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13651 diff changeset	687 METH_VARARGS,
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	688 start_new_doc},
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	689 {"allocate_lock", (PyCFunction)thread_PyThread_allocate_lock,
22561 043ad7adc896 Remove many uses of PyArg_NoArgs macro, change METH_OLDARGS to METH_NOARGS. Neal Norwitz <nnorwitz@gmail.com> parents: 21313 diff changeset	690 METH_NOARGS, allocate_doc},
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	691 {"allocate", (PyCFunction)thread_PyThread_allocate_lock,
22584 bcd1fdf13acf Missed change METH_OLDARGS to METH_NOARGS for two aliased functions Neal Norwitz <nnorwitz@gmail.com> parents: 22562 diff changeset	692 METH_NOARGS, allocate_doc},
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	693 {"exit_thread", (PyCFunction)thread_PyThread_exit_thread,
22561 043ad7adc896 Remove many uses of PyArg_NoArgs macro, change METH_OLDARGS to METH_NOARGS. Neal Norwitz <nnorwitz@gmail.com> parents: 21313 diff changeset	694 METH_NOARGS, exit_doc},
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	695 {"exit", (PyCFunction)thread_PyThread_exit_thread,
22584 bcd1fdf13acf Missed change METH_OLDARGS to METH_NOARGS for two aliased functions Neal Norwitz <nnorwitz@gmail.com> parents: 22562 diff changeset	696 METH_NOARGS, exit_doc},
29498 1402f265e48f Correct function name. Kurt B. Kaiser <kbk@shore.net> parents: 29444 diff changeset	697 {"interrupt_main", (PyCFunction)thread_PyThread_interrupt_main,
29444 8d160095eb66 Add interrupt_main() to thread module. Kurt B. Kaiser <kbk@shore.net> parents: 28889 diff changeset	698 METH_NOARGS, interrupt_doc},
13820 8bd82cf361aa Use METH_OLDARGS instead of numeric constant 0 in method def. tables Andrew M. Kuchling <amk@amk.ca> parents: 13817 diff changeset	699 {"get_ident", (PyCFunction)thread_get_ident,
22561 043ad7adc896 Remove many uses of PyArg_NoArgs macro, change METH_OLDARGS to METH_NOARGS. Neal Norwitz <nnorwitz@gmail.com> parents: 21313 diff changeset	700 METH_NOARGS, get_ident_doc},
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	701 {"_count", (PyCFunction)thread__count,
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	702 METH_NOARGS, _count_doc},
38794 f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	703 {"stack_size", (PyCFunction)thread_stack_size,
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	704 METH_VARARGS,
f7d23bca599f Patch #1454481: Make thread stack size runtime tunable. Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 38592 diff changeset	705 stack_size_doc},
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	706 #ifndef NO_EXIT_PROG
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	707 {"exit_prog", (PyCFunction)thread_PyThread_exit_prog,
3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	708 METH_VARARGS},
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	709 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	710 {NULL, NULL} /* sentinel */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	711 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	712
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	713
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	714 /* Initialization function */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	715
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	716 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	717 "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	718 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	719
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	720 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	721 "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	722 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	723 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	724 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	725 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	726 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	727 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	728 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	729 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	730 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	731
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24280 diff changeset	732 PyMODINIT_FUNC
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13497 diff changeset	733 initthread(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	734 {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	735 PyObject m, d;
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	736
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	737 /* Initialize types: */
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	738 if (PyType_Ready(&localtype) < 0)
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	739 return;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	740
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	741 /* Create the module and add the functions */
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	742 m = Py_InitModule3("thread", thread_methods, thread_doc);
36324 1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 35117 diff changeset	743 if (m == NULL)
1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 35117 diff changeset	744 return;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	745
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	746 /* Add a symbolic constant */
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	747 d = PyModule_GetDict(m);
6367 2c29b8982643 Apply two changes, systematically: Guido van Rossum <guido@python.org> parents: 5927 diff changeset	748 ThreadError = PyErr_NewException("thread.error", NULL, NULL);
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	749 PyDict_SetItemString(d, "error", ThreadError);
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	750 Locktype.tp_doc = lock_doc;
54321 d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	751 if (PyType_Ready(&Locktype) < 0)
d75079de2e46 stop using Py_FindMethod Benjamin Peterson <benjamin@python.org> parents: 47859 diff changeset	752 return;
8562 ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	753 Py_INCREF(&Locktype);
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	754 PyDict_SetItemString(d, "LockType", (PyObject *)&Locktype);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	755
35085 2015d16d2647 Add a missing incref. Michael W. Hudson <mwh@python.net> parents: 34998 diff changeset	756 Py_INCREF(&localtype);
35086 c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	757 if (PyModule_AddObject(m, "_local", (PyObject *)&localtype) < 0)
c6b7fadf0ada Consistently use hard tabs for indentation. Michael W. Hudson <mwh@python.net> parents: 35085 diff changeset	758 return;
32673 97768d87394a Implemented thread-local data as proposed on python-dev: Jim Fulton <jim@zope.com> parents: 31797 diff changeset	759
56980 29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	760 nb_threads = 0;
29fe5e7bd6ee Issue #7222: Make thread "reaping" more reliable so that reference Antoine Pitrou <solipsis@pitrou.net> parents: 56274 diff changeset	761
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	762 /* Initialize the C thread library */
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	763 PyThread_init_thread();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	764 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/threadmodule.c @ 58973:db86bf39ccaa legacy-trunk