Remove the `PYTHONTHREADDEBUG` env var support.
Remove no-op dprintf() macro calls.
Debug-mode variables
~~~~~~~~~~~~~~~~~~~~
-.. envvar:: PYTHONTHREADDEBUG
-
- If set, Python will print threading debug info into stdout.
-
- Need a :ref:`debug build of Python <debug-build>`.
-
- .. deprecated-removed:: 3.10 3.12
-
-
.. envvar:: PYTHONDUMPREFS
If set, Python will dump objects and reference counts still alive after
* Add ``d`` to :data:`sys.abiflags`.
* Add :func:`sys.gettotalrefcount` function.
* Add :option:`-X showrefcount <-X>` command line option.
-* Add :envvar:`PYTHONTHREADDEBUG` environment variable.
* Add support for the ``__lltrace__`` variable: enable low-level tracing in the
bytecode evaluation loop if the variable is defined.
* Install :ref:`debug hooks on memory allocators <default-memory-allocators>`
threading.Thread(target=noop).start()
# Thread.join() is not called
- @unittest.skipUnless(Py_DEBUG, 'need debug build (Py_DEBUG)')
- def test_debug_deprecation(self):
- # bpo-44584: The PYTHONTHREADDEBUG environment variable is deprecated
- rc, out, err = assert_python_ok("-Wdefault", "-c", "pass",
- PYTHONTHREADDEBUG="1")
- msg = (b'DeprecationWarning: The threading debug '
- b'(PYTHONTHREADDEBUG environment variable) '
- b'is deprecated and will be removed in Python 3.12')
- self.assertIn(msg, err)
-
def test_import_from_another_thread(self):
# bpo-1596321: If the threading module is first import from a thread
# different than the main thread, threading._shutdown() must handle
--- /dev/null
+The deprecated debug build only ``PYTHONTHREADDEBUG`` environment variable
+no longer does anything.
Setting these variables only has an effect in a debug build of Python, that is,
if Python was configured with the
\fB\--with-pydebug\fP build option.
-.IP PYTHONTHREADDEBUG
-If this environment variable is set, Python will print threading debug info.
-The feature is deprecated in Python 3.10 and will be removed in Python 3.12.
.IP PYTHONDUMPREFS
If this environment variable is set, Python will dump objects and reference
counts still alive after shutting down the interpreter.
static PyStatus
init_interp_main(PyThreadState *tstate)
{
- extern void _PyThread_debug_deprecation(void);
-
assert(!_PyErr_Occurred(tstate));
PyStatus status;
#endif
}
- // Warn about PYTHONTHREADDEBUG deprecation
- _PyThread_debug_deprecation();
-
assert(!_PyErr_Occurred(tstate));
return _PyStatus_OK();
#endif /* _POSIX_THREADS */
-
-#ifdef Py_DEBUG
-static int thread_debug = 0;
-# define dprintf(args) (void)((thread_debug & 1) && printf args)
-#else
-# define dprintf(args)
-#endif
-
static int initialized;
static void PyThread__init_thread(void); /* Forward */
void
PyThread_init_thread(void)
{
-#ifdef Py_DEBUG
- const char *p = Py_GETENV("PYTHONTHREADDEBUG");
-
- if (p) {
- if (*p)
- thread_debug = atoi(p);
- else
- thread_debug = 1;
- }
-#endif /* Py_DEBUG */
if (initialized)
return;
initialized = 1;
- dprintf(("PyThread_init_thread called\n"));
PyThread__init_thread();
}
-void
-_PyThread_debug_deprecation(void)
-{
-#ifdef Py_DEBUG
- if (thread_debug) {
- // Flush previous dprintf() logs
- fflush(stdout);
- if (PyErr_WarnEx(PyExc_DeprecationWarning,
- "The threading debug (PYTHONTHREADDEBUG environment "
- "variable) is deprecated and will be removed "
- "in Python 3.12",
- 0))
- {
- _PyErr_WriteUnraisableMsg("at Python startup", NULL);
- }
- }
-#endif
-}
-
#if defined(_POSIX_THREADS)
# define PYTHREAD_NAME "pthread"
# include "thread_pthread.h"
unsigned threadID;
callobj *obj;
- dprintf(("%lu: PyThread_start_new_thread called\n",
- PyThread_get_thread_ident()));
if (!initialized)
PyThread_init_thread();
* too many threads".
*/
int e = errno;
- dprintf(("%lu: PyThread_start_new_thread failed, errno %d\n",
- PyThread_get_thread_ident(), e));
threadID = (unsigned)-1;
HeapFree(GetProcessHeap(), 0, obj);
}
else {
- dprintf(("%lu: PyThread_start_new_thread succeeded: %p\n",
- PyThread_get_thread_ident(), (void*)hThread));
CloseHandle(hThread);
}
return threadID;
void _Py_NO_RETURN
PyThread_exit_thread(void)
{
- dprintf(("%lu: PyThread_exit_thread called\n", PyThread_get_thread_ident()));
if (!initialized)
exit(0);
_endthreadex(0);
{
PNRMUTEX aLock;
- dprintf(("PyThread_allocate_lock called\n"));
if (!initialized)
PyThread_init_thread();
aLock = AllocNonRecursiveMutex() ;
- dprintf(("%lu: PyThread_allocate_lock() -> %p\n", PyThread_get_thread_ident(), aLock));
-
return (PyThread_type_lock) aLock;
}
void
PyThread_free_lock(PyThread_type_lock aLock)
{
- dprintf(("%lu: PyThread_free_lock(%p) called\n", PyThread_get_thread_ident(),aLock));
-
FreeNonRecursiveMutex(aLock) ;
}
milliseconds = INFINITE;
}
- dprintf(("%lu: PyThread_acquire_lock_timed(%p, %lld) called\n",
- PyThread_get_thread_ident(), aLock, microseconds));
-
if (aLock && EnterNonRecursiveMutex((PNRMUTEX)aLock,
(DWORD)milliseconds) == WAIT_OBJECT_0) {
success = PY_LOCK_ACQUIRED;
success = PY_LOCK_FAILURE;
}
- dprintf(("%lu: PyThread_acquire_lock(%p, %lld) -> %d\n",
- PyThread_get_thread_ident(), aLock, microseconds, success));
-
return success;
}
int
void
PyThread_release_lock(PyThread_type_lock aLock)
{
- dprintf(("%lu: PyThread_release_lock(%p) called\n", PyThread_get_thread_ident(),aLock));
-
- if (!(aLock && LeaveNonRecursiveMutex((PNRMUTEX) aLock)))
- dprintf(("%lu: Could not PyThread_release_lock(%p) error: %ld\n", PyThread_get_thread_ident(), aLock, GetLastError()));
+ if (aLock) {
+ (void)LeaveNonRecursiveMutex((PNRMUTEX) aLock);
+ }
}
/* minimum/maximum thread stack sizes supported */
size_t tss;
#endif
- dprintf(("PyThread_start_new_thread called\n"));
if (!initialized)
PyThread_init_thread();
void _Py_NO_RETURN
PyThread_exit_thread(void)
{
- dprintf(("PyThread_exit_thread called\n"));
if (!initialized)
exit(0);
pthread_exit(0);
sem_t *lock;
int status, error = 0;
- dprintf(("PyThread_allocate_lock called\n"));
if (!initialized)
PyThread_init_thread();
}
}
- dprintf(("PyThread_allocate_lock() -> %p\n", (void *)lock));
return (PyThread_type_lock)lock;
}
int status, error = 0;
(void) error; /* silence unused-but-set-variable warning */
- dprintf(("PyThread_free_lock(%p) called\n", lock));
if (!thelock)
return;
int status, error = 0;
(void) error; /* silence unused-but-set-variable warning */
- dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) called\n",
- lock, microseconds, intr_flag));
_PyTime_t timeout; // relative timeout
if (microseconds >= 0) {
success = PY_LOCK_FAILURE;
}
- dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) -> %d\n",
- lock, microseconds, intr_flag, success));
return success;
}
int status, error = 0;
(void) error; /* silence unused-but-set-variable warning */
- dprintf(("PyThread_release_lock(%p) called\n", lock));
status = sem_post(thelock);
CHECK_STATUS("sem_post");
pthread_lock *lock;
int status, error = 0;
- dprintf(("PyThread_allocate_lock called\n"));
if (!initialized)
PyThread_init_thread();
}
}
- dprintf(("PyThread_allocate_lock() -> %p\n", (void *)lock));
return (PyThread_type_lock) lock;
}
int status, error = 0;
(void) error; /* silence unused-but-set-variable warning */
- dprintf(("PyThread_free_lock(%p) called\n", lock));
/* some pthread-like implementations tie the mutex to the cond
* and must have the cond destroyed first.
pthread_lock *thelock = (pthread_lock *)lock;
int status, error = 0;
- dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) called\n",
- lock, microseconds, intr_flag));
-
if (microseconds == 0) {
status = pthread_mutex_trylock( &thelock->mut );
if (status != EBUSY)
}
if (error) success = PY_LOCK_FAILURE;
- dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) -> %d\n",
- lock, microseconds, intr_flag, success));
return success;
}
int status, error = 0;
(void) error; /* silence unused-but-set-variable warning */
- dprintf(("PyThread_release_lock(%p) called\n", lock));
status = pthread_mutex_lock( &thelock->mut );
CHECK_STATUS_PTHREAD("pthread_mutex_lock[3]");
projects / thirdparty / Python / cpython.git / commitdiff
