mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-59705: Make PYTHREAD_NAME_MAXLEN macro private (#128945)

Browse source 
Rename PYTHREAD_NAME_MAXLEN to _PYTHREAD_NAME_MAXLEN.
This commit is contained in:
Victor Stinner 2025-01-18 16:10:29 +01:00 • committed by GitHub
parent f4afaa6f11
commit 81159fce36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Modules/_threadmodule.c
View file

@ -2450,12 +2450,12 @@ _thread_set_name_impl(PyObject *module, PyObject *name_obj)
return NULL; return NULL;
} }
#ifdef PYTHREAD_NAME_MAXLEN #ifdef _PYTHREAD_NAME_MAXLEN
// Truncate to PYTHREAD_NAME_MAXLEN bytes + the NUL byte if needed // Truncate to _PYTHREAD_NAME_MAXLEN bytes + the NUL byte if needed
if (PyBytes_GET_SIZE(name_encoded) > PYTHREAD_NAME_MAXLEN) { if (PyBytes_GET_SIZE(name_encoded) > _PYTHREAD_NAME_MAXLEN) {
PyObject *truncated; PyObject *truncated;
truncated = PyBytes_FromStringAndSize(PyBytes_AS_STRING(name_encoded), truncated = PyBytes_FromStringAndSize(PyBytes_AS_STRING(name_encoded),
PYTHREAD_NAME_MAXLEN); _PYTHREAD_NAME_MAXLEN);
if (truncated == NULL) { if (truncated == NULL) {
Py_DECREF(name_encoded); Py_DECREF(name_encoded);
return NULL; return NULL;
@ -2490,14 +2490,14 @@ _thread_set_name_impl(PyObject *module, PyObject *name_obj)
return NULL; return NULL;
} }
if (len > PYTHREAD_NAME_MAXLEN) { if (len > _PYTHREAD_NAME_MAXLEN) {
// Truncate the name // Truncate the name
Py_UCS4 ch = name[PYTHREAD_NAME_MAXLEN-1]; Py_UCS4 ch = name[_PYTHREAD_NAME_MAXLEN-1];
if (Py_UNICODE_IS_HIGH_SURROGATE(ch)) { if (Py_UNICODE_IS_HIGH_SURROGATE(ch)) {
name[PYTHREAD_NAME_MAXLEN-1] = 0; name[_PYTHREAD_NAME_MAXLEN-1] = 0;
} }
else { else {
name[PYTHREAD_NAME_MAXLEN] = 0; name[_PYTHREAD_NAME_MAXLEN] = 0;
} }
} }
@ -2645,9 +2645,9 @@ thread_module_exec(PyObject *module)
llist_init(&state->shutdown_handles); llist_init(&state->shutdown_handles);
#ifdef PYTHREAD_NAME_MAXLEN #ifdef _PYTHREAD_NAME_MAXLEN
if (PyModule_AddIntConstant(module, "_NAME_MAXLEN", if (PyModule_AddIntConstant(module, "_NAME_MAXLEN",
PYTHREAD_NAME_MAXLEN) < 0) { _PYTHREAD_NAME_MAXLEN) < 0) {
return -1; return -1;
} }
#endif #endif

5
PC/pyconfig.h.in
View file

@ -753,8 +753,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
/* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */ /* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */
#define HAVE_X509_VERIFY_PARAM_SET1_HOST 1 #define HAVE_X509_VERIFY_PARAM_SET1_HOST 1
// Truncate the thread name to 64 characters. The OS limit is 32766 wide // Truncate the thread name to 32766 characters.
// characters, but long names aren't of practical use. #define _PYTHREAD_NAME_MAXLEN 32766
#define PYTHREAD_NAME_MAXLEN 32766
#endif /* !Py_CONFIG_H */ #endif /* !Py_CONFIG_H */

20
configure generated vendored
View file

@ -814,7 +814,7 @@ MODULE_TIME_TRUE
MODULE__IO_FALSE MODULE__IO_FALSE
MODULE__IO_TRUE MODULE__IO_TRUE
MODULE_BUILDTYPE MODULE_BUILDTYPE
PYTHREAD_NAME_MAXLEN _PYTHREAD_NAME_MAXLEN
TEST_MODULES TEST_MODULES
OPENSSL_LDFLAGS OPENSSL_LDFLAGS
OPENSSL_LIBS OPENSSL_LIBS
@ -30403,17 +30403,17 @@ CPPFLAGS=$save_CPPFLAGS
# gh-59705: Maximum length in bytes of a thread name # gh-59705: Maximum length in bytes of a thread name
case "$ac_sys_system" in case "$ac_sys_system" in
Linux*) PYTHREAD_NAME_MAXLEN=15;; # Linux and Android Linux*) _PYTHREAD_NAME_MAXLEN=15;; # Linux and Android
SunOS*) PYTHREAD_NAME_MAXLEN=31;; SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
NetBSD*) PYTHREAD_NAME_MAXLEN=31;; NetBSD*) _PYTHREAD_NAME_MAXLEN=31;;
Darwin) PYTHREAD_NAME_MAXLEN=63;; Darwin) _PYTHREAD_NAME_MAXLEN=63;;
iOS) PYTHREAD_NAME_MAXLEN=63;; iOS) _PYTHREAD_NAME_MAXLEN=63;;
FreeBSD*) PYTHREAD_NAME_MAXLEN=98;; FreeBSD*) _PYTHREAD_NAME_MAXLEN=98;;
*) PYTHREAD_NAME_MAXLEN=;; *) _PYTHREAD_NAME_MAXLEN=;;
esac esac
if test -n "$PYTHREAD_NAME_MAXLEN"; then if test -n "$_PYTHREAD_NAME_MAXLEN"; then
printf "%s\n" "#define PYTHREAD_NAME_MAXLEN $PYTHREAD_NAME_MAXLEN" >>confdefs.h printf "%s\n" "#define _PYTHREAD_NAME_MAXLEN $_PYTHREAD_NAME_MAXLEN" >>confdefs.h
fi fi

