gh-131238: Move pycore_obmalloc.h include to pycore_runtime_structs.h (#131482)

Move pycore_obmalloc.h include from pycore_interp_structs.h to
pycore_runtime_structs.h.

Add also comment explaining the purpose of each include in
pycore_interp_structs.h, pycore_runtime_structs.h and
pycore_structs.h.

Remove <stdbool.h> and <stddef.h> from pycore_structs.h.
This commit is contained in:
Victor Stinner 2025-03-20 00:32:30 +01:00 committed by GitHub
parent a7411025c5
commit 6827c5129c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 28 additions and 40 deletions

View file

@ -1,14 +1,14 @@
/* This file contains the struct definitions for the runtime, interpreter
* and thread states, plus all smaller structs contained therein */
#ifndef Py_INTERNAL_RUNTIME_STRUCTS_H
#define Py_INTERNAL_RUNTIME_STRUCTS_H
#ifdef __cplusplus
extern "C" {
#endif
/* This file contains the struct definitions for the runtime, interpreter
* and thread states, plus all smaller structs contained therein */
#include "pycore_structs.h"
#include "pycore_interp_structs.h"
#include "pycore_interp_structs.h" // _PyGC_Head_UNUSED
#include "pycore_obmalloc.h" // struct _obmalloc_global_state
/************ Runtime state ************/
@ -58,17 +58,16 @@ struct pyhash_runtime_state {
} urandom_cache;
};
#include "pycore_tracemalloc.h"
#include "pycore_tracemalloc.h" // struct _tracemalloc_runtime_state
struct _fileutils_state {
int force_ascii;
};
#include "pycore_debug_offsets.h"
#include "pycore_signal.h"
#include "pycore_faulthandler.h"
#include "pycore_pythread.h"
#include "pycore_ast.h"
#include "pycore_debug_offsets.h" // _Py_DebugOffsets
#include "pycore_signal.h" // struct _signals_runtime_state
#include "pycore_faulthandler.h" // struct _faulthandler_runtime_state
#include "pycore_ast.h" // struct _expr
#ifdef Py_DEBUG
#define _PYPEGEN_NSTATISTICS 2000
@ -109,7 +108,7 @@ struct _Py_cached_objects {
#define _PY_NSMALLPOSINTS 257
#define _PY_NSMALLNEGINTS 5
#include "pycore_global_strings.h"
#include "pycore_global_strings.h" // struct _Py_global_strings
struct _Py_static_objects {
struct {
@ -310,7 +309,6 @@ struct pyruntimestate {
};
#ifdef __cplusplus
}
#endif