Skip to content

Commit 81159fc

Browse files
authored
gh-59705: Make PYTHREAD_NAME_MAXLEN macro private (#128945)
Rename PYTHREAD_NAME_MAXLEN to _PYTHREAD_NAME_MAXLEN.
1 parent f4afaa6 commit 81159fc

File tree

5 files changed

+35
-36
lines changed

5 files changed

+35
-36
lines changed

Diff for: Modules/_threadmodule.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -2450,12 +2450,12 @@ _thread_set_name_impl(PyObject *module, PyObject *name_obj)
24502450
return NULL;
24512451
}
24522452

2453-
#ifdef PYTHREAD_NAME_MAXLEN
2454-
// Truncate to PYTHREAD_NAME_MAXLEN bytes + the NUL byte if needed
2455-
if (PyBytes_GET_SIZE(name_encoded) > PYTHREAD_NAME_MAXLEN) {
2453+
#ifdef _PYTHREAD_NAME_MAXLEN
2454+
// Truncate to _PYTHREAD_NAME_MAXLEN bytes + the NUL byte if needed
2455+
if (PyBytes_GET_SIZE(name_encoded) > _PYTHREAD_NAME_MAXLEN) {
24562456
PyObject *truncated;
24572457
truncated = PyBytes_FromStringAndSize(PyBytes_AS_STRING(name_encoded),
2458-
PYTHREAD_NAME_MAXLEN);
2458+
_PYTHREAD_NAME_MAXLEN);
24592459
if (truncated == NULL) {
24602460
Py_DECREF(name_encoded);
24612461
return NULL;
@@ -2490,14 +2490,14 @@ _thread_set_name_impl(PyObject *module, PyObject *name_obj)
24902490
return NULL;
24912491
}
24922492

2493-
if (len > PYTHREAD_NAME_MAXLEN) {
2493+
if (len > _PYTHREAD_NAME_MAXLEN) {
24942494
// Truncate the name
2495-
Py_UCS4 ch = name[PYTHREAD_NAME_MAXLEN-1];
2495+
Py_UCS4 ch = name[_PYTHREAD_NAME_MAXLEN-1];
24962496
if (Py_UNICODE_IS_HIGH_SURROGATE(ch)) {
2497-
name[PYTHREAD_NAME_MAXLEN-1] = 0;
2497+
name[_PYTHREAD_NAME_MAXLEN-1] = 0;
24982498
}
24992499
else {
2500-
name[PYTHREAD_NAME_MAXLEN] = 0;
2500+
name[_PYTHREAD_NAME_MAXLEN] = 0;
25012501
}
25022502
}
25032503

@@ -2645,9 +2645,9 @@ thread_module_exec(PyObject *module)
26452645

26462646
llist_init(&state->shutdown_handles);
26472647

2648-
#ifdef PYTHREAD_NAME_MAXLEN
2648+
#ifdef _PYTHREAD_NAME_MAXLEN
26492649
if (PyModule_AddIntConstant(module, "_NAME_MAXLEN",
2650-
PYTHREAD_NAME_MAXLEN) < 0) {
2650+
_PYTHREAD_NAME_MAXLEN) < 0) {
26512651
return -1;
26522652
}
26532653
#endif

Diff for: PC/pyconfig.h.in

+2-3
Original file line numberDiff line numberDiff line change
@@ -753,8 +753,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
753753
/* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */
754754
#define HAVE_X509_VERIFY_PARAM_SET1_HOST 1
755755

756-
// Truncate the thread name to 64 characters. The OS limit is 32766 wide
757-
// characters, but long names aren't of practical use.
758-
#define PYTHREAD_NAME_MAXLEN 32766
756+
// Truncate the thread name to 32766 characters.
757+
#define _PYTHREAD_NAME_MAXLEN 32766
759758

760759
#endif /* !Py_CONFIG_H */

Diff for: configure

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: configure.ac

+10-10
Original file line numberDiff line numberDiff line change
@@ -7539,19 +7539,19 @@ _RESTORE_VAR([CPPFLAGS])
75397539

75407540
# gh-59705: Maximum length in bytes of a thread name
75417541
case "$ac_sys_system" in
7542-
Linux*) PYTHREAD_NAME_MAXLEN=15;; # Linux and Android
7543-
SunOS*) PYTHREAD_NAME_MAXLEN=31;;
7544-
NetBSD*) PYTHREAD_NAME_MAXLEN=31;;
7545-
Darwin) PYTHREAD_NAME_MAXLEN=63;;
7546-
iOS) PYTHREAD_NAME_MAXLEN=63;;
7547-
FreeBSD*) PYTHREAD_NAME_MAXLEN=98;;
7548-
*) PYTHREAD_NAME_MAXLEN=;;
7542+
Linux*) _PYTHREAD_NAME_MAXLEN=15;; # Linux and Android
7543+
SunOS*) _PYTHREAD_NAME_MAXLEN=31;;
7544+
NetBSD*) _PYTHREAD_NAME_MAXLEN=31;;
7545+
Darwin) _PYTHREAD_NAME_MAXLEN=63;;
7546+
iOS) _PYTHREAD_NAME_MAXLEN=63;;
7547+
FreeBSD*) _PYTHREAD_NAME_MAXLEN=98;;
7548+
*) _PYTHREAD_NAME_MAXLEN=;;
75497549
esac
7550-
if test -n "$PYTHREAD_NAME_MAXLEN"; then
7551-
AC_DEFINE_UNQUOTED([PYTHREAD_NAME_MAXLEN], [$PYTHREAD_NAME_MAXLEN],
7550+
if test -n "$_PYTHREAD_NAME_MAXLEN"; then
7551+
AC_DEFINE_UNQUOTED([_PYTHREAD_NAME_MAXLEN], [$_PYTHREAD_NAME_MAXLEN],
75527552
[Maximum length in bytes of a thread name])
75537553
fi
7554-
AC_SUBST([PYTHREAD_NAME_MAXLEN])
7554+
AC_SUBST([_PYTHREAD_NAME_MAXLEN])
75557555

75567556

75577557
# stdlib

Diff for: pyconfig.h.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -1662,9 +1662,6 @@
16621662
/* Define as the preferred size in bits of long digits */
16631663
#undef PYLONG_BITS_IN_DIGIT
16641664

1665-
/* Maximum length in bytes of a thread name */
1666-
#undef PYTHREAD_NAME_MAXLEN
1667-
16681665
/* enabled builtin hash modules */
16691666
#undef PY_BUILTIN_HASHLIB_HASHES
16701667

@@ -1980,6 +1977,9 @@
19801977
/* framework name */
19811978
#undef _PYTHONFRAMEWORK
19821979

1980+
/* Maximum length in bytes of a thread name */
1981+
#undef _PYTHREAD_NAME_MAXLEN
1982+
19831983
/* Define to force use of thread-safe errno, h_errno, and other functions */
19841984
#undef _REENTRANT
19851985

0 commit comments

Comments
 (0)