Skip to content

bpo-34228: Allow PYTHONTRACEMALLOC=0 #8467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Jul 25, 2018
Merged

bpo-34228: Allow PYTHONTRACEMALLOC=0 #8467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Include/pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ typedef struct {
.install_signal_handlers = -1, \
.ignore_environment = -1, \
.use_hash_seed = -1, \
.tracemalloc = -1, \
.coerce_c_locale = -1, \
.utf8_mode = -1, \
.argc = -1, \
Expand Down
12 changes: 10 additions & 2 deletions Lib/test/test_tracemalloc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@


EMPTY_STRING_SIZE = sys.getsizeof(b'')
INVALID_NFRAME = (-1, 2**30)


def get_frames(nframe, lineno_delta):
Expand Down Expand Up @@ -833,6 +834,13 @@ def test_env_var_ignored_with_E(self):
stdout = stdout.rstrip()
self.assertEqual(stdout, b'False')

def test_env_var_disabled(self):
# tracing at startup
code = 'import tracemalloc; print(tracemalloc.is_tracing())'
ok, stdout, stderr = assert_python_ok('-c', code, PYTHONTRACEMALLOC='0')
stdout = stdout.rstrip()
self.assertEqual(stdout, b'False')

def test_env_var_enabled_at_startup(self):
# tracing at startup
code = 'import tracemalloc; print(tracemalloc.is_tracing())'
Expand Down Expand Up @@ -861,7 +869,7 @@ def check_env_var_invalid(self, nframe):


def test_env_var_invalid(self):
for nframe in (-1, 0, 2**30):
for nframe in INVALID_NFRAME:
with self.subTest(nframe=nframe):
self.check_env_var_invalid(nframe)

Expand Down Expand Up @@ -889,7 +897,7 @@ def check_sys_xoptions_invalid(self, nframe):
self.fail(f"unexpeced output: {stderr!a}")

def test_sys_xoptions_invalid(self):
for nframe in (-1, 0, 2**30):
for nframe in INVALID_NFRAME:
with self.subTest(nframe=nframe):
self.check_sys_xoptions_invalid(nframe)

Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2018-07-25-19-02-39.bpo-34228.0Ibztw.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tracemalloc: PYTHONTRACEMALLOC=0 environment variable and -X tracemalloc=0
command line option are now allowed to disable explicitly tracemalloc at
startup.
23 changes: 16 additions & 7 deletions Modules/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1726,10 +1726,14 @@ pymain_init_tracemalloc(_PyCoreConfig *config)
int nframe;
int valid;

if (config->tracemalloc >= 0) {
return _Py_INIT_OK();
}

const char *env = config_get_env_var(config, "PYTHONTRACEMALLOC");
if (env) {
if (!pymain_str_to_int(env, &nframe)) {
valid = (nframe >= 1);
valid = (nframe >= 0);
}
else {
valid = 0;
Expand All @@ -1746,7 +1750,7 @@ pymain_init_tracemalloc(_PyCoreConfig *config)
const wchar_t *sep = wcschr(xoption, L'=');
if (sep) {
if (!pymain_wstr_to_int(sep + 1, &nframe)) {
valid = (nframe >= 1);
valid = (nframe >= 0);
}
else {
valid = 0;
Expand Down Expand Up @@ -2249,17 +2253,22 @@ _PyCoreConfig_Read(_PyCoreConfig *config)

config_init_locale(config);

/* Signal handlers are installed by default */
if (config->install_signal_handlers < 0) {
config->install_signal_handlers = 1;
}

if (config->_install_importlib) {
err = _PyCoreConfig_InitPathConfig(config);
if (_Py_INIT_FAILED(err)) {
return err;
}
}

/* default values */
if (config->tracemalloc < 0) {
config->tracemalloc = 0;
}
if (config->install_signal_handlers < 0) {
/* Signal handlers are installed by default */
config->install_signal_handlers = 1;
}

return _Py_INIT_OK();
}

Expand Down