Skip to content

C
cpython
Commit 2368b3c4 authored by Michael W. Hudson's avatar Michael W. Hudson
Browse files
Options

Consistently use hard tabs for indentation. 

Slightly de-Fultonize two bits of C layout.

No semantic changes.
parent 64e08147
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 172 deletions
Modules/threadmodule.c
View file @ 2368b3c4
...@@ -158,11 +158,11 @@ static PyTypeObject Locktype = { ...@@ -158,11 +158,11 @@ static PyTypeObject Locktype = {
#include "structmember.h" #include "structmember.h"
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
PyObject *key; PyObject *key;
PyObject *args; PyObject *args;
PyObject *kw; PyObject *kw;
PyObject *dict; PyObject *dict;
} localobject; } localobject;
static PyTypeObject localtype; static PyTypeObject localtype;
...@@ -170,91 +170,87 @@ static PyTypeObject localtype; ...@@ -170,91 +170,87 @@ static PyTypeObject localtype;
static PyObject * static PyObject *
local_new(PyTypeObject *type, PyObject *args, PyObject *kw) local_new(PyTypeObject *type, PyObject *args, PyObject *kw)
{ {
localobject *self; localobject *self;
PyObject *tdict; PyObject *tdict;
if (type->tp_init == PyBaseObject_Type.tp_init if (type->tp_init == PyBaseObject_Type.tp_init
&& ((args && PyObject_IsTrue(args)) && ((args && PyObject_IsTrue(args))
|| || (kw && PyObject_IsTrue(kw)))) {
(kw && PyObject_IsTrue(kw)) PyErr_SetString(PyExc_TypeError,
) "Initialization arguments are not supported");
) { return NULL;
PyErr_SetString(PyExc_TypeError, }
"Initialization arguments are not supported");
return NULL; self = (localobject *)type->tp_alloc(type, 0);
} if (self == NULL)
return NULL;
self = (localobject *)type->tp_alloc(type, 0);
if (self == NULL) Py_XINCREF(args);
return NULL; self->args = args;
Py_XINCREF(kw);
Py_XINCREF(args); self->kw = kw;
self->args = args; self->dict = NULL; /* making sure */
Py_XINCREF(kw); self->key = PyString_FromFormat("thread.local.%p", self);
self->kw = kw; if (self->key == NULL)
self->dict = NULL; /* making sure */ goto err;
self->key = PyString_FromFormat("thread.local.%p", self);
if (self->key == NULL) self->dict = PyDict_New();
goto err; if (self->dict == NULL)
goto err;
self->dict = PyDict_New();
if (self->dict == NULL) tdict = PyThreadState_GetDict();
goto err; if (tdict == NULL) {
PyErr_SetString(PyExc_SystemError,
tdict = PyThreadState_GetDict(); "Couldn't get thread-state dictionary");
if (tdict == NULL) { goto err;
PyErr_SetString(PyExc_SystemError, }
"Couldn't get thread-state dictionary");
goto err; if (PyDict_SetItem(tdict, self->key, self->dict) < 0)
} goto err;
if (PyDict_SetItem(tdict, self->key, self->dict) < 0) return (PyObject *)self;
goto err;
err:
return (PyObject *)self; Py_DECREF(self);
return NULL;
err:
Py_DECREF(self);
return NULL;
} }
static int static int
local_traverse(localobject *self, visitproc visit, void *arg) local_traverse(localobject *self, visitproc visit, void *arg)
{ {
Py_VISIT(self->args); Py_VISIT(self->args);
Py_VISIT(self->kw); Py_VISIT(self->kw);
Py_VISIT(self->dict); Py_VISIT(self->dict);
return 0; return 0;
} }
static int static int
local_clear(localobject *self) local_clear(localobject *self)
{ {
Py_CLEAR(self->key); Py_CLEAR(self->key);
Py_CLEAR(self->args); Py_CLEAR(self->args);
Py_CLEAR(self->kw); Py_CLEAR(self->kw);
Py_CLEAR(self->dict); Py_CLEAR(self->dict);
return 0; return 0;
} }
static void static void
local_dealloc(localobject *self) local_dealloc(localobject *self)
{ {
PyThreadState *tstate; PyThreadState *tstate;
if (self->key if (self->key
&& (tstate = PyThreadState_Get()) && (tstate = PyThreadState_Get())
&& tstate->interp) { && tstate->interp) {
for(tstate = PyInterpreterState_ThreadHead(tstate->interp); for(tstate = PyInterpreterState_ThreadHead(tstate->interp);
tstate; tstate;
tstate = PyThreadState_Next(tstate) tstate = PyThreadState_Next(tstate))
) if (tstate->dict &&
if (tstate->dict && PyDict_GetItem(tstate->dict, self->key))
PyDict_GetItem(tstate->dict, self->key)) PyDict_DelItem(tstate->dict, self->key);
PyDict_DelItem(tstate->dict, self->key); }
}
local_clear(self);
local_clear(self); self->ob_type->tp_free((PyObject*)self);
self->ob_type->tp_free((PyObject*)self);
} }
static PyObject * static PyObject *
...@@ -263,48 +259,47 @@ _ldict(localobject *self) ...@@ -263,48 +259,47 @@ _ldict(localobject *self)
PyObject *tdict, *ldict; PyObject *tdict, *ldict;
tdict = PyThreadState_GetDict(); tdict = PyThreadState_GetDict();
if (tdict == NULL) { if (tdict == NULL) {
PyErr_SetString(PyExc_SystemError, PyErr_SetString(PyExc_SystemError,
"Couldn't get thread-state dictionary"); "Couldn't get thread-state dictionary");
return NULL; return NULL;
} }
ldict = PyDict_GetItem(tdict, self->key); ldict = PyDict_GetItem(tdict, self->key);
if (ldict == NULL) { if (ldict == NULL) {
ldict = PyDict_New(); /* we own ldict */ ldict = PyDict_New(); /* we own ldict */
if (ldict == NULL) if (ldict == NULL)
return NULL; return NULL;
else { else {
int i = PyDict_SetItem(tdict, self->key, ldict); int i = PyDict_SetItem(tdict, self->key, ldict);
Py_DECREF(ldict); /* now ldict is borowed */ Py_DECREF(ldict); /* now ldict is borowed */
if (i < 0) if (i < 0)
return NULL; return NULL;
} }
Py_CLEAR(self->dict); Py_CLEAR(self->dict);
Py_INCREF(ldict); Py_INCREF(ldict);
self->dict = ldict; /* still borrowed */ self->dict = ldict; /* still borrowed */
if (self->ob_type->tp_init != PyBaseObject_Type.tp_init && if (self->ob_type->tp_init != PyBaseObject_Type.tp_init &&
self->ob_type->tp_init((PyObject*)self, self->ob_type->tp_init((PyObject*)self,
self->args, self->kw) < 0 self->args, self->kw) < 0) {
) { /* we need to get rid of ldict from thread so
/* we need to get rid of ldict from thread so we create a new one the next time we do an attr
we create a new one the next time we do an attr acces */
acces */ PyDict_DelItem(tdict, self->key);
PyDict_DelItem(tdict, self->key); return NULL;
return NULL; }
}
}
} else if (self->dict != ldict) {
else if (self->dict != ldict) { Py_CLEAR(self->dict);
Py_CLEAR(self->dict); Py_INCREF(ldict);
Py_INCREF(ldict); self->dict = ldict;
self->dict = ldict; }
}
return ldict;
return ldict;
} }
static PyObject * static PyObject *
...@@ -312,54 +307,52 @@ local_getattro(localobject *self, PyObject *name) ...@@ -312,54 +307,52 @@ local_getattro(localobject *self, PyObject *name)
{ {
PyObject *ldict, *value; PyObject *ldict, *value;
ldict = _ldict(self); ldict = _ldict(self);
if (ldict == NULL) if (ldict == NULL)
return NULL; return NULL;
if (self->ob_type != &localtype) if (self->ob_type != &localtype)
/* use generic lookup for subtypes */ /* use generic lookup for subtypes */
return PyObject_GenericGetAttr((PyObject *)self, name); return PyObject_GenericGetAttr((PyObject *)self, name);
/* Optimization: just look in dict ourselves */ /* Optimization: just look in dict ourselves */
value = PyDict_GetItem(ldict, name); value = PyDict_GetItem(ldict, name);
if (value == NULL) if (value == NULL)
/* Fall back on generic to get __class__ and __dict__ */ /* Fall back on generic to get __class__ and __dict__ */
return PyObject_GenericGetAttr((PyObject *)self, name); return PyObject_GenericGetAttr((PyObject *)self, name);
Py_INCREF(value); Py_INCREF(value);
return value; return value;
} }
static int static int
local_setattro(localobject *self, PyObject *name, PyObject *v) local_setattro(localobject *self, PyObject *name, PyObject *v)
{ {
PyObject *ldict; PyObject *ldict;
ldict = _ldict(self); ldict = _ldict(self);
if (ldict == NULL) if (ldict == NULL)
return -1; return -1;
return PyObject_GenericSetAttr((PyObject *)self, name, v); return PyObject_GenericSetAttr((PyObject *)self, name, v);
} }
static PyObject * static PyObject *
local_getdict(localobject *self, void *closure) local_getdict(localobject *self, void *closure)
{ {
if (self->dict == NULL) { if (self->dict == NULL) {
PyErr_SetString(PyExc_AttributeError, "__dict__"); PyErr_SetString(PyExc_AttributeError, "__dict__");
return NULL; return NULL;
} }
Py_INCREF(self->dict); Py_INCREF(self->dict);
return self->dict; return self->dict;
} }
static PyGetSetDef local_getset[] = { static PyGetSetDef local_getset[] = {
{"__dict__", {"__dict__", (getter)local_getdict, (setter)NULL,
(getter)local_getdict, (setter)0, "Local-data dictionary", NULL},
"Local-data dictionary", {NULL} /* Sentinel */
NULL},
{NULL} /* Sentinel */
}; };
static PyTypeObject localtype = { static PyTypeObject localtype = {
...@@ -380,28 +373,28 @@ static PyTypeObject localtype = { ...@@ -380,28 +373,28 @@ static PyTypeObject localtype = {
/* tp_hash */ (hashfunc)0, /* tp_hash */ (hashfunc)0,
/* tp_call */ (ternaryfunc)0, /* tp_call */ (ternaryfunc)0,
/* tp_str */ (reprfunc)0, /* tp_str */ (reprfunc)0,
/* tp_getattro */ (getattrofunc)local_getattro, /* tp_getattro */ (getattrofunc)local_getattro,
/* tp_setattro */ (setattrofunc)local_setattro, /* tp_setattro */ (setattrofunc)local_setattro,
/* tp_as_buffer */ 0, /* tp_as_buffer */ 0,
/* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
/* tp_doc */ "Thread-local data", /* tp_doc */ "Thread-local data",
/* tp_traverse */ (traverseproc)local_traverse, /* tp_traverse */ (traverseproc)local_traverse,
/* tp_clear */ (inquiry)local_clear, /* tp_clear */ (inquiry)local_clear,
/* tp_richcompare */ (richcmpfunc)0, /* tp_richcompare */ (richcmpfunc)0,
/* tp_weaklistoffset */ (long)0, /* tp_weaklistoffset */ (long)0,
/* tp_iter */ (getiterfunc)0, /* tp_iter */ (getiterfunc)0,
/* tp_iternext */ (iternextfunc)0, /* tp_iternext */ (iternextfunc)0,
/* tp_methods */ 0, /* tp_methods */ 0,
/* tp_members */ 0, /* tp_members */ 0,
/* tp_getset */ local_getset, /* tp_getset */ local_getset,
/* tp_base */ 0, /* tp_base */ 0,
/* tp_dict */ 0, /* internal use */ /* tp_dict */ 0, /* internal use */
/* tp_descr_get */ (descrgetfunc)0, /* tp_descr_get */ (descrgetfunc)0,
/* tp_descr_set */ (descrsetfunc)0, /* tp_descr_set */ (descrsetfunc)0,
/* tp_dictoffset */ offsetof(localobject, dict), /* tp_dictoffset */ offsetof(localobject, dict),
/* tp_init */ (initproc)0, /* tp_init */ (initproc)0,
/* tp_alloc */ (allocfunc)0, /* tp_alloc */ (allocfunc)0,
/* tp_new */ (newfunc)local_new, /* tp_new */ (newfunc)local_new,
/* tp_free */ 0, /* Low-level free-mem routine */ /* tp_free */ 0, /* Low-level free-mem routine */
/* tp_is_gc */ (inquiry)0, /* For PyObject_IS_GC */ /* tp_is_gc */ (inquiry)0, /* For PyObject_IS_GC */
}; };
...@@ -635,10 +628,10 @@ PyMODINIT_FUNC ...@@ -635,10 +628,10 @@ PyMODINIT_FUNC
initthread(void) initthread(void)
{ {
PyObject *m, *d; PyObject *m, *d;
/* Initialize types: */ /* Initialize types: */
if (PyType_Ready(&localtype) < 0) if (PyType_Ready(&localtype) < 0)
return; return;
/* Create the module and add the functions */ /* Create the module and add the functions */
m = Py_InitModule3("thread", thread_methods, thread_doc); m = Py_InitModule3("thread", thread_methods, thread_doc);
...@@ -652,8 +645,8 @@ initthread(void) ...@@ -652,8 +645,8 @@ initthread(void)
PyDict_SetItemString(d, "LockType", (PyObject *)&Locktype); PyDict_SetItemString(d, "LockType", (PyObject *)&Locktype);
Py_INCREF(&localtype); Py_INCREF(&localtype);
if (PyModule_AddObject(m, "_local", (PyObject *)&localtype) < 0) if (PyModule_AddObject(m, "_local", (PyObject *)&localtype) < 0)
return; return;
/* Initialize the C thread library */ /* Initialize the C thread library */
PyThread_init_thread(); PyThread_init_thread();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7