python · vstinner · Nov 12, 2018 · Nov 1, 2018 · Nov 12, 2018
diff --git a/Include/internal/pycore_hash.h → Include/internal/pycore_pyhash.h b/Include/internal/pycore_hash.h → Include/internal/pycore_pyhash.h
diff --git a/Include/internal/pycore_lifecycle.h → Include/internal/pycore_pylifecycle.h b/Include/internal/pycore_lifecycle.h → Include/internal/pycore_pylifecycle.h
diff --git a/Include/internal/pycore_mem.h → Include/internal/pycore_pymem.h b/Include/internal/pycore_mem.h → Include/internal/pycore_pymem.h
diff --git a/Include/internal/pycore_state.h → Include/internal/pycore_pystate.h b/Include/internal/pycore_state.h → Include/internal/pycore_pystate.h
@@ -12,8 +12,8 @@ extern "C" {
 #include "pythread.h"

 #include "pycore_ceval.h"
-#include "pycore_mem.h"
 #include "pycore_pathconfig.h"
+#include "pycore_pymem.h"
 #include "pycore_warnings.h"



diff --git a/Include/pystate.h b/Include/pystate.h
@@ -301,7 +301,7 @@ PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
 /* Get the current Python thread state.

   Macro using PyThreadState_Get() or _PyThreadState_GET() depending if
-   pycore_state.h is included or not (this header redefines the macro).
+   pycore_pystate.h is included or not (this header redefines the macro).

   If PyThreadState_Get() is used, issue a fatal error if the current thread
   state is NULL.

diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -1027,13 +1027,16 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/internal/pycore_accu.h \
 		$(srcdir)/Include/internal/pycore_atomic.h \
 		$(srcdir)/Include/internal/pycore_ceval.h \
+		$(srcdir)/Include/internal/pycore_condvar.h \
 		$(srcdir)/Include/internal/pycore_context.h \
 		$(srcdir)/Include/internal/pycore_getopt.h \
 		$(srcdir)/Include/internal/pycore_gil.h \
-		$(srcdir)/Include/internal/pycore_lifecycle.h \
-		$(srcdir)/Include/internal/pycore_mem.h \
+		$(srcdir)/Include/internal/pycore_hamt.h \
 		$(srcdir)/Include/internal/pycore_pathconfig.h \
-		$(srcdir)/Include/internal/pycore_state.h \
+		$(srcdir)/Include/internal/pycore_pyhash.h \
+		$(srcdir)/Include/internal/pycore_pylifecycle.h \
+		$(srcdir)/Include/internal/pycore_pymem.h \
+		$(srcdir)/Include/internal/pycore_pystate.h \
 		$(srcdir)/Include/internal/pycore_warnings.h \
 		$(DTRACE_HEADERS)


diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
@@ -1,7 +1,7 @@

 #include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
 #include "structmember.h"

 /* _functools module written and maintained

diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
@@ -9,7 +9,7 @@

 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "structmember.h"
 #include "pythread.h"
 #include "_iomodule.h"

diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
@@ -3,7 +3,7 @@
 /* Interface to Sjoerd's portable C thread library */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "structmember.h" /* offsetof */
 #include "pythread.h"


diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
@@ -4,7 +4,7 @@

 #include "Python.h"
 #include "frameobject.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"


 static char *

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -25,8 +25,8 @@

 #include "Python.h"
 #include "pycore_context.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
 #include "frameobject.h"        /* for PyFrame_ClearFreeList */
 #include "pydtrace.h"
 #include "pytime.h"             /* for _PyTime_GetMonotonicClock() */

diff --git a/Modules/getpath.c b/Modules/getpath.c
@@ -4,7 +4,7 @@
 #include "osdefs.h"
 #include "pycore_fileutils.h"
 #include "pycore_pathconfig.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"

 #include <sys/types.h>
 #include <string.h>

diff --git a/Modules/main.c b/Modules/main.c
@@ -3,10 +3,10 @@
 #include "Python.h"
 #include "osdefs.h"
 #include "pycore_getopt.h"
-#include "pycore_lifecycle.h"
-#include "pycore_mem.h"
 #include "pycore_pathconfig.h"
-#include "pycore_state.h"
+#include "pycore_pylifecycle.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"

 #include <locale.h>


diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -32,7 +32,7 @@
 #else
 #include "winreparse.h"
 #endif
-#include "pycore_state.h"
+#include "pycore_pystate.h"

 /* On android API level 21, 'AT_EACCESS' is not declared although
 * HAVE_FACCESSAT is defined. */

diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -1,7 +1,7 @@
 /* Abstract Object Interface (many thanks to Jim Fulton) */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include <ctype.h>
 #include "structmember.h" /* we need the offsetof() macro from there */
 #include "longintrepr.h"

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
@@ -2,8 +2,8 @@

 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
 #include "structmember.h"
 #include "bytes_methods.h"
 #include "bytesobject.h"

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -3,8 +3,8 @@
 #define PY_SSIZE_T_CLEAN

 #include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"

 #include "bytes_methods.h"
 #include "pystrhex.h"

diff --git a/Objects/call.c b/Objects/call.c
@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "frameobject.h"



diff --git a/Objects/cellobject.c b/Objects/cellobject.c
@@ -1,8 +1,8 @@
 /* Cell object implementation */

 #include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"

 PyObject *
 PyCell_New(PyObject *obj)

diff --git a/Objects/classobject.c b/Objects/classobject.c
@@ -1,8 +1,8 @@
 /* Class object implementation (dead now except for methods) */

 #include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
 #include "structmember.h"

 #define TP_DESCR_GET(t) ((t)->tp_descr_get)

diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -3,7 +3,7 @@
 #include "Python.h"
 #include "code.h"
 #include "structmember.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"

 /* Holder for co_extra information */
 typedef struct {

diff --git a/Objects/descrobject.c b/Objects/descrobject.c
@@ -1,7 +1,7 @@
 /* Descriptors -- a new, flexible way to describe attributes */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "structmember.h" /* Why is this not included in Python.h? */

 /*[clinic input]

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -111,7 +111,7 @@ converting the dict to the combined table.
 #define PyDict_MINSIZE 8

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "dict-common.h"
 #include "stringlib/eq.h"    /* to get unicode_eq() */


diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -6,8 +6,8 @@

 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
 #include "structmember.h"
 #include "osdefs.h"


diff --git a/Objects/frameobject.c b/Objects/frameobject.c
@@ -1,7 +1,7 @@
 /* Frame object implementation */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"

 #include "code.h"
 #include "frameobject.h"

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
@@ -2,8 +2,8 @@
 /* Function object implementation */

 #include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
 #include "code.h"
 #include "structmember.h"


diff --git a/Objects/genobject.c b/Objects/genobject.c
@@ -1,7 +1,7 @@
 /* Generator object implementation */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "frameobject.h"
 #include "structmember.h"
 #include "opcode.h"

diff --git a/Objects/iterobject.c b/Objects/iterobject.c
@@ -1,8 +1,8 @@
 /* Iterator objects */

 #include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"

 typedef struct {
    PyObject_HEAD

diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -1,7 +1,7 @@
 /* List object implementation */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "pycore_accu.h"

 #ifdef STDC_HEADERS

diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
@@ -1,8 +1,8 @@
 /* Memoryview object implementation */

 #include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
 #include "pystrhex.h"
 #include <stddef.h>


diff --git a/Objects/methodobject.c b/Objects/methodobject.c
@@ -2,8 +2,8 @@
 /* Method object implementation */

 #include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
 #include "structmember.h"

 /* Free list for method objects to safe malloc/free overhead

diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
@@ -2,7 +2,7 @@
 /* Module object implementation */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "structmember.h"

 static Py_ssize_t max_module_number;

diff --git a/Objects/object.c b/Objects/object.c
@@ -2,7 +2,7 @@
 /* Generic object operations; and implementation of None */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "pycore_context.h"
 #include "frameobject.h"


diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "pycore_mem.h"
+#include "pycore_pymem.h"

 #include <stdbool.h>


diff --git a/Objects/odictobject.c b/Objects/odictobject.c
@@ -465,7 +465,7 @@ Potential Optimizations
 */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "structmember.h"
 #include "dict-common.h"
 #include <stddef.h>

diff --git a/Objects/setobject.c b/Objects/setobject.c
@@ -32,7 +32,7 @@
 */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "structmember.h"

 /* Object used as dummy key to fill deleted entries */

diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
@@ -14,8 +14,8 @@ this type and there is exactly one in existence.
 */

 #include "Python.h"
-#include "pycore_mem.h"
-#include "pycore_state.h"
+#include "pycore_pymem.h"
+#include "pycore_pystate.h"
 #include "structmember.h"

 static PyObject *

diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
@@ -2,7 +2,7 @@
 /* Tuple object implementation */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "pycore_accu.h"

 /*[clinic input]

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -1,7 +1,7 @@
 /* Type object implementation */

 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "frameobject.h"
 #include "structmember.h"


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -41,7 +41,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_fileutils.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "ucnhash.h"
 #include "bytes_methods.h"
 #include "stringlib/eq.h"

diff --git a/PC/getpathp.c b/PC/getpathp.c
@@ -80,7 +80,7 @@


 #include "Python.h"
-#include "pycore_state.h"
+#include "pycore_pystate.h"
 #include "osdefs.h"
 #include <wchar.h>


diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
@@ -119,10 +119,11 @@
    <ClInclude Include="..\Include\internal\pycore_getopt.h" />
    <ClInclude Include="..\Include\internal\pycore_gil.h" />
    <ClInclude Include="..\Include\internal\pycore_hamt.h" />
-    <ClInclude Include="..\Include\internal\pycore_lifecycle.h" />
-    <ClInclude Include="..\Include\internal\pycore_mem.h" />
    <ClInclude Include="..\Include\internal\pycore_pathconfig.h" />
-    <ClInclude Include="..\Include\internal\pycore_state.h" />
+    <ClInclude Include="..\Include\internal\pycore_pyhash.h" />
+    <ClInclude Include="..\Include\internal\pycore_pylifecycle.h" />
+    <ClInclude Include="..\Include\internal\pycore_pymem.h" />
+    <ClInclude Include="..\Include\internal\pycore_pystate.h" />
    <ClInclude Include="..\Include\internal\pycore_warnings.h" />
    <ClInclude Include="..\Include\intrcheck.h" />
    <ClInclude Include="..\Include\iterobject.h" />