20
configure.ac
View file

@ -7539,19 +7539,19 @@ _RESTORE_VAR([CPPFLAGS])
# gh-59705: Maximum length in bytes of a thread name # gh-59705: Maximum length in bytes of a thread name
case "$ac_sys_system" in case "$ac_sys_system" in
Linux*) PYTHREAD_NAME_MAXLEN=15;; # Linux and Android Linux*) _PYTHREAD_NAME_MAXLEN=15;; # Linux and Android
SunOS*) PYTHREAD_NAME_MAXLEN=31;; SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
NetBSD*) PYTHREAD_NAME_MAXLEN=31;; NetBSD*) _PYTHREAD_NAME_MAXLEN=31;;
Darwin) PYTHREAD_NAME_MAXLEN=63;; Darwin) _PYTHREAD_NAME_MAXLEN=63;;
iOS) PYTHREAD_NAME_MAXLEN=63;; iOS) _PYTHREAD_NAME_MAXLEN=63;;
FreeBSD*) PYTHREAD_NAME_MAXLEN=98;; FreeBSD*) _PYTHREAD_NAME_MAXLEN=98;;
*) PYTHREAD_NAME_MAXLEN=;; *) _PYTHREAD_NAME_MAXLEN=;;
esac esac
if test -n "$PYTHREAD_NAME_MAXLEN"; then if test -n "$_PYTHREAD_NAME_MAXLEN"; then
AC_DEFINE_UNQUOTED([PYTHREAD_NAME_MAXLEN], [$PYTHREAD_NAME_MAXLEN], AC_DEFINE_UNQUOTED([_PYTHREAD_NAME_MAXLEN], [$_PYTHREAD_NAME_MAXLEN],
[Maximum length in bytes of a thread name]) [Maximum length in bytes of a thread name])
fi fi
AC_SUBST([PYTHREAD_NAME_MAXLEN]) AC_SUBST([_PYTHREAD_NAME_MAXLEN])
# stdlib # stdlib

6
pyconfig.h.in
View file

@ -1662,9 +1662,6 @@
/* Define as the preferred size in bits of long digits */ /* Define as the preferred size in bits of long digits */
#undef PYLONG_BITS_IN_DIGIT #undef PYLONG_BITS_IN_DIGIT
/* Maximum length in bytes of a thread name */
#undef PYTHREAD_NAME_MAXLEN
/* enabled builtin hash modules */ /* enabled builtin hash modules */
#undef PY_BUILTIN_HASHLIB_HASHES #undef PY_BUILTIN_HASHLIB_HASHES
@ -1980,6 +1977,9 @@
/* framework name */ /* framework name */
#undef _PYTHONFRAMEWORK #undef _PYTHONFRAMEWORK
/* Maximum length in bytes of a thread name */
#undef _PYTHREAD_NAME_MAXLEN
/* Define to force use of thread-safe errno, h_errno, and other functions */ /* Define to force use of thread-safe errno, h_errno, and other functions */
#undef _REENTRANT #undef _REENTRANT