bpo-44895 Address Victor's suggestion

Author: corona10

Doc/using/cmdline.rst

@@ -976,9 +976,9 @@ Debug-mode variables
 
    Need Python configured with the :option:`--with-trace-refs` build option.
 
-.. envvar:: PYTHONDUMPDIR
+.. envvar:: PYTHONDUMPFILE
 
-   If set, Python will create a file at '$(PYTHONDUMPDIR)/cpython-tracerefs-<pid>.txt` as dump file
+   If set, Python will create a file at `$PYTHONDUMPFILE` as dump file
    which is generated by :envvar:`PYTHONDUMPREFS`.
 
    Need Python configured with the :option:`--with-trace-refs` build option.

Include/cpython/initconfig.h

@@ -144,7 +144,7 @@ typedef struct PyConfig {
     int show_ref_count;
     int dump_refs;
     int malloc_stats;
-    wchar_t *python_dump_dir;
+    wchar_t *python_dump_file;
     wchar_t *filesystem_encoding;
     wchar_t *filesystem_errors;
     wchar_t *pycache_prefix;

Misc/NEWS.d/next/Core and Builtins/2021-08-14-20-13-21.bpo-44895.Ic9m90.rst

@@ -1,2 +1,2 @@
-A debug variable :envvar:`PYTHONDUMPDIR` is added for creating a dump file
+A debug variable :envvar:`PYTHONDUMPFILE` is added for creating a dump file
 which is generated by :envvar:`PYTHONDUMPREFS`. Patch by Dong-hee Na.

Python/initconfig.c

@@ -898,7 +898,7 @@ _PyConfig_Copy(PyConfig *config, const PyConfig *config2)
     COPY_ATTR(no_debug_ranges);
     COPY_ATTR(show_ref_count);
     COPY_ATTR(dump_refs);
-    COPY_ATTR(python_dump_dir);
+    COPY_ATTR(python_dump_file);
     COPY_ATTR(malloc_stats);
 
     COPY_WSTR_ATTR(pycache_prefix);
@@ -1702,9 +1702,9 @@ config_read_env_vars(PyConfig *config)
         config->malloc_stats = 1;
     }
 
-    if (config->python_dump_dir == NULL) {
-        status = CONFIG_GET_ENV_DUP(config, &config->python_dump_dir,
-                                    L"PYTHONDUMPDIR", "PYTHONDUMPDIR");
+    if (config->python_dump_file == NULL) {
+        status = CONFIG_GET_ENV_DUP(config, &config->python_dump_file,
+                                    L"PYTHONDUMPFILE", "PYTHONDUMPFILE");
         if (_PyStatus_EXCEPTION(status)) {
             return status;
         }

Python/pylifecycle.c

@@ -32,7 +32,7 @@
 #ifdef MS_WINDOWS
 #  undef BYTE
 #  include "windows.h"
-#  define getpid GetCurrentProcessId
+
    extern PyTypeObject PyWindowsConsoleIO_Type;
 #  define PyWindowsConsoleIO_Check(op) \
        (PyObject_TypeCheck((op), &PyWindowsConsoleIO_Type))
@@ -1736,7 +1736,7 @@ Py_FinalizeEx(void)
     int show_ref_count = tstate->interp->config.show_ref_count;
 #endif
 #ifdef Py_TRACE_REFS
-    wchar_t *python_dump_dir = tstate->interp->config.python_dump_dir;
+    wchar_t *python_dump_file = tstate->interp->config.python_dump_file;
     int dump_refs = tstate->interp->config.dump_refs;
 #endif
 #ifdef WITH_PYMALLOC
@@ -1838,10 +1838,8 @@ Py_FinalizeEx(void)
      */
 
     FILE *fp = stderr;
-    if (python_dump_dir != NULL) {
-        char dump_file_name[255];
-        sprintf(dump_file_name, "%S/python-tracerefs-%d.txt", python_dump_dir, getpid());
-        fp = fopen(dump_file_name,"w");
+    if (python_dump_file != NULL) {
+        fp = _Py_wfopen(python_dump_file, L"w");
     }
     if (dump_refs) {
         _Py_PrintReferences(fp);