Skip to content

gh-102304: Move _Py_RefTotal to _PyRuntimeState #102543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericsnowcurrently merged 18 commits into from
Mar 20, 2023
Merged

gh-102304: Move _Py_RefTotal to _PyRuntimeState #102543

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
005a143
_Py_RefTotal -> REFTOTAL.
ericsnowcurrently Mar 8, 2023
b5c783b
Separate the internal helper functions.
ericsnowcurrently Mar 8, 2023
d286080
Drop the Py_BUILD_CORE case.
ericsnowcurrently Mar 8, 2023
31a14ed
Add a blank line.
ericsnowcurrently Mar 8, 2023
8ca3983
_Py_GetRefTotal() -> _Py_GetGlobalRefTotal().
ericsnowcurrently Mar 8, 2023
bff6a6d
Move _Py_RefTotal to _PyRuntimeState.
ericsnowcurrently Nov 15, 2022
5ab4c4b
Include the legacy total in _Py_GetGlobalRefTotal().
ericsnowcurrently Dec 13, 2022
cc5a99a
Fix get_global_refcount().
ericsnowcurrently Mar 9, 2023
f382c4a
Stop being so clever with PyAPI_FUNC().
ericsnowcurrently Mar 9, 2023
38e0860
Drop unnecessary incr/decr to the reftotal.
ericsnowcurrently Mar 9, 2023
7dc494d
Preserve the reftotal past runtime finalization.
ericsnowcurrently Mar 17, 2023
136be3a
Avoid double-counting the final reftotal.
ericsnowcurrently Mar 17, 2023
0abec9c
Factor out sync_legacy_reftotal().
ericsnowcurrently Mar 17, 2023
6e4425c
Drop last_legacy_reftotal.
ericsnowcurrently Mar 17, 2023
49f1502
Fix the REFTOTAL macro.
ericsnowcurrently Mar 17, 2023
f874ae0
_Py_ClearRefTotal() -> _Py_FinalizeRefTotal().
ericsnowcurrently Mar 17, 2023
2fb3259
Add a new global to the ingored list.
ericsnowcurrently Mar 17, 2023
2a11934
Fix _Py_FinalizeRefTotal().
ericsnowcurrently Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move _Py_RefTotal to _PyRuntimeState.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 9, 2023
commit bff6a6d3775e5f0e54ea896ed1809d0c66f42326
2 changes: 1 addition & 1 deletion Include/internal/pycore_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ extern void _Py_AddRefTotal(Py_ssize_t);
extern void _Py_IncRefTotal(void);
extern void _Py_DecRefTotal(void);

# define _Py_DEC_REFTOTAL() _Py_RefTotal--
# define _Py_DEC_REFTOTAL() _PyRuntime.object_state.reftotal--
#endif

// Increment reference count by n
Expand Down
23 changes: 23 additions & 0 deletions Include/internal/pycore_object_state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef Py_INTERNAL_OBJECT_STATE_H
#define Py_INTERNAL_OBJECT_STATE_H
#ifdef __cplusplus
extern "C" {
#endif

#ifndef Py_BUILD_CORE
# error "this header requires Py_BUILD_CORE define"
#endif

struct _py_object_runtime_state {
#ifdef Py_REF_DEBUG
Py_ssize_t reftotal;
#else
int _not_used;
#endif
};


#ifdef __cplusplus
}
#endif
#endif /* !Py_INTERNAL_OBJECT_STATE_H */
2 changes: 2 additions & 0 deletions Include/internal/pycore_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ extern "C" {
#include "pycore_global_objects.h" // struct _Py_global_objects
#include "pycore_import.h" // struct _import_runtime_state
#include "pycore_interp.h" // PyInterpreterState
#include "pycore_object_state.h" // struct _py_object_runtime_state
#include "pycore_parser.h" // struct _parser_runtime_state
#include "pycore_pymem.h" // struct _pymem_allocators
#include "pycore_pyhash.h" // struct pyhash_runtime_state
Expand Down Expand Up @@ -151,6 +152,7 @@ typedef struct pyruntimestate {
void *open_code_userdata;
_Py_AuditHookEntry *audit_hook_head;

struct _py_object_runtime_state object_state;
struct _Py_float_runtime_state float_state;
struct _Py_unicode_runtime_state unicode_state;
struct _Py_dict_runtime_state dict_state;
Expand Down
1 change: 1 addition & 0 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,6 +1698,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/internal/pycore_moduleobject.h \
$(srcdir)/Include/internal/pycore_namespace.h \
$(srcdir)/Include/internal/pycore_object.h \
$(srcdir)/Include/internal/pycore_object_state.h \
$(srcdir)/Include/internal/pycore_obmalloc.h \
$(srcdir)/Include/internal/pycore_obmalloc_init.h \
$(srcdir)/Include/internal/pycore_pathconfig.h \
Expand Down
4 changes: 2 additions & 2 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ _PyObject_CheckConsistency(PyObject *op, int check_content)


#ifdef Py_REF_DEBUG
// XXX Move this to _PyRuntimeState.
/* We keep the legacy symbol around for backward compatibility. */
Py_ssize_t _Py_RefTotal;
#endif

#ifdef Py_REF_DEBUG

# define REFTOTAL _Py_RefTotal
# define REFTOTAL (_PyRuntime.object_state.reftotal)

static inline void
reftotal_increment(void)
Expand Down
1 change: 1 addition & 0 deletions PCbuild/pythoncore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@
<ClInclude Include="..\Include\internal\pycore_moduleobject.h" />
<ClInclude Include="..\Include\internal\pycore_namespace.h" />
<ClInclude Include="..\Include\internal\pycore_object.h" />
<ClInclude Include="..\Include\internal\pycore_object_state.h" />
<ClInclude Include="..\Include\internal\pycore_obmalloc.h" />
<ClInclude Include="..\Include\internal\pycore_obmalloc_init.h" />
<ClInclude Include="..\Include\internal\pycore_pathconfig.h" />
Expand Down
3 changes: 3 additions & 0 deletions PCbuild/pythoncore.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,9 @@
<ClInclude Include="..\Include\internal\pycore_object.h">
<Filter>Include\internal</Filter>
</ClInclude>
<ClInclude Include="..\Include\internal\pycore_object_state.h">
<Filter>Include\internal</Filter>
</ClInclude>
<ClInclude Include="..\Include\internal\pycore_obmalloc.h">
<Filter>Include\internal</Filter>
</ClInclude>
Expand Down
1 change: 0 additions & 1 deletion Tools/c-analyzer/cpython/ignored.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ Modules/syslogmodule.c - S_log_open -
##-----------------------
## kept for stable ABI compatibility

# XXX should be per-interpreter, without impacting stable ABI extensions
Objects/object.c - _Py_RefTotal -

##-----------------------
Expand Down