Skip to content

Commit 1abcf67

Browse files
ericsnowcurrentlyericsnowcurrently
authored
bpo-22257: Private C-API for core runtime initialization (PEP 432). (#1772)
(patch by Nick Coghlan)
1 parent c842efc commit 1abcf67

File tree

5 files changed

+224
-62
lines changed

5 files changed

+224
-62
lines changed

‎Include/pylifecycle.h‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@ PyAPI_FUNC(wchar_t *) Py_GetPythonHome(void);
1919
*/
2020
PyAPI_FUNC(int) Py_SetStandardStreamEncoding(const char *encoding,
2121
const char *errors);
22+
23+
/* PEP 432 Multi-phase initialization API (Private while provisional!) */
24+
PyAPI_FUNC(void) _Py_InitializeCore(const _PyCoreConfig *);
25+
PyAPI_FUNC(int) _Py_IsCoreInitialized(void);
26+
PyAPI_FUNC(int) _Py_InitializeMainInterpreter(int install_sigs);
2227
#endif
2328

29+
/* Initialization and finalization */
2430
PyAPI_FUNC(void) Py_Initialize(void);
2531
PyAPI_FUNC(void) Py_InitializeEx(int);
2632
#ifndef Py_LIMITED_API
@@ -29,6 +35,8 @@ PyAPI_FUNC(void) _Py_InitializeEx_Private(int, int);
2935
PyAPI_FUNC(void) Py_Finalize(void);
3036
PyAPI_FUNC(int) Py_FinalizeEx(void);
3137
PyAPI_FUNC(int) Py_IsInitialized(void);
38+
39+
/* Subinterpreter support */
3240
PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void);
3341
PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
3442

@@ -85,7 +93,7 @@ PyAPI_FUNC(void) _PyImportHooks_Init(void);
8593
PyAPI_FUNC(int) _PyFrame_Init(void);
8694
PyAPI_FUNC(int) _PyFloat_Init(void);
8795
PyAPI_FUNC(int) PyByteArray_Init(void);
88-
PyAPI_FUNC(void) _Py_HashRandomization_Init(void);
96+
PyAPI_FUNC(void) _Py_HashRandomization_Init(_PyCoreConfig *core_config);
8997
#endif
9098

9199
/* Various internal finalizers */

‎Include/pystate.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@ typedef struct _is PyInterpreterState;
2323
#else
2424
typedef PyObject* (*_PyFrameEvalFunction)(struct _frame *, int);
2525

26+
27+
typedef struct {
28+
int ignore_environment;
29+
int use_hash_seed;
30+
unsigned long hash_seed;
31+
int _disable_importlib; /* Needed by freeze_importlib */
32+
} _PyCoreConfig;
33+
34+
#define _PyCoreConfig_INIT {0, -1, 0, 0}
35+
2636
typedef struct _is {
2737

2838
struct _is *next;
@@ -42,6 +52,7 @@ typedef struct _is {
4252
int codecs_initialized;
4353
int fscodec_initialized;
4454

55+
_PyCoreConfig core_config;
4556
#ifdef HAVE_DLOPEN
4657
int dlopenflags;
4758
#endif

‎Modules/main.c‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -380,19 +380,6 @@ read_command_line(int argc, wchar_t **argv, _Py_CommandLineDetails *cmdline)
380380
wchar_t *command = NULL;
381381
wchar_t *module = NULL;
382382
int c;
383-
char *opt;
384-
385-
opt = Py_GETENV("PYTHONMALLOC");
386-
if (_PyMem_SetupAllocators(opt) < 0) {
387-
fprintf(stderr,
388-
"Error in PYTHONMALLOC: unknown allocator \"%s\"!\n", opt);
389-
exit(1);
390-
}
391-
392-
// TODO: Move these to core runtime init.
393-
Py_HashRandomizationFlag = 1;
394-
_Py_HashRandomization_Init();
395-
PySys_ResetWarnOptions();
396383

397384
_PyOS_ResetGetOpt();
398385

@@ -584,6 +571,7 @@ Py_Main(int argc, wchar_t **argv)
584571
#endif
585572
int stdin_is_interactive = 0;
586573
_Py_CommandLineDetails cmdline = _Py_CommandLineDetails_INIT;
574+
_PyCoreConfig core_config = _PyCoreConfig_INIT;
587575
PyCompilerFlags cf;
588576
PyObject *main_importer_path = NULL;
589577

@@ -602,11 +590,23 @@ Py_Main(int argc, wchar_t **argv)
602590
break;
603591
}
604592
if (c == 'E' || c == 'I') {
605-
Py_IgnoreEnvironmentFlag++;
593+
core_config.ignore_environment++;
606594
break;
607595
}
608596
}
609597

