Mailman 3 December 2021 - Python-checkins

bpo-46072: Document --enable-stats option. (GH-30139)
by markshannon Dec. 16, 2021

Dec. 16, 2021

https://github.com/python/cpython/commit/4506bbede1644e985991884964b43afa7e… commit: 4506bbede1644e985991884964b43afa7ee6f609 branch: main author: Mark Shannon <mark(a)hotpy.org> committer: markshannon <mark(a)hotpy.org> date: 2021-12-16T13:40:54Z summary: bpo-46072: Document --enable-stats option. (GH-30139) files: A Tools/scripts/summarize_stats.py D Tools/scripts/summarize_specialization_stats.py M Doc/using/configure.rst diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index b2a2936db738b..771ad3cf18d97 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -131,6 +131,17 @@ General Options .. versionadded:: 3.11 +.. cmdoption:: --enable-pystats + + Turn on internal statistics gathering. + + The statistics will be dumped to a arbitrary (probably unique) file in + ``/tmp/py_stats/``, or ``C:\temp\py_stats\`` on Windows. + + Use ``Tools//summarize_stats.py`` to read the stats. + + .. versionadded:: 3.11 + Install Options --------------- diff --git a/Tools/scripts/summarize_specialization_stats.py b/Tools/scripts/summarize_stats.py similarity index 100% rename from Tools/scripts/summarize_specialization_stats.py rename to Tools/scripts/summarize_stats.py

1 0

bpo-28816: [doc] clarify that zipimport invokes importers only for python files (GH-30060) (GH-30133)
by iritkatriel Dec. 16, 2021

Dec. 16, 2021

https://github.com/python/cpython/commit/0194bbbee6a12264e93d3217c774e226f0… commit: 0194bbbee6a12264e93d3217c774e226f0a1737d branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-12-16T12:23:41Z summary: bpo-28816: [doc] clarify that zipimport invokes importers only for python files (GH-30060) (GH-30133) (cherry picked from commit a951c95a13c3555ac8fb1c8ee615ba3930ccc6f7) Co-authored-by: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> files: M Doc/library/zipimport.rst diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst index cd7030fed01732..fe1adcae163c23 100644 --- a/Doc/library/zipimport.rst +++ b/Doc/library/zipimport.rst @@ -23,8 +23,8 @@ and a path within the archive can be specified to only import from a subdirectory. For example, the path :file:`example.zip/lib/` would only import from the :file:`lib/` subdirectory within the archive. -Any files may be present in the ZIP archive, but only files :file:`.py` and -:file:`.pyc` are available for import. ZIP import of dynamic modules +Any files may be present in the ZIP archive, but importers are only invoked for +:file:`.py` and :file:`.pyc` files. ZIP import of dynamic modules (:file:`.pyd`, :file:`.so`) is disallowed. Note that if an archive only contains :file:`.py` files, Python will not attempt to modify the archive by adding the corresponding :file:`.pyc` file, meaning that if a ZIP archive

1 0

bpo-28816: [doc] clarify that zipimport invokes importers only for python files (GH-30060) (GH-30134)
by iritkatriel Dec. 16, 2021

Dec. 16, 2021

https://github.com/python/cpython/commit/4c1effaaee472cc67f3186411a3df4f39a… commit: 4c1effaaee472cc67f3186411a3df4f39af3d71a branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-12-16T12:23:17Z summary: bpo-28816: [doc] clarify that zipimport invokes importers only for python files (GH-30060) (GH-30134) (cherry picked from commit a951c95a13c3555ac8fb1c8ee615ba3930ccc6f7) Co-authored-by: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> files: M Doc/library/zipimport.rst diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst index 8ac3fb16bdb90d..a3a24ec3c84ac6 100644 --- a/Doc/library/zipimport.rst +++ b/Doc/library/zipimport.rst @@ -23,8 +23,8 @@ and a path within the archive can be specified to only import from a subdirectory. For example, the path :file:`example.zip/lib/` would only import from the :file:`lib/` subdirectory within the archive. -Any files may be present in the ZIP archive, but only files :file:`.py` and -:file:`.pyc` are available for import. ZIP import of dynamic modules +Any files may be present in the ZIP archive, but importers are only invoked for +:file:`.py` and :file:`.pyc` files. ZIP import of dynamic modules (:file:`.pyd`, :file:`.so`) is disallowed. Note that if an archive only contains :file:`.py` files, Python will not attempt to modify the archive by adding the corresponding :file:`.pyc` file, meaning that if a ZIP archive

1 0

bpo-45829: Check `__getitem__`'s version for overflow before specializing (GH-30129)
by markshannon Dec. 16, 2021

Dec. 16, 2021

https://github.com/python/cpython/commit/62a8a0c5223f750e22ee381d3cfbdb718c… commit: 62a8a0c5223f750e22ee381d3cfbdb718cf1cc93 branch: main author: Brandt Bucher <brandt(a)python.org> committer: markshannon <mark(a)hotpy.org> date: 2021-12-16T11:08:20Z summary: bpo-45829: Check `__getitem__`'s version for overflow before specializing (GH-30129) * Check __getitem__'s version for overflow. * Use SPEC_FAIL_OUT_OF_VERSIONS instead files: M Python/specialize.c diff --git a/Python/specialize.c b/Python/specialize.c index 7d4387b1639a5..730e2f045ebe5 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -1187,7 +1187,7 @@ _Py_Specialize_BinarySubscr( assert(cls->tp_version_tag != 0); cache0->version = cls->tp_version_tag; int version = _PyFunction_GetVersionForCurrentState(func); - if (version == 0) { + if (version == 0 || version != (uint16_t)version) { SPECIALIZATION_FAIL(BINARY_SUBSCR, SPEC_FAIL_OUT_OF_VERSIONS); goto fail; }

1 0

Fix the output of built-in iter() function example in Iterators (Section 9.8) of The Python Tutorial (GH-30110)
by miss-islington Dec. 16, 2021

Dec. 16, 2021

https://github.com/python/cpython/commit/309614f1f78923b0875f24640ab5345a4e… commit: 309614f1f78923b0875f24640ab5345a4eb8c76d branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-16T03:04:53-08:00 summary: Fix the output of built-in iter() function example in Iterators (Section 9.8) of The Python Tutorial (GH-30110) Updated the output for it=iter(s) from <iterator object at 0x00A1DB50> to <str_iterator object at 0x10c90e650> (cherry picked from commit c5d18a5014f649368b5a4bca94e9ec7d2908b481) Co-authored-by: Vivek Vashist <vivekvashist(a)gmail.com> files: M Doc/tutorial/classes.rst diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst index 0d780e3ba8964..f44cb0b4e905a 100644 --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -797,7 +797,7 @@ using the :func:`next` built-in function; this example shows how it all works:: >>> s = 'abc' >>> it = iter(s) >>> it - <iterator object at 0x00A1DB50> + <str_iterator object at 0x10c90e650> >>> next(it) 'a' >>> next(it)

1 0

Fix the output of built-in iter() function example in Iterators (Section 9.8) of The Python Tutorial (GH-30110)
by miss-islington Dec. 16, 2021

Dec. 16, 2021

https://github.com/python/cpython/commit/fb5d314da8f74e624f1ba30389f8ec305e… commit: fb5d314da8f74e624f1ba30389f8ec305e2553a4 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-16T03:00:58-08:00 summary: Fix the output of built-in iter() function example in Iterators (Section 9.8) of The Python Tutorial (GH-30110) Updated the output for it=iter(s) from <iterator object at 0x00A1DB50> to <str_iterator object at 0x10c90e650> (cherry picked from commit c5d18a5014f649368b5a4bca94e9ec7d2908b481) Co-authored-by: Vivek Vashist <vivekvashist(a)gmail.com> files: M Doc/tutorial/classes.rst diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst index 0d780e3ba8964..f44cb0b4e905a 100644 --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -797,7 +797,7 @@ using the :func:`next` built-in function; this example shows how it all works:: >>> s = 'abc' >>> it = iter(s) >>> it - <iterator object at 0x00A1DB50> + <str_iterator object at 0x10c90e650> >>> next(it) 'a' >>> next(it)

1 0

Fix the output of built-in iter() function example in Iterators (Section 9.8) of The Python Tutorial (GH-30110)
by Fidget-Spinner Dec. 16, 2021

Dec. 16, 2021

https://github.com/python/cpython/commit/c5d18a5014f649368b5a4bca94e9ec7d29… commit: c5d18a5014f649368b5a4bca94e9ec7d2908b481 branch: main author: Vivek Vashist <vivekvashist(a)gmail.com> committer: Fidget-Spinner <28750310+Fidget-Spinner(a)users.noreply.github.com> date: 2021-12-16T18:40:12+08:00 summary: Fix the output of built-in iter() function example in Iterators (Section 9.8) of The Python Tutorial (GH-30110) Updated the output for it=iter(s) from <iterator object at 0x00A1DB50> to <str_iterator object at 0x10c90e650> files: M Doc/tutorial/classes.rst diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst index 0d780e3ba8964..f44cb0b4e905a 100644 --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -797,7 +797,7 @@ using the :func:`next` built-in function; this example shows how it all works:: >>> s = 'abc' >>> it = iter(s) >>> it - <iterator object at 0x00A1DB50> + <str_iterator object at 0x10c90e650> >>> next(it) 'a' >>> next(it)

1 0

bpo-28816: [doc] clarify that zipimport invokes importers only for python files (GH-30060)
by iritkatriel Dec. 16, 2021

Dec. 16, 2021

https://github.com/python/cpython/commit/a951c95a13c3555ac8fb1c8ee615ba3930… commit: a951c95a13c3555ac8fb1c8ee615ba3930ccc6f7 branch: main author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-12-16T09:12:24Z summary: bpo-28816: [doc] clarify that zipimport invokes importers only for python files (GH-30060) files: M Doc/library/zipimport.rst diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst index cd7030fed0173..fe1adcae163c2 100644 --- a/Doc/library/zipimport.rst +++ b/Doc/library/zipimport.rst @@ -23,8 +23,8 @@ and a path within the archive can be specified to only import from a subdirectory. For example, the path :file:`example.zip/lib/` would only import from the :file:`lib/` subdirectory within the archive. -Any files may be present in the ZIP archive, but only files :file:`.py` and -:file:`.pyc` are available for import. ZIP import of dynamic modules +Any files may be present in the ZIP archive, but importers are only invoked for +:file:`.py` and :file:`.pyc` files. ZIP import of dynamic modules (:file:`.pyd`, :file:`.so`) is disallowed. Note that if an archive only contains :file:`.py` files, Python will not attempt to modify the archive by adding the corresponding :file:`.pyc` file, meaning that if a ZIP archive

1 0

Remove spaces in empty lines (GH-30121)
by corona10 Dec. 15, 2021

Dec. 15, 2021

https://github.com/python/cpython/commit/f62420c3d3f5d87f2b57e54b2a98682bc8… commit: f62420c3d3f5d87f2b57e54b2a98682bc835f7b6 branch: main author: AN Long <aisk(a)users.noreply.github.com> committer: corona10 <donghee.na92(a)gmail.com> date: 2021-12-16T01:35:21+09:00 summary: Remove spaces in empty lines (GH-30121) files: M Lib/inspect.py M Lib/test/test_getpath.py M Lib/test/test_inspect.py diff --git a/Lib/inspect.py b/Lib/inspect.py index 746f6e4f9f9f0..5d33f0d445fb9 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -32,7 +32,7 @@ __author__ = ('Ka-Ping Yee <ping(a)lfw.org>', 'Yury Selivanov <yselivanov(a)sprymix.com>') - + __all__ = [ "ArgInfo", "Arguments", @@ -131,7 +131,7 @@ "walktree", ] - + import abc import ast import dis @@ -591,7 +591,7 @@ def getmembers_static(object, predicate=None): without triggering dynamic lookup via the descriptor protocol, __getattr__ or __getattribute__. Optionally, only return members that satisfy a given predicate. - + Note: this function may not be able to retrieve all members that getmembers can fetch (like dynamically created attributes) and may find members that getmembers can't (like descriptors diff --git a/Lib/test/test_getpath.py b/Lib/test/test_getpath.py index 3fb1b280031c8..232b680528435 100644 --- a/Lib/test/test_getpath.py +++ b/Lib/test/test_getpath.py @@ -534,7 +534,7 @@ def test_symlink_buildpath_macos(self): VERSION_MINOR=8, # of testing PYWINVER=None, EXE_SUFFIX=None, - + ENV_PATH="", ENV_PYTHONHOME="", ENV_PYTHONEXECUTABLE="", diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index c25256dfa26fd..56168817a27f2 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -109,7 +109,7 @@ def istest(self, predicate, exp): def test__all__(self): support.check__all__(self, inspect, not_exported=("k", "v", "mod_dict", "modulesbyfile")) - + def generator_function_example(self): for i in range(2): yield i

1 0

bpo-46072: Add --with-pystats configure option to simplify gathering of VM stats (GH-30116)
by markshannon Dec. 15, 2021

Dec. 15, 2021

https://github.com/python/cpython/commit/342b93f9f28746abb7b221a61d5a9b26cc… commit: 342b93f9f28746abb7b221a61d5a9b26ccbb395a branch: main author: Mark Shannon <mark(a)hotpy.org> committer: markshannon <mark(a)hotpy.org> date: 2021-12-15T15:32:32Z summary: bpo-46072: Add --with-pystats configure option to simplify gathering of VM stats (GH-30116) * Simplify specialization stats collection macros. * Add --enable-pystats option to configure. * Update specialization summary script to handle larger number of kinds files: A Misc/NEWS.d/next/Build/2021-12-15-10-37-44.bpo-46072.GgeAU3.rst M Include/internal/pycore_code.h M Modules/_opcode.c M Python/ceval.c M Python/specialize.c M Tools/scripts/summarize_specialization_stats.py M configure M configure.ac M pyconfig.h.in diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h index b0463e361718a..e9b1ad406496a 100644 --- a/Include/internal/pycore_code.h +++ b/Include/internal/pycore_code.h @@ -276,22 +276,11 @@ void _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr, SpecializedCacheEntry *cache); void _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr, SpecializedCacheEntry *cache); -#define PRINT_SPECIALIZATION_STATS 0 -#define PRINT_SPECIALIZATION_STATS_DETAILED 0 -#define PRINT_SPECIALIZATION_STATS_TO_FILE 0 -#ifdef Py_DEBUG -#define COLLECT_SPECIALIZATION_STATS 1 -#define COLLECT_SPECIALIZATION_STATS_DETAILED 1 -#else -#define COLLECT_SPECIALIZATION_STATS PRINT_SPECIALIZATION_STATS -#define COLLECT_SPECIALIZATION_STATS_DETAILED PRINT_SPECIALIZATION_STATS_DETAILED -#endif +#ifdef Py_STATS #define SPECIALIZATION_FAILURE_KINDS 30 -#if COLLECT_SPECIALIZATION_STATS - typedef struct _stats { uint64_t specialization_success; uint64_t specialization_failure; @@ -300,15 +289,13 @@ typedef struct _stats { uint64_t miss; uint64_t deopt; uint64_t unquickened; -#if COLLECT_SPECIALIZATION_STATS_DETAILED uint64_t specialization_failure_kinds[SPECIALIZATION_FAILURE_KINDS]; -#endif } SpecializationStats; extern SpecializationStats _specialization_stats[256]; #define STAT_INC(opname, name) _specialization_stats[opname].name++ #define STAT_DEC(opname, name) _specialization_stats[opname].name-- -void _Py_PrintSpecializationStats(void); +void _Py_PrintSpecializationStats(int to_file); PyAPI_FUNC(PyObject*) _Py_GetSpecializationStats(void); diff --git a/Misc/NEWS.d/next/Build/2021-12-15-10-37-44.bpo-46072.GgeAU3.rst b/Misc/NEWS.d/next/Build/2021-12-15-10-37-44.bpo-46072.GgeAU3.rst new file mode 100644 index 0000000000000..9cc8b6c82de41 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2021-12-15-10-37-44.bpo-46072.GgeAU3.rst @@ -0,0 +1,2 @@ +Add a --with-pystats configure option to turn on internal statistics +gathering. diff --git a/Modules/_opcode.c b/Modules/_opcode.c index 39e3066955951..4812716c67271 100644 --- a/Modules/_opcode.c +++ b/Modules/_opcode.c @@ -85,7 +85,7 @@ static PyObject * _opcode_get_specialization_stats_impl(PyObject *module) /*[clinic end generated code: output=fcbc32fdfbec5c17 input=e1f60db68d8ce5f6]*/ { -#if COLLECT_SPECIALIZATION_STATS +#ifdef Py_STATS return _Py_GetSpecializationStats(); #else Py_RETURN_NONE; diff --git a/Python/ceval.c b/Python/ceval.c index b9444b22138f0..87d6a2288e0dd 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -349,8 +349,8 @@ PyEval_InitThreads(void) void _PyEval_Fini(void) { -#if PRINT_SPECIALIZATION_STATS - _Py_PrintSpecializationStats(); +#ifdef Py_STATS + _Py_PrintSpecializationStats(1); #endif } diff --git a/Python/specialize.c b/Python/specialize.c index 5cf327df475c7..7d4387b1639a5 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -39,7 +39,7 @@ */ Py_ssize_t _Py_QuickenedCount = 0; -#if COLLECT_SPECIALIZATION_STATS +#ifdef Py_STATS SpecializationStats _specialization_stats[256] = { 0 }; #define ADD_STAT_TO_DICT(res, field) \ @@ -71,7 +71,6 @@ stats_to_dict(SpecializationStats *stats) ADD_STAT_TO_DICT(res, miss); ADD_STAT_TO_DICT(res, deopt); ADD_STAT_TO_DICT(res, unquickened); -#if COLLECT_SPECIALIZATION_STATS_DETAILED PyObject *failure_kinds = PyTuple_New(SPECIALIZATION_FAILURE_KINDS); if (failure_kinds == NULL) { Py_DECREF(res); @@ -92,7 +91,6 @@ stats_to_dict(SpecializationStats *stats) return NULL; } Py_DECREF(failure_kinds); -#endif return res; } #undef ADD_STAT_TO_DICT @@ -113,7 +111,7 @@ add_stat_dict( return err; } -#if COLLECT_SPECIALIZATION_STATS +#ifdef Py_STATS PyObject* _Py_GetSpecializationStats(void) { PyObject *stats = PyDict_New(); @@ -151,35 +149,34 @@ print_stats(FILE *out, SpecializationStats *stats, const char *name) PRINT_STAT(name, miss); PRINT_STAT(name, deopt); PRINT_STAT(name, unquickened); -#if PRINT_SPECIALIZATION_STATS_DETAILED for (int i = 0; i < SPECIALIZATION_FAILURE_KINDS; i++) { fprintf(out, " %s.specialization_failure_kinds[%d] : %" PRIu64 "\n", name, i, stats->specialization_failure_kinds[i]); } -#endif } #undef PRINT_STAT void -_Py_PrintSpecializationStats(void) +_Py_PrintSpecializationStats(int to_file) { FILE *out = stderr; -#if PRINT_SPECIALIZATION_STATS_TO_FILE - /* Write to a file instead of stderr. */ + if (to_file) { + /* Write to a file instead of stderr. */ # ifdef MS_WINDOWS - const char *dirname = "c:\\temp\\py_stats\\"; + const char *dirname = "c:\\temp\\py_stats\\"; # else - const char *dirname = "/tmp/py_stats/"; + const char *dirname = "/tmp/py_stats/"; # endif - char buf[48]; - sprintf(buf, "%s%u_%u.txt", dirname, (unsigned)clock(), (unsigned)rand()); - FILE *fout = fopen(buf, "w"); - if (fout) { - out = fout; - } -#else - fprintf(out, "Specialization stats:\n"); -#endif + char buf[48]; + sprintf(buf, "%s%u_%u.txt", dirname, (unsigned)clock(), (unsigned)rand()); + FILE *fout = fopen(buf, "w"); + if (fout) { + out = fout; + } + } + else { + fprintf(out, "Specialization stats:\n"); + } print_stats(out, &_specialization_stats[LOAD_ATTR], "load_attr"); print_stats(out, &_specialization_stats[LOAD_GLOBAL], "load_global"); print_stats(out, &_specialization_stats[LOAD_METHOD], "load_method"); @@ -194,7 +191,7 @@ _Py_PrintSpecializationStats(void) } } -#if COLLECT_SPECIALIZATION_STATS_DETAILED +#ifdef Py_STATS #define SPECIALIZATION_FAIL(opcode, kind) _specialization_stats[opcode].specialization_failure_kinds[kind]++ @@ -860,7 +857,7 @@ _Py_Specialize_StoreAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name, S } -#if COLLECT_SPECIALIZATION_STATS_DETAILED +#ifdef Py_STATS static int load_method_fail_kind(DesciptorClassification kind) { @@ -1086,7 +1083,7 @@ _Py_Specialize_LoadGlobal( return 0; } -#if COLLECT_SPECIALIZATION_STATS_DETAILED +#ifdef Py_STATS static int binary_subscr_fail_kind(PyTypeObject *container_type, PyObject *sub) { @@ -1380,7 +1377,7 @@ specialize_py_call( return 0; } -#if COLLECT_SPECIALIZATION_STATS_DETAILED +#ifdef Py_STATS static int builtin_call_fail_kind(int ml_flags) { @@ -1459,7 +1456,7 @@ specialize_c_call(PyObject *callable, _Py_CODEUNIT *instr, int nargs, } } -#if COLLECT_SPECIALIZATION_STATS_DETAILED +#ifdef Py_STATS static int call_fail_kind(PyObject *callable) { diff --git a/Tools/scripts/summarize_specialization_stats.py b/Tools/scripts/summarize_specialization_stats.py index cc3ef85933c02..15b1887415e44 100644 --- a/Tools/scripts/summarize_specialization_stats.py +++ b/Tools/scripts/summarize_specialization_stats.py @@ -24,7 +24,7 @@ def print_stats(name, family_stats): for key in ("specialization_success", "specialization_failure"): print(f" {key}:{family_stats[key]:>12}") total_failures = family_stats["specialization_failure"] - failure_kinds = [ 0 ] * 20 + failure_kinds = [ 0 ] * 30 for key in family_stats: if not key.startswith("specialization_failure_kind"): continue diff --git a/configure b/configure index 583e7d1fe3b32..1ede29989d948 100755 --- a/configure +++ b/configure @@ -1006,6 +1006,7 @@ enable_shared enable_profiling with_pydebug with_trace_refs +enable_pystats with_assertions enable_optimizations with_lto @@ -1713,6 +1714,7 @@ Optional Features: no) --enable-profiling enable C-level code profiling with gprof (default is no) + --enable-pystats enable internal statistics gathering (default is no) --enable-optimizations enable expensive, stable optimizations (PGO, etc.) (default is no) --enable-loadable-sqlite-extensions @@ -6913,6 +6915,29 @@ then $as_echo "#define Py_TRACE_REFS 1" >>confdefs.h +fi + + +# Check for --enable-pystats +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-pystats" >&5 +$as_echo_n "checking for --enable-pystats... " >&6; } +# Check whether --enable-pystats was given. +if test "${enable_pystats+set}" = set; then : + enableval=$enable_pystats; +else + enable_pystats=no + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pystats" >&5 +$as_echo "$enable_pystats" >&6; } + +if test "x$enable_pystats" = xyes; then : + + +$as_echo "#define Py_STATS 1" >>confdefs.h + + fi # Check for --with-assertions. diff --git a/configure.ac b/configure.ac index 5256a61289e22..86404bcadeaba 100644 --- a/configure.ac +++ b/configure.ac @@ -1387,6 +1387,21 @@ then AC_DEFINE(Py_TRACE_REFS, 1, [Define if you want to enable tracing references for debugging purpose]) fi + +# Check for --enable-pystats +AC_MSG_CHECKING([for --enable-pystats]) +AC_ARG_ENABLE([pystats], + [AS_HELP_STRING( + [--enable-pystats], + [enable internal statistics gathering (default is no)])],, + [enable_pystats=no] +) +AC_MSG_RESULT([$enable_pystats]) + +AS_VAR_IF([enable_pystats], [yes], [ + AC_DEFINE([Py_STATS], [1], [Define if you want to enable internal statistics gathering.]) +]) + # Check for --with-assertions. # This allows enabling assertions without Py_DEBUG. assertions='false' @@ -6323,7 +6338,7 @@ AC_DEFUN([PY_STDLIB_MOD], [ ]) dnl Define simple stdlib extension module -dnl Always enable unless the module is listed in py_stdlib_not_available +dnl Always enable unless the module is listed in py_stdlib_not_available dnl PY_STDLIB_MOD_SIMPLE([NAME], [CFLAGS], [LDFLAGS]) dnl cflags and ldflags are optional AC_DEFUN([PY_STDLIB_MOD_SIMPLE], [ diff --git a/pyconfig.h.in b/pyconfig.h.in index efad243d0af8a..e6e81654699d8 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -1496,6 +1496,9 @@ SipHash13: 3, externally defined: 0 */ #undef Py_HASH_ALGORITHM +/* Define if you want to enable internal statistics gathering. */ +#undef Py_STATS + /* Define if you want to enable tracing references for debugging purpose */ #undef Py_TRACE_REFS

1 0