summaryrefslogtreecommitdiffstats
path: root/Include/pythonrun.h
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-08-02 02:56:48 (GMT)
committerGuido van Rossum <guido@python.org>1997-08-02 02:56:48 (GMT)
commit29e46a9a12592b89d81f87245b903486c589695a (patch)
tree35cfadc8d8080dc2aa3cac1e741eb9db88f71040 /Include/pythonrun.h
parent7a2d6112d95d5944b60b78232a5a75570db6e76a (diff)
downloadcpython-29e46a9a12592b89d81f87245b903486c589695a.zip
cpython-29e46a9a12592b89d81f87245b903486c589695a.tar.gz
cpython-29e46a9a12592b89d81f87245b903486c589695a.tar.bz2
Mass checkin (more to follow for other directories).
Introduce truly separate (sub)interpreter objects. For now, these must be used by separate threads, created from C. See Demo/pysvr for an example of how to use this. This also rationalizes Python's initialization and finalization behavior: Py_Initialize() -- initialize the whole interpreter Py_Finalize() -- finalize the whole interpreter tstate = Py_NewInterpreter() -- create a new (sub)interpreter Py_EndInterpreter(tstate) -- delete a new (sub)interpreter There are also new interfaces relating to threads and the interpreter lock, which can be used to create new threads, and sometimes have to be used to manipulate the interpreter lock when creating or deleting sub-interpreters. These are only defined when WITH_THREAD is defined: PyEval_AcquireLock() -- acquire the interpreter lock PyEval_ReleaseLock() -- release the interpreter lock PyEval_AcquireThread(tstate) -- acquire the lock and make the thread current PyEval_ReleaseThread(tstate) -- release the lock and make NULL current Other administrative changes: - The header file bltinmodule.h is deleted. - The init functions for Import, Sys and Builtin are now internal and declared in pythonrun.h. - Py_Setup() and Py_Cleanup() are no longer declared. - The interpreter state and thread state structures are now linked together in a chain (the chain of interpreters is a static variable in pythonrun.c). - Some members of the interpreter and thread structures have new, shorter, more consistent, names. - Added declarations for _PyImport_{Find,Fixup}Extension() to import.h.
Diffstat (limited to 'Include/pythonrun.h')
-rw-r--r--Include/pythonrun.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index ae33624..1f8093e 100644
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -40,8 +40,9 @@ PERFORMANCE OF THIS SOFTWARE.
void Py_SetProgramName Py_PROTO((char *));
char *Py_GetProgramName Py_PROTO((void));
-void Py_Setup Py_PROTO((void));
void Py_Initialize Py_PROTO((void));
+PyThreadState *Py_NewInterpreter Py_PROTO((void));
+void Py_EndInterpreter Py_PROTO((PyThreadState *));
int PyRun_AnyFile Py_PROTO((FILE *, char *));
@@ -64,11 +65,6 @@ int Py_AtExit Py_PROTO((void (*func) Py_PROTO((void))));
void Py_Exit Py_PROTO((int));
-void Py_Cleanup Py_PROTO((void));
-
-void PyImport_Init Py_PROTO((void));
-void PyBuiltin_Init Py_PROTO((void));
-
int Py_FdIsInteractive Py_PROTO((FILE *, char *));
/* In getpath.c */
@@ -84,6 +80,12 @@ const char *Py_GetCopyright Py_PROTO((void));
const char *Py_GetCompiler Py_PROTO((void));
const char *Py_GetBuildInfo Py_PROTO((void));
+/* Internal -- various one-time initializations */
+
+PyObject *_PyBuiltin_Init Py_PROTO((void));
+PyObject *_PySys_Init Py_PROTO((void));
+void _PyImport_Init Py_PROTO((void));
+
#ifdef __cplusplus
}
#endif