10000 bpo-37543: optimize pymalloc by methane · Pull Request #14674 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

bpo-37543: optimize pymalloc #14674

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.

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
merged 8 commits into from
Jul 17, 2019
Merged
Changes from 1 commit
Commits
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
Merge remote-tracking branch 'origin/master' into optimize-pymalloc
  • Loading branch information
methane committed Jul 12, 2019
commit a690ddbc1d47d15e1a876570f90f63b7c8d332a9
2 changes: 0 additions & 2 deletions Objects/obmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,6 @@ _PyObject_Malloc(void *ctx, size_t nbytes)
{
void* ptr;
if (LIKELY(pymalloc_alloc(ctx, &ptr, nbytes))) {
_Py_AllocatedBlocks++;
return ptr;
}

Expand Down Expand Up @@ -1918,7 +1917,6 @@ _PyObject_Free(void *ctx, void *p)
return;
}

_Py_AllocatedBlocks--;
if (UNLIKELY(!pymalloc_free(ctx, p))) {
/* pymalloc didn't allocate this address */
PyMem_RawFree(p);
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0