598+
char *pymalloc = Py_GETENV("PYTHONMALLOC");
599+
if (_PyMem_SetupAllocators(pymalloc) < 0) {
600+
fprintf(stderr,
601+
"Error in PYTHONMALLOC: unknown allocator \"%s\"!\n", pymalloc);
602+
exit(1);
603+
}
604+
605+
/* Initialize the core language runtime */
606+
Py_IgnoreEnvironmentFlag = core_config.ignore_environment;
607+
core_config._disable_importlib = 0;
608+
_Py_InitializeCore(&core_config);
609+
610610
/* Reprocess the command line with the language runtime available */
611611
if (read_command_line(argc, argv, &cmdline)) {
612612
return usage(2, argv[0]);
@@ -680,6 +680,7 @@ Py_Main(int argc, wchar_t **argv)
680680
for (i = 0; i < PyList_GET_SIZE(cmdline.warning_options); i++) {
681681
PySys_AddWarnOptionUnicode(PyList_GET_ITEM(cmdline.warning_options, i));
682682
}
683+
Py_DECREF(cmdline.warning_options);
683684
}
684685

685686
stdin_is_interactive = Py_FdIsInteractive(stdin, (char *)0);
@@ -767,9 +768,10 @@ Py_Main(int argc, wchar_t **argv)
767768
#else
768769
Py_SetProgramName(argv[0]);
769770
#endif
770-
Py_Initialize();
771-
Py_XDECREF(cmdline.warning_options);
771+
if (_Py_InitializeMainInterpreter(1))
772+
Py_FatalError("Py_Main: Py_InitializeMainInterpreter failed");
772773

774+
/* TODO: Move this to _PyRun_PrepareMain */
773775
if (!Py_QuietFlag && (Py_VerboseFlag ||
774776
(cmdline.command == NULL && cmdline.filename == NULL &&
775777
cmdline.module == NULL && stdin_is_interactive))) {
@@ -779,6 +781,7 @@ Py_Main(int argc, wchar_t **argv)
779781
fprintf(stderr, "%s\n", COPYRIGHT);
780782
}
781783

784+
/* TODO: Move this to _Py_InitializeMainInterpreter */
782785
if (cmdline.command != NULL) {
783786
/* Backup _PyOS_optind and force sys.argv[0] = '-c' */
784787
_PyOS_optind--;

‎Python/bootstrap_hash.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -599,18 +599,20 @@ init_hash_secret(int use_hash_seed,
599599
}
600600

601601
void
602-
_Py_HashRandomization_Init(void)
602+
_Py_HashRandomization_Init(_PyCoreConfig *core_config)
603603
{
604604
char *seed_text;
605-
int use_hash_seed = -1;
606-
unsigned long hash_seed;
605+
int use_hash_seed = core_config->use_hash_seed;
606+
unsigned long hash_seed = core_config->hash_seed;
607607

608608
if (use_hash_seed < 0) {
609609
seed_text = Py_GETENV("PYTHONHASHSEED");
610610
if (Py_ReadHashSeed(seed_text, &use_hash_seed, &hash_seed) < 0) {
611611
Py_FatalError("PYTHONHASHSEED must be \"random\" or an integer "
612612
"in range [0; 4294967295]");
613613
}
614+
core_config->use_hash_seed = use_hash_seed;
615+
core_config->hash_seed = hash_seed;
614616
}
615617
init_hash_secret(use_hash_seed, hash_seed);
616618
}

0 commit comments

Comments
 (0)