diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2017-09-08 05:51:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 05:51:28 (GMT) |
| commit | 2ebc5ce42a8a9e047e790aefbf9a94811569b2b6 (patch) | |
| tree | f8c483f24e0d1ee43ac5cc9ad82d2ee7cccf69d2 /Modules/main.c | |
| parent | bab21faded31c70b142776b9a6075a4cda055d7f (diff) | |
| download | cpython-2ebc5ce42a8a9e047e790aefbf9a94811569b2b6.zip cpython-2ebc5ce42a8a9e047e790aefbf9a94811569b2b6.tar.gz cpython-2ebc5ce42a8a9e047e790aefbf9a94811569b2b6.tar.bz2 | |
bpo-30860: Consolidate stateful runtime globals. (#3397)
* group the (stateful) runtime globals into various topical structs
* consolidate the topical structs under a single top-level _PyRuntimeState struct
* add a check-c-globals.py script that helps identify runtime globals
Other globals are excluded (see globals.txt and check-c-globals.py).
Diffstat (limited to 'Modules/main.c')
| -rw-r--r-- | Modules/main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Modules/main.c b/Modules/main.c index 08b2276..3e347dc 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -598,16 +598,10 @@ Py_Main(int argc, wchar_t **argv) } } - char *pymalloc = Py_GETENV("PYTHONMALLOC"); - if (_PyMem_SetupAllocators(pymalloc) < 0) { - fprintf(stderr, - "Error in PYTHONMALLOC: unknown allocator \"%s\"!\n", pymalloc); - exit(1); - } - /* Initialize the core language runtime */ Py_IgnoreEnvironmentFlag = core_config.ignore_environment; core_config._disable_importlib = 0; + core_config.allocator = Py_GETENV("PYTHONMALLOC"); _Py_InitializeCore(&core_config); /* Reprocess the command line with the language runtime available */ |