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

annotate Modules/threadmodule.c @ 24042:63fbbed10714 legacy-trunk

Simplify HTTPSConnection constructor. See discussion in SF bug 458463.

author	Jeremy Hylton <jeremy@alum.mit.edu>
date	Fri, 28 Jun 2002 23:38:14 +0000
parents	ed1ba37a46b7
children	1598a1e473e2

rev	line source
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	1
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Thread module */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	3 /* Interface to Sjoerd's portable C thread library */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	4
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	5 #include "Python.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	6
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	7 #ifndef WITH_THREAD
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	8 #error "Error! The rest of Python is not compiled with thread support."
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	9 #error "Rerun configure, adding a --with-thread option."
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	10 #error "Then run `make clean' followed by `make'."
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	11 #endif
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	12
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 8823 diff changeset	13 #include "pythread.h"
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	14
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	15 static PyObject *ThreadError;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	16
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	17
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	18 /* Lock objects */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	19
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	20 typedef struct {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	21 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	22 PyThread_type_lock lock_lock;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	23 } lockobject;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	24
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	25 staticforward PyTypeObject Locktype;
923 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 lockobject *
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13497 diff changeset	28 newlockobject(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	29 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	30 lockobject *self;
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	31 self = PyObject_New(lockobject, &Locktype);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	32 if (self == NULL)
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	33 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	34 self->lock_lock = PyThread_allocate_lock();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	35 if (self->lock_lock == NULL) {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 11882 diff changeset	36 PyObject_Del(self);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	37 self = NULL;
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	38 PyErr_SetString(ThreadError, "can't allocate lock");
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 return self;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	41 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	42
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	43 static void
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	44 lock_dealloc(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	45 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	46 /* 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	47 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	48 PyThread_release_lock(self->lock_lock);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	49
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	50 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	51 PyObject_Del(self);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	52 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	53
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	54 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	55 lock_PyThread_acquire_lock(lockobject self, PyObject args)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	56 {
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	57 int i = 1;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	58
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	59 if (!PyArg_ParseTuple(args, "\|i:acquire", &i))
3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	60 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	61
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	62 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	63 i = PyThread_acquire_lock(self->lock_lock, i);
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	64 Py_END_ALLOW_THREADS
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	65
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	66 if (args == NULL) {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	67 Py_INCREF(Py_None);
7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	68 return Py_None;
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 else
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	71 return PyBool_FromLong((long)i);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	72 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	73
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	74 PyDoc_STRVAR(acquire_doc,
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	75 "acquire([wait]) -> None or bool\n\
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	76 (PyThread_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	77 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	78 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	79 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	80 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	81 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	82 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	83 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	84
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	85 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	86 lock_PyThread_release_lock(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	87 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	88 /* 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	89 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	90 PyThread_release_lock(self->lock_lock);
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	91 PyErr_SetString(ThreadError, "release unlocked lock");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	92 return NULL;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	93 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	94
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	95 PyThread_release_lock(self->lock_lock);
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	96 Py_INCREF(Py_None);
7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	97 return Py_None;
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(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	101 "release()\n\
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	102 (PyThread_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	103 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	104 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	105 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	106 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	107
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	108 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	109 lock_locked_lock(lockobject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	110 {
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	111 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	112 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	113 return PyBool_FromLong(0L);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	114 }
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	115 return PyBool_FromLong(1L);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	116 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	117
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	118 PyDoc_STRVAR(locked_doc,
22865 7014921820a5 Lock methods acquire() and locked() now return bools. Guido van Rossum <guido@python.org> parents: 22709 diff changeset	119 "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	120 (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	121 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	122 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	123
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	124 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	125 {"acquire_lock", (PyCFunction)lock_PyThread_acquire_lock,
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	126 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	127 {"acquire", (PyCFunction)lock_PyThread_acquire_lock,
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	128 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	129 {"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	130 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	131 {"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	132 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	133 {"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	134 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	135 {"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	136 METH_NOARGS, locked_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	137 {NULL, NULL} /* sentinel */
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	138 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	139
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	140 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	141 lock_getattr(lockobject self, char name)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	142 {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	143 return Py_FindMethod(lock_methods, (PyObject *)self, name);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	144 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	145
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	146 static PyTypeObject Locktype = {
7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	147 PyObject_HEAD_INIT(&PyType_Type)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	148 0, /ob_size/
21313 91dd223829c6 Patch supplied by Burton Radons for his own SF bug #487390: Modifying Guido van Rossum <guido@python.org> parents: 20468 diff changeset	149 "thread.lock", /tp_name/
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	150 sizeof(lockobject), /tp_size/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	151 0, /tp_itemsize/
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	152 /* methods */
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	153 (destructor)lock_dealloc, /tp_dealloc/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	154 0, /tp_print/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	155 (getattrfunc)lock_getattr, /tp_getattr/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	156 0, /tp_setattr/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	157 0, /tp_compare/
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	158 0, /tp_repr/
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	159 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	160
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	161
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	162 /* Module functions */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	163
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	164 struct bootstate {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	165 PyInterpreterState *interp;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	166 PyObject *func;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	167 PyObject *args;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	168 PyObject *keyw;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	169 };
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	170
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	171 static void
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	172 t_bootstrap(void *boot_raw)
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	173 {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	174 struct bootstate boot = (struct bootstate ) boot_raw;
5847 ff9c0110079b Use the new functions PyEval_AcquireThread() and Guido van Rossum <guido@python.org> parents: 5405 diff changeset	175 PyThreadState *tstate;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	176 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	177
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	178 tstate = PyThreadState_New(boot->interp);
5847 ff9c0110079b Use the new functions PyEval_AcquireThread() and Guido van Rossum <guido@python.org> parents: 5405 diff changeset	179 PyEval_AcquireThread(tstate);
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	180 res = PyEval_CallObjectWithKeywords(
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	181 boot->func, boot->args, boot->keyw);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	182 Py_DECREF(boot->func);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	183 Py_DECREF(boot->args);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	184 Py_XDECREF(boot->keyw);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	185 PyMem_DEL(boot_raw);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	186 if (res == NULL) {
8433 7cdff8aa8318 t_bootstrap(): Use PyErr_ExceptionMatches(...) instead of PyErr_Occurred(...). Fred Drake <fdrake@acm.org> parents: 7211 diff changeset	187 if (PyErr_ExceptionMatches(PyExc_SystemExit))
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	188 PyErr_Clear();
2568 2c61786327cf implement exit_thread through SystemExit exception Guido van Rossum <guido@python.org> parents: 2123 diff changeset	189 else {
15288 1f4a9ade30ec t_bootstram(): Use PySys_WriteStderr() instead of fprintf(stderr,...). Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	190 PySys_WriteStderr("Unhandled exception in thread:\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	191 PyErr_PrintEx(0);
2568 2c61786327cf implement exit_thread through SystemExit exception Guido van Rossum <guido@python.org> parents: 2123 diff changeset	192 }
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	193 }
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1746 diff changeset	194 else
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	195 Py_DECREF(res);
5927 63bc9289ab28 Oops, one more checkin. Use the new tstate/interp interface. Guido van Rossum <guido@python.org> parents: 5847 diff changeset	196 PyThreadState_Clear(tstate);
16140 38dcec06617b Use PyThreadState_DeleteCurrent() instead of PyThreadState_Delete() Guido van Rossum <guido@python.org> parents: 15288 diff changeset	197 PyThreadState_DeleteCurrent();
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8567 diff changeset	198 PyThread_exit_thread();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	199 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	200
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	201 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	202 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	203 {
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	204 PyObject func, args, *keyw = NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	205 struct bootstate *boot;
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	206 long ident;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	207
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 9679 diff changeset	208 if (!PyArg_ParseTuple(fargs, "OO\|O:start_new_thread", &func, &args, &keyw))
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	209 return NULL;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	210 if (!PyCallable_Check(func)) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	211 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	212 "first arg must be callable");
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	213 return NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	214 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	215 if (!PyTuple_Check(args)) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	216 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	217 "2nd arg must be a tuple");
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	218 return NULL;
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	219 }
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	220 if (keyw != NULL && !PyDict_Check(keyw)) {
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	221 PyErr_SetString(PyExc_TypeError,
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	222 "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	223 return NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	224 }
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	225 boot = PyMem_NEW(struct bootstate, 1);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	226 if (boot == NULL)
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	227 return PyErr_NoMemory();
5927 63bc9289ab28 Oops, one more checkin. Use the new tstate/interp interface. Guido van Rossum <guido@python.org> parents: 5847 diff changeset	228 boot->interp = PyThreadState_Get()->interp;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	229 boot->func = func;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	230 boot->args = args;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	231 boot->keyw = keyw;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	232 Py_INCREF(func);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	233 Py_INCREF(args);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	234 Py_XINCREF(keyw);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	235 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	236 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	237 if (ident == -1) {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	238 PyErr_SetString(ThreadError, "can't start new thread\n");
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	239 Py_DECREF(func);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	240 Py_DECREF(args);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	241 Py_XDECREF(keyw);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	242 PyMem_DEL(boot);
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	243 return NULL;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 4944 diff changeset	244 }
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	245 return PyInt_FromLong(ident);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	246 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	247
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	248 PyDoc_STRVAR(start_new_doc,
20266 241ef8a923c7 Fix typo in docstring Andrew M. Kuchling <amk@amk.ca> parents: 16140 diff changeset	249 "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	250 (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	251 \n\
20468 ebfd87e87884 Partial patch from SF #452266, by Jason Petrone. Guido van Rossum <guido@python.org> parents: 20266 diff changeset	252 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	253 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	254 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	255 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	256 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	257 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	258
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	259 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	260 thread_PyThread_exit_thread(PyObject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	261 {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	262 PyErr_SetNone(PyExc_SystemExit);
2568 2c61786327cf implement exit_thread through SystemExit exception Guido van Rossum <guido@python.org> parents: 2123 diff changeset	263 return NULL;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	264 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	265
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	266 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	267 "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	268 (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	269 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	270 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	271 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	272
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	273 #ifndef NO_EXIT_PROG
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	274 static PyObject *
13497 95454b73ea91 ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	275 thread_PyThread_exit_prog(PyObject self, PyObject args)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	276 {
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	277 int sts;
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	278 if (!PyArg_ParseTuple(args, "i:exit_prog", &sts))
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	279 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	280 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	281 for (;;) { } /* Should not be reached */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	282 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	283 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	284
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	285 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	286 thread_PyThread_allocate_lock(PyObject *self)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	287 {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	288 return (PyObject *) newlockobject();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	289 }
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	290
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	291 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	292 "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	293 (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	294 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	295 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	296
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	297 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	298 thread_get_ident(PyObject *self)
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	299 {
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	300 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	301 ident = PyThread_get_thread_ident();
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	302 if (ident == -1) {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	303 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	304 return NULL;
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	305 }
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	306 return PyInt_FromLong(ident);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	307 }
1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	308
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	309 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	310 "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	311 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	312 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	313 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	314 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	315 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	316 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	317 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	318 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	319
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	320 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	321 {"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	322 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	323 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	324 {"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	325 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	326 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	327 {"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	328 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	329 {"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	330 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	331 {"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	332 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	333 {"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	334 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	335 {"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	336 METH_NOARGS, get_ident_doc},
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	337 #ifndef NO_EXIT_PROG
22709 3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	338 {"exit_prog", (PyCFunction)thread_PyThread_exit_prog,
3aa4bf7ac31e Remove METH_OLDARGS: Neal Norwitz <nnorwitz@gmail.com> parents: 22584 diff changeset	339 METH_VARARGS},
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1418 diff changeset	340 #endif
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	341 {NULL, NULL} /* sentinel */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	342 };
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	343
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	344
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	345 /* Initialization function */
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	346
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	347 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	348 "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	349 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	350
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 22865 diff changeset	351 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	352 "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	353 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	354 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	355 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	356 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	357 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	358 \n\
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	359 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	360 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	361 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	362
9588 38023a425e48 Add DL_EXPORT() to all modules that could possibly be used Guido van Rossum <guido@python.org> parents: 9288 diff changeset	363 DL_EXPORT(void)
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13497 diff changeset	364 initthread(void)
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	365 {
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	366 PyObject m, d;
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	367
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	368 /* 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	369 m = Py_InitModule3("thread", thread_methods, thread_doc);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	370
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	371 /* Add a symbolic constant */
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	372 d = PyModule_GetDict(m);
6367 2c29b8982643 Apply two changes, systematically: Guido van Rossum <guido@python.org> parents: 5927 diff changeset	373 ThreadError = PyErr_NewException("thread.error", NULL, NULL);
4751 7ab835f87f86 Renamed. Barry Warsaw <barry@python.org> parents: 4600 diff changeset	374 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	375 Locktype.tp_doc = lock_doc;
ff9adb57b8b5 Added doc strings. Also export LockType from the modoule, and give it Guido van Rossum <guido@python.org> parents: 8433 diff changeset	376 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	377 PyDict_SetItemString(d, "LockType", (PyObject *)&Locktype);
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	378
72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	379 /* 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	380 PyThread_init_thread();
923 72aceed365d4 * Makefile adapted to changes below. Guido van Rossum <guido@python.org> parents: diff changeset	381 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/threadmodule.c @ 24042:63fbbed10714 legacy-trunk