Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 21:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Style guide & consistency changes. No semantic changes.

Browse source
This commit is contained in:
Tim Peters 2004-10-09 17:38:29 +00:00
parent 4c1f5ecfe3
commit 19717fa33a
2 changed files with 41 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Python/pystate.c
View file

@ -388,18 +388,20 @@ static int autoTLSkey = 0;
/* Internal initialization/finalization functions called by
Py_Initialize/Py_Finalize
*/
void _PyGILState_Init(PyInterpreterState *i, PyThreadState *t)
void
_PyGILState_Init(PyInterpreterState *i, PyThreadState *t)
{
assert(i && t); /* must init with a valid states */
assert(i && t); /* must init with valid states */
autoTLSkey = PyThread_create_key();
autoInterpreterState = i;
/* Now stash the thread state for this thread in TLS */
PyThread_set_key_value(autoTLSkey, (void *)t);
assert(t->gilstate_counter==0); /* must be a new thread state */
assert(t->gilstate_counter == 0); /* must be a new thread state */
t->gilstate_counter = 1;
}
void _PyGILState_Fini(void)
void
_PyGILState_Fini(void)
{
PyThread_delete_key(autoTLSkey);
autoTLSkey = 0;
@ -407,14 +409,16 @@ void _PyGILState_Fini(void)
}
/* The public functions */
PyThreadState *PyGILState_GetThisThreadState(void)
PyThreadState *
PyGILState_GetThisThreadState(void)
{
if (autoInterpreterState==NULL || autoTLSkey==0)
if (autoInterpreterState == NULL || autoTLSkey == 0)
return NULL;
return (PyThreadState *) PyThread_get_key_value(autoTLSkey);
return (PyThreadState *)PyThread_get_key_value(autoTLSkey);
}
PyGILState_STATE PyGILState_Ensure(void)
PyGILState_STATE
PyGILState_Ensure(void)
{
int current;
PyThreadState *tcur;
@ -425,30 +429,32 @@ PyGILState_STATE PyGILState_Ensure(void)
*/
assert(autoInterpreterState); /* Py_Initialize() hasn't been called! */
tcur = PyThread_get_key_value(autoTLSkey);
if (tcur==NULL) {
if (tcur == NULL) {
/* Create a new thread state for this thread */
tcur = PyThreadState_New(autoInterpreterState);
if (tcur==NULL)
if (tcur == NULL)
Py_FatalError("Couldn't create thread-state for new thread");
PyThread_set_key_value(autoTLSkey, (void *)tcur);
current = 0; /* new thread state is never current */
} else
}
else
current = PyThreadState_IsCurrent(tcur);
if (!current)
if (current == 0)
PyEval_RestoreThread(tcur);
/* Update our counter in the thread-state - no need for locks:
- tcur will remain valid as we hold the GIL.
- the counter is safe as we are the only thread "allowed"
to modify this value
*/
tcur->gilstate_counter++;
++tcur->gilstate_counter;
return current ? PyGILState_LOCKED : PyGILState_UNLOCKED;
}
void PyGILState_Release(PyGILState_STATE oldstate)
void
PyGILState_Release(PyGILState_STATE oldstate)
{
PyThreadState *tcur = PyThread_get_key_value(autoTLSkey);
if (tcur==NULL)
if (tcur == NULL)
Py_FatalError("auto-releasing thread-state, "
"but no thread-state for this thread");
/* We must hold the GIL and have our thread state current */
@ -456,27 +462,27 @@ void PyGILState_Release(PyGILState_STATE oldstate)
but while this is very new (April 2003), the extra check
by release-only users can't hurt.
*/
if (!PyThreadState_IsCurrent(tcur))
if (! PyThreadState_IsCurrent(tcur))
Py_FatalError("This thread state must be current when releasing");
assert (PyThreadState_IsCurrent(tcur));
tcur->gilstate_counter -= 1;
assert (tcur->gilstate_counter >= 0); /* illegal counter value */
assert(PyThreadState_IsCurrent(tcur));
--tcur->gilstate_counter;
assert(tcur->gilstate_counter >= 0); /* illegal counter value */
/* If we are about to destroy this thread-state, we must
clear it while the lock is held, as destructors may run
*/
if (tcur->gilstate_counter==0) {
if (tcur->gilstate_counter == 0) {
/* can't have been locked when we created it */
assert(oldstate==PyGILState_UNLOCKED);
assert(oldstate == PyGILState_UNLOCKED);
PyThreadState_Clear(tcur);
}
/* Release the lock if necessary */
if (oldstate==PyGILState_UNLOCKED)
if (oldstate == PyGILState_UNLOCKED)
PyEval_ReleaseThread(tcur);
/* Now complete destruction of the thread if necessary */
if (tcur->gilstate_counter==0) {
if (tcur->gilstate_counter == 0) {
/* Delete this thread from our TLS */
PyThread_delete_key_value(autoTLSkey);
/* Delete the thread-state */

18
Python/thread.c
View file

@ -157,7 +157,8 @@ static struct key *keyhead = NULL;
static int nkeys = 0;
static PyThread_type_lock keymutex = NULL;
static struct key *find_key(int key, void *value)
static struct key *
find_key(int key, void *value)
{
struct key *p;
long id = PyThread_get_thread_ident();
@ -180,14 +181,16 @@ static struct key *find_key(int key, void *value)
return p;
}
int PyThread_create_key(void)
int
PyThread_create_key(void)
{
if (keymutex == NULL)
keymutex = PyThread_allocate_lock();
return ++nkeys;
}
void PyThread_delete_key(int key)
void
PyThread_delete_key(int key)
{
struct key *p, **q;
PyThread_acquire_lock(keymutex, 1);
@ -204,7 +207,8 @@ void PyThread_delete_key(int key)
PyThread_release_lock(keymutex);
}
int PyThread_set_key_value(int key, void *value)
int
PyThread_set_key_value(int key, void *value)
{
struct key *p = find_key(key, value);
if (p == NULL)
@ -213,7 +217,8 @@ int PyThread_set_key_value(int key, void *value)
return 0;
}
void *PyThread_get_key_value(int key)
void *
PyThread_get_key_value(int key)
{
struct key *p = find_key(key, NULL);
if (p == NULL)
@ -222,7 +227,8 @@ void *PyThread_get_key_value(int key)
return p->value;
}
void PyThread_delete_key_value(int key)
void
PyThread_delete_key_value(int key)
{
long id = PyThread_get_thread_ident();
struct key *p, **q;