Skip to content

bpo-32096: Remove obj and mem from _PyRuntime #4532

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
vstinner merged 7 commits into from
Nov 24, 2017
Merged

bpo-32096: Remove obj and mem from _PyRuntime #4532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ecbfaa
bpo-32096: Remove obj and mem from _PyRuntime
vstinner Nov 23, 2017
98ae175
Fix pgenmain.c
vstinner Nov 23, 2017
f606f65
Fix _PyMem_GetDefaultRawAllocator()
vstinner Nov 24, 2017
bcec97f
Add NEWS entry
vstinner Nov 24, 2017
55953b6
Add test_capi.test_pre_initialization_api()
vstinner Nov 24, 2017
eec5ecf
NEWS: Fix grammar
vstinner Nov 24, 2017
3fda852
PCbuild: Remove Include/internal/pymalloc.h
vstinner Nov 24, 2017
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
48 changes: 0 additions & 48 deletions Include/internal/mem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,54 +7,6 @@ extern "C" {
#include "objimpl.h"
#include "pymem.h"

#ifdef WITH_PYMALLOC
#include "internal/pymalloc.h"
#endif

/* Low-level memory runtime state */

struct _pymem_runtime_state {
struct _allocator_runtime_state {
PyMemAllocatorEx mem;
PyMemAllocatorEx obj;
PyMemAllocatorEx raw;
} allocators;
#ifdef WITH_PYMALLOC
/* Array of objects used to track chunks of memory (arenas). */
struct arena_object* arenas;
/* The head of the singly-linked, NULL-terminated list of available
arena_objects. */
struct arena_object* unused_arena_objects;
/* The head of the doubly-linked, NULL-terminated at each end,
list of arena_objects associated with arenas that have pools
available. */
struct arena_object* usable_arenas;
/* Number of slots currently allocated in the `arenas` vector. */
unsigned int maxarenas;
/* Number of arenas allocated that haven't been free()'d. */
size_t narenas_currently_allocated;
/* High water mark (max value ever seen) for
* narenas_currently_allocated. */
size_t narenas_highwater;
/* Total number of times malloc() called to allocate an arena. */
size_t ntimes_arena_allocated;
poolp usedpools[MAX_POOLS];
Py_ssize_t num_allocated_blocks;
#endif /* WITH_PYMALLOC */
size_t serialno; /* incremented on each debug {m,re}alloc */
};

PyAPI_FUNC(void) _PyMem_Initialize(struct _pymem_runtime_state *);


/* High-level memory runtime state */

struct _pyobj_runtime_state {
PyObjectArenaAllocator allocator_arenas;
};

PyAPI_FUNC(void) _PyObject_Initialize(struct _pyobj_runtime_state *);


/* GC runtime state */

Expand Down
Loading