(minpos), (maxpos), (minkw), (buf)))
PyAPI_FUNC(PyObject *) _PyModule_CreateInitialized(PyModuleDef*, int apiver);
-
-PyAPI_DATA(const char *) _Py_PackageContext;
#include <locale.h> /* struct lconv */
+
+struct _fileutils_state {
+ int force_ascii;
+};
+
typedef enum {
_Py_ERROR_UNKNOWN=0,
_Py_ERROR_STRICT,
/* other API */
+enum _py_float_format_type {
+ _py_float_format_unknown,
+ _py_float_format_ieee_big_endian,
+ _py_float_format_ieee_little_endian,
+};
+
+struct _Py_float_runtime_state {
+ enum _py_float_format_type float_format;
+ enum _py_float_format_type double_format;
+};
+
+
#ifndef WITH_FREELISTS
// without freelists
# define PyFloat_MAXFREELIST 0
_PyTime_t accumulated;
int header;
} find_and_load;
+ /* Package context -- the full module name for package imports */
+ const char * pkgcontext;
};
struct _pending_calls {
+ int busy;
PyThread_type_lock lock;
/* Request for running pending calls. */
_Py_atomic_int calls_to_do;
# error "this header requires Py_BUILD_CORE define"
#endif
-uint64_t _Py_KeyedHash(uint64_t, const char *, Py_ssize_t);
+struct pyhash_runtime_state {
+ struct {
+#ifndef MS_WINDOWS
+ int fd;
+ dev_t st_dev;
+ ino_t st_ino;
+#else
+ // This is a placeholder so the struct isn't empty on Windows.
+ int _not_used;
+#endif
+ } urandom_cache;
+};
+
+#ifndef MS_WINDOWS
+# define _py_urandom_cache_INIT \
+ { \
+ .fd = -1, \
+ }
+#else
+# define _py_urandom_cache_INIT {0}
#endif
+
+#define pyhash_state_INIT \
+ { \
+ .urandom_cache = _py_urandom_cache_INIT, \
+ }
+
+
+uint64_t _Py_KeyedHash(uint64_t, const char *, Py_ssize_t);
+
+
+#endif // Py_INTERNAL_HASH_H
struct _PyArgv;
struct pyruntimestate;
-/* True if the main interpreter thread exited due to an unhandled
- * KeyboardInterrupt exception, suggesting the user pressed ^C. */
-PyAPI_DATA(int) _Py_UnhandledKeyboardInterrupt;
-
extern int _Py_SetFileSystemEncoding(
const char *encoding,
const char *errors);
#include "pycore_atomic.h" /* _Py_atomic_address */
#include "pycore_dtoa.h" // struct _dtoa_runtime_state
+#include "pycore_floatobject.h" // struct _Py_float_runtime_state
#include "pycore_gil.h" // struct _gil_runtime_state
#include "pycore_global_objects.h" // struct _Py_global_objects
#include "pycore_import.h" // struct _import_runtime_state
#include "pycore_interp.h" // PyInterpreterState
#include "pycore_pymem.h" // struct _pymem_allocators
+#include "pycore_pyhash.h" // struct pyhash_runtime_state
#include "pycore_obmalloc.h" // struct obmalloc_state
#include "pycore_unicodeobject.h" // struct _Py_unicode_runtime_ids
struct _pymem_allocators allocators;
struct _obmalloc_state obmalloc;
+ struct pyhash_runtime_state pyhash_state;
+ struct {
+ /* True if the main interpreter thread exited due to an unhandled
+ * KeyboardInterrupt exception, suggesting the user pressed ^C. */
+ int unhandled_keyboard_interrupt;
+ } signals;
struct pyinterpreters {
PyThread_type_lock mutex;
struct _PyTraceMalloc_Config config;
} tracemalloc;
struct _dtoa_runtime_state dtoa;
+ struct _fileutils_state fileutils;
PyPreConfig preconfig;
void *open_code_userdata;
_Py_AuditHookEntry *audit_hook_head;
- struct _Py_unicode_runtime_ids unicode_ids;
+ struct _Py_float_runtime_state float_state;
+ struct _Py_unicode_runtime_state unicode_state;
struct {
/* Used to set PyTypeObject.tp_version_tag */
#define _PyRuntimeState_INIT(runtime) \
{ \
- .gilstate = { \
- .check_enabled = 1, \
- /* A TSS key must be initialized with Py_tss_NEEDS_INIT \
- in accordance with the specification. */ \
- .autoTSSkey = Py_tss_NEEDS_INIT, \
- }, \
.allocators = { \
_pymem_allocators_standard_INIT(runtime), \
_pymem_allocators_debug_INIT, \
_pymem_allocators_obj_arena_INIT, \
}, \
.obmalloc = _obmalloc_state_INIT(runtime.obmalloc), \
+ .pyhash_state = pyhash_state_INIT, \
.interpreters = { \
/* This prevents interpreters from getting created \
until _PyInterpreterState_Enable() is called. */ \
.next_id = -1, \
}, \
- .tracemalloc = { \
- .config = _PyTraceMalloc_Config_INIT, \
- }, \
- .dtoa = _dtoa_runtime_state_INIT(runtime), \
- .types = { \
- .next_version_tag = 1, \
- }, \
.imports = { \
.lock = { \
.mutex = NULL, \
.header = 1, \
}, \
}, \
+ .gilstate = { \
+ .check_enabled = 1, \
+ /* A TSS key must be initialized with Py_tss_NEEDS_INIT \
+ in accordance with the specification. */ \
+ .autoTSSkey = Py_tss_NEEDS_INIT, \
+ }, \
+ .tracemalloc = { \
+ .config = _PyTraceMalloc_Config_INIT, \
+ }, \
+ .dtoa = _dtoa_runtime_state_INIT(runtime), \
+ .fileutils = { \
+ .force_ascii = -1, \
+ }, \
+ .float_state = { \
+ .float_format = _py_float_format_unknown, \
+ .double_format = _py_float_format_unknown, \
+ }, \
+ .types = { \
+ .next_version_tag = 1, \
+ }, \
.global_objects = { \
.singletons = { \
.small_ints = _Py_small_ints_INIT, \
Py_ssize_t next_index;
};
+struct _Py_unicode_runtime_state {
+ struct _Py_unicode_runtime_ids ids;
+};
+
/* fs_codec.encoding is initialized to NULL.
Later, it is set to a non-NULL string by _PyUnicode_InitEncodings(). */
struct _Py_unicode_fs_codec {
Py_DECREF(module);
return pymain_exit_err_print();
}
- _Py_UnhandledKeyboardInterrupt = 0;
+ _PyRuntime.signals.unhandled_keyboard_interrupt = 0;
result = PyObject_Call(runmodule, runargs, NULL);
if (!result && PyErr_Occurred() == PyExc_KeyboardInterrupt) {
- _Py_UnhandledKeyboardInterrupt = 1;
+ _PyRuntime.signals.unhandled_keyboard_interrupt = 1;
}
Py_DECREF(runpy);
Py_DECREF(runmodule);
pymain_free();
- if (_Py_UnhandledKeyboardInterrupt) {
+ if (_PyRuntime.signals.unhandled_keyboard_interrupt) {
exitcode = exit_sigint();
}
}
/* this is for the benefit of the pack/unpack routines below */
+typedef enum _py_float_format_type float_format_type;
+#define unknown_format _py_float_format_unknown
+#define ieee_big_endian_format _py_float_format_ieee_big_endian
+#define ieee_little_endian_format _py_float_format_ieee_little_endian
-typedef enum {
- unknown_format, ieee_big_endian_format, ieee_little_endian_format
-} float_format_type;
+#define float_format (_PyRuntime.float_state.float_format)
+#define double_format (_PyRuntime.float_state.double_format)
-static float_format_type double_format, float_format;
/*[clinic input]
@classmethod
.tp_vectorcall = (vectorcallfunc)float_vectorcall,
};
-void
-_PyFloat_InitState(PyInterpreterState *interp)
+static void
+_init_global_state(void)
{
- if (!_Py_IsMainInterpreter(interp)) {
- return;
- }
-
float_format_type detected_double_format, detected_float_format;
/* We attempt to determine if this machine is using IEEE
float_format = detected_float_format;
}
+void
+_PyFloat_InitState(PyInterpreterState *interp)
+{
+ if (!_Py_IsMainInterpreter(interp)) {
+ return;
+ }
+ _init_global_state();
+}
+
PyStatus
_PyFloat_InitTypes(PyInterpreterState *interp)
{
_Py_PackageContext, and PyModule_Create*() will substitute this
(if the name actually matches).
*/
+#define _Py_PackageContext (_PyRuntime.imports.pkgcontext)
if (_Py_PackageContext != NULL) {
const char *p = strrchr(_Py_PackageContext, '.');
if (p != NULL && strcmp(module->m_name, p+1) == 0) {
_Py_PackageContext = NULL;
}
}
+#undef _Py_PackageContext
if ((m = (PyModuleObject*)PyModule_New(name)) == NULL)
return NULL;
Py_ssize_t index = _Py_atomic_size_get(&id->index);
if (index < 0) {
- struct _Py_unicode_runtime_ids *rt_ids = &interp->runtime->unicode_ids;
+ struct _Py_unicode_runtime_ids *rt_ids = &interp->runtime->unicode_state.ids;
PyThread_acquire_lock(rt_ids->lock, WAIT_LOCK);
// Check again to detect concurrent access. Another thread can have
/* Initialize the Unicode implementation */
-void
-_PyUnicode_InitState(PyInterpreterState *interp)
+static void
+_init_global_state(void)
{
- if (!_Py_IsMainInterpreter(interp)) {
+ static int initialized = 0;
+ if (initialized) {
return;
}
+ initialized = 1;
/* initialize the linebreak bloom filter */
const Py_UCS2 linebreak[] = {
Py_ARRAY_LENGTH(linebreak));
}
+void
+_PyUnicode_InitState(PyInterpreterState *interp)
+{
+ if (!_Py_IsMainInterpreter(interp)) {
+ return;
+ }
+ _init_global_state();
+}
+
PyStatus
_PyUnicode_InitGlobalObjects(PyInterpreterState *interp)
#include "Python.h"
#include "pycore_initconfig.h"
#include "pycore_fileutils.h" // _Py_fstat_noraise()
+#include "pycore_runtime.h" // _PyRuntime
#ifdef MS_WINDOWS
# include <windows.h>
#endif /* defined(HAVE_GETENTROPY) && !(defined(__sun) && defined(__SVR4)) */
-static struct {
- int fd;
- dev_t st_dev;
- ino_t st_ino;
-} urandom_cache = { -1 };
+#define urandom_cache (_PyRuntime.pyhash_state.urandom_cache)
/* Read random bytes from the /dev/urandom device:
urandom_cache.fd = -1;
}
}
+
+#undef urandom_cache
+
#endif /* !MS_WINDOWS */
}
/* don't perform recursive pending calls */
- static int busy = 0;
- if (busy) {
+ if (interp->ceval.pending.busy) {
return 0;
}
- busy = 1;
+ interp->ceval.pending.busy = 1;
/* unsignal before starting to call callbacks, so that any callback
added in-between re-signals */
}
}
- busy = 0;
+ interp->ceval.pending.busy = 0;
return res;
error:
- busy = 0;
+ interp->ceval.pending.busy = 0;
SIGNAL_PENDING_CALLS(interp);
return res;
}
Py_DecodeLocale() uses mbstowcs()
-1: unknown, need to call check_force_ascii() to get the value
*/
-static int force_ascii = -1;
+#define force_ascii (_PyRuntime.fileutils.force_ascii)
static int
check_force_ascii(void)
p0 = (PyModInitFunction)exportfunc;
/* Package context is needed for single-phase init */
+#define _Py_PackageContext (_PyRuntime.imports.pkgcontext)
oldcontext = _Py_PackageContext;
_Py_PackageContext = PyUnicode_AsUTF8(name_unicode);
if (_Py_PackageContext == NULL) {
}
m = _PyImport_InitFunc_TrampolineCall(p0);
_Py_PackageContext = oldcontext;
+#undef _Py_PackageContext
if (m == NULL) {
if (!PyErr_Occurred()) {
static PyObject *va_build_value(const char *, va_list, int);
static PyObject **va_build_stack(PyObject **small_stack, Py_ssize_t small_stack_len, const char *, va_list, int, Py_ssize_t*);
-/* Package context -- the full module name for package imports */
-const char *_Py_PackageContext = NULL;
-
int
_Py_convert_optional_to_ssize_t(PyObject *obj, void *result)
static void wait_for_thread_shutdown(PyThreadState *tstate);
static void call_ll_exitfuncs(_PyRuntimeState *runtime);
-int _Py_UnhandledKeyboardInterrupt = 0;
-
/* The following places the `_PyRuntime` structure in a location that can be
* found without any external information. This is meant to ease access to the
* interpreter state for various runtime debugging tools, but is *not* an
// Set it to the ID of the main thread of the main interpreter.
runtime->main_thread = PyThread_get_thread_ident();
- runtime->unicode_ids.next_index = unicode_next_index;
- runtime->unicode_ids.lock = unicode_ids_mutex;
+ runtime->unicode_state.ids.next_index = unicode_next_index;
+ runtime->unicode_state.ids.lock = unicode_ids_mutex;
runtime->_initialized = 1;
}
_Py_AuditHookEntry *audit_hook_head = runtime->audit_hook_head;
// bpo-42882: Preserve next_index value if Py_Initialize()/Py_Finalize()
// is called multiple times.
- Py_ssize_t unicode_next_index = runtime->unicode_ids.next_index;
+ Py_ssize_t unicode_next_index = runtime->unicode_state.ids.next_index;
PyThread_type_lock lock1, lock2, lock3, lock4;
if (alloc_for_runtime(&lock1, &lock2, &lock3, &lock4) != 0) {
FREE_LOCK(runtime->interpreters.mutex);
FREE_LOCK(runtime->xidregistry.mutex);
- FREE_LOCK(runtime->unicode_ids.lock);
+ FREE_LOCK(runtime->unicode_state.ids.lock);
FREE_LOCK(runtime->getargs.mutex);
#undef FREE_LOCK
int reinit_interp = _PyThread_at_fork_reinit(&runtime->interpreters.mutex);
int reinit_xidregistry = _PyThread_at_fork_reinit(&runtime->xidregistry.mutex);
- int reinit_unicode_ids = _PyThread_at_fork_reinit(&runtime->unicode_ids.lock);
+ int reinit_unicode_ids = _PyThread_at_fork_reinit(&runtime->unicode_state.ids.lock);
int reinit_getargs = _PyThread_at_fork_reinit(&runtime->getargs.mutex);
PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
* uncaught exception to trigger an unexplained signal exit from a future
* Py_Main() based one.
*/
- _Py_UnhandledKeyboardInterrupt = 0;
+ // XXX Isn't this dealt with by the move to _PyRuntimeState?
+ _PyRuntime.signals.unhandled_keyboard_interrupt = 0;
/* Set globals['__builtins__'] if it doesn't exist */
if (globals != NULL && _PyDict_GetItemStringWithError(globals, "__builtins__") == NULL) {
v = PyEval_EvalCode((PyObject*)co, globals, locals);
if (!v && _PyErr_Occurred(tstate) == PyExc_KeyboardInterrupt) {
- _Py_UnhandledKeyboardInterrupt = 1;
+ _PyRuntime.signals.unhandled_keyboard_interrupt = 1;
}
return v;
}
Python/perf_trampoline.c - extra_code_index -
Python/perf_trampoline.c - code_arena -
Python/perf_trampoline.c - trampoline_api -
-Parser/pegen.c - memo_statistics -
-Python/bootstrap_hash.c - urandom_cache -
-Python/ceval_gil.c make_pending_calls busy -
-Python/ceval.c _PyEval_SetProfile reentrant -
-Python/ceval.c _PyEval_SetTrace reentrant -
-Python/modsupport.c - _Py_PackageContext -
Python/thread_pthread_stubs.h - py_tls_entries -
-Python/pyfpe.c - PyFPE_counter -
-Python/pylifecycle.c _Py_FatalErrorFormat reentrant -
-Python/pylifecycle.c - _Py_UnhandledKeyboardInterrupt -
-Python/pylifecycle.c fatal_error reentrant -
##################################
filename funcname name reason
#??? - somevar ???
+# All globals here are technically mutable but known to be safe.
+
+
+##################################
+# process-global resources
+
+# Initialization for these should be idempotent.
+
+#-----------------------
+# effectively const, set once before/during first init
+
+Modules/getbuildinfo.c - buildinfo -
+Modules/getbuildinfo.c - initialized -
+Python/getversion.c - initialized -
+Python/getversion.c - version -
+
+#-----------------------
+# effectively const, set once during first init
+
+Python/bootstrap_hash.c - _Py_HashSecret_Initialized -
+Python/pyhash.c - _Py_HashSecret -
+Python/thread.c - initialized -
+Python/thread_pthread.h - condattr_monotonic -
+
+# safe static buffer used during one-time initialization
+Python/thread_pthread.h init_condattr ca -
+
+# indicators for process-global resource availability/capability
+Python/bootstrap_hash.c py_getrandom getrandom_works -
+Python/fileutils.c - _Py_open_cloexec_works -
+Python/fileutils.c set_inheritable ioctl_works -
+
+#-----------------------
+# effectively const but set once lazily (*after* first init)
+
+Objects/longobject.c long_from_non_binary_base log_base_BASE -
+Objects/longobject.c long_from_non_binary_base convwidth_base -
+Objects/longobject.c long_from_non_binary_base convmultmax_base -
+Objects/unicodeobject.c - bloom_linebreak -
+Objects/unicodeobject.c _init_global_state initialized -
+
+# XXX Move to _PyRuntimeState?
+Parser/action_helpers.c _PyPegen_dummy_name cache -
+
+
##################################
-# mutable but known to be safe
+# state tied to C main() (only in main thread)
+
+#-----------------------
+# handling C argv
+
+Python/getopt.c - _PyOS_optarg -
+Python/getopt.c - _PyOS_opterr -
+Python/getopt.c - _PyOS_optind -
+Python/getopt.c - opt_ptr -
+Python/pathconfig.c - _Py_path_config -
+
+#-----------------------
+# REPL
+
+Parser/myreadline.c - _PyOS_ReadlineLock -
+Parser/myreadline.c - _PyOS_ReadlineTState -
+Parser/myreadline.c - PyOS_InputHook -
+Parser/myreadline.c - PyOS_ReadlineFunctionPointer -
+
+
+##################################
+# state tied to each runtime init/fini cycle
Python/pylifecycle.c - _PyRuntime -
+Python/pylifecycle.c - runtime_initialized -
# All uses of _PyArg_Parser are handled in c-analyzr/cpython/_analyzer.py.
#-----------------------
-# legacy config flags
+# effectively const once init finishes
+
+# set by embedders before init (whether directly or through a call)
+Python/initconfig.c - _Py_StandardStreamEncoding -
+Python/initconfig.c - _Py_StandardStreamErrors -
+Python/initconfig.c - orig_argv -
+
+# deprecated
+Python/preconfig.c - Py_FileSystemDefaultEncoding -
+Python/preconfig.c - Py_HasFileSystemDefaultEncoding -
+Python/preconfig.c - Py_FileSystemDefaultEncodeErrors -
+Python/preconfig.c - _Py_HasFileSystemDefaultEncodeErrors -
+# legacy config flags
Python/initconfig.c - Py_UTF8Mode -
Python/initconfig.c - Py_DebugFlag -
Python/initconfig.c - Py_VerboseFlag -
Python/initconfig.c - Py_LegacyWindowsFSEncodingFlag -
Python/initconfig.c - Py_LegacyWindowsStdioFlag -
-#-----------------------
-# effectively const, initialized before init
-
+# initialized statically, customized by embedders
Python/frozen.c - PyImport_FrozenModules -
Python/import.c - inittab_copy -
Python/import.c - PyImport_Inittab -
-#-----------------------
-# effectively const, initialized before/during init
+# used temporarily during init
+Python/sysmodule.c - _preinit_warnoptions -
+Python/sysmodule.c - _preinit_xoptions -
-Modules/getbuildinfo.c - buildinfo -
-Modules/getbuildinfo.c - initialized -
-Python/getversion.c - initialized -
-Python/getversion.c - version -
-#-----------------------
-# effectively const, initialized during init
+##################################
+# special-use diagnistic state
-Objects/floatobject.c - double_format -
-Objects/floatobject.c - float_format -
-Objects/unicodeobject.c - bloom_linebreak -
-Python/bootstrap_hash.c py_getrandom getrandom_works -
-Python/bootstrap_hash.c - _Py_HashSecret_Initialized -
-Python/fileutils.c - _Py_open_cloexec_works -
-Python/fileutils.c - force_ascii -
-Python/fileutils.c set_inheritable ioctl_works -
-Python/import.c import_find_and_load header -
-Python/initconfig.c - orig_argv -
-Python/preconfig.c - Py_FileSystemDefaultEncoding -
-Python/preconfig.c - Py_HasFileSystemDefaultEncoding -
-Python/preconfig.c - Py_FileSystemDefaultEncodeErrors -
-Python/preconfig.c - _Py_HasFileSystemDefaultEncodeErrors -
-Python/pyhash.c - _Py_HashSecret -
-Python/pylifecycle.c - runtime_initialized -
-Python/sysmodule.c - _preinit_warnoptions -
-Python/sysmodule.c - _preinit_xoptions -
-Python/thread.c - initialized -
-Python/thread_pthread.h - condattr_monotonic -
-Python/thread_pthread.h init_condattr ca -
+Parser/pegen.c - memo_statistics -
-# set by embedders during init
-Python/initconfig.c - _Py_StandardStreamEncoding -
-Python/initconfig.c - _Py_StandardStreamErrors -
-#-----------------------
-# effectively const but initialized lazily
-# XXX Move them to _PyRuntimeState?
+##################################
+# one-off temporary state
-# idempotent
-Objects/longobject.c long_from_non_binary_base log_base_BASE -
-Objects/longobject.c long_from_non_binary_base convwidth_base -
-Objects/longobject.c long_from_non_binary_base convmultmax_base -
-Parser/action_helpers.c _PyPegen_dummy_name cache -
+# This is safe enough.
+Python/pylifecycle.c _Py_FatalErrorFormat reentrant -
+Python/pylifecycle.c fatal_error reentrant -
-#-----------------------
-# used only in the main thread
-# REPL
-Parser/myreadline.c - _PyOS_ReadlineLock -
-Parser/myreadline.c - _PyOS_ReadlineTState -
-Parser/myreadline.c - PyOS_InputHook -
-Parser/myreadline.c - PyOS_ReadlineFunctionPointer -
+##################################
+# not used (kept for compatibility)
-# handling C argv
-Python/getopt.c - _PyOS_optarg -
-Python/getopt.c - _PyOS_opterr -
-Python/getopt.c - _PyOS_optind -
-Python/getopt.c - opt_ptr -
-Python/pathconfig.c - _Py_path_config -
+Python/pyfpe.c - PyFPE_counter -
##################################
projects / thirdparty / Python / cpython.git / commitdiff
