Skip to content
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

Jump to bottom

bpo-30789: Use a single memory block for co_extra. #2555

Merged
merged 3 commits into from
Jul 4, 2017
Merged

bpo-30789: Use a single memory block for co_extra. #2555

merged 3 commits into from
Jul 4, 2017

Conversation

serhiy-storchaka
Copy link
Member

No description provided.

@serhiy-storchaka serhiy-storchaka added the performance Performance or resource usage label Jul 4, 2017
@serhiy-storchaka serhiy-storchaka requested review from vstinner and 1st1 July 4, 2017 03:59
@mention-bot
Copy link

@serhiy-storchaka, thanks for your PR! By analyzing the history of the files in this pull request, we identified @pitrou, @brettcannon and @benjaminp to be potential reviewers.

vstinner
vstinner reviewed Jul 4, 2017
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, this is what I had in mind. LGTM but I need a second review later after my breakfast to double check before approving :-)

cc @1st1

vstinner
vstinner approved these changes Jul 4, 2017
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just minor comments.

Objects/codeobject.c Outdated
@@ -459,7 +458,8 @@ code_sizeof(PyCodeObject *co, void *unused)
res += PyTuple_GET_SIZE(co->co_cellvars) * sizeof(Py_ssize_t);

if (co_extra != NULL)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add lovely { ... }

Objects/codeobject.c Outdated
if (co_extra == NULL) {
co_extra = PyMem_Malloc(sizeof(_PyCodeObjectExtra));
if (co_extra == NULL || co_extra->ce_size <= index) {
Py_ssize_t i = co_extra == NULL ? 0 : co_extra->ce_size;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: I suggest (...) to make the code more readable,

Py_ssize_t i = (co_extra == NULL ? 0 : co_extra->ce_size);

vstinner
vstinner approved these changes Jul 4, 2017
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, thanks ;-)

@vstinner vstinner merged commit 378ebb6 into python:master Jul 4, 2017
vstinner added a commit that referenced this pull request Jul 5, 2017
@vstinner
Revert "bpo-30789: Use a single memory block for co_extra. (#2555)"
e2dde13 
This reverts commit 378ebb6.
vstinner added a commit that referenced this pull request Jul 5, 2017
@vstinner
Revert "bpo-30822: Fix testing of datetime module." (#2588)
8207c17 
* Revert "bpo-30854: Fix compile error when --without-threads (#2581)"

This reverts commit 0c31163.

* Revert "NEWS for 30777 (#2576)"

This reverts commit aaa917f.

* Revert "bpo-21624: IDLE -- minor htest fixes (#2575)"

This reverts commit 2000150.

* Revert "bpo-30777: IDLE: configdialog - add docstrings and improve comments (#2440)"

This reverts commit 7eb5883.

* Revert "bpo-30319: socket.close() now ignores ECONNRESET (#2565)"

This reverts commit 67e1478.

* Revert "bpo-30789: Use a single memory block for co_extra. (#2555)"

This reverts commit 378ebb6.

* Revert "bpo-30845: Enhance test_concurrent_futures cleanup (#2564)"

This reverts commit 3df9dec.

* Revert "bpo-29293: multiprocessing.Condition.notify() lacks parameter `n` (#2480)"

This reverts commit 4835041.

* Revert "Remove outdated FOX from GUI FAQ (GH-2538)"

This reverts commit d3ed287.

* Revert "bpo-6691: Pyclbr now reports nested classes and functions. (#2503)"

This reverts commit 246ff3b.

* Revert "bpo-29464: Rename METH_FASTCALL to METH_FASTCALL|METH_KEYWORDS and make (#1955)"

This reverts commit 6969eaf.

* Revert "bpo-30832: Remove own implementation for thread-local storage (#2537)"

This reverts commit aa0aa04.

* Revert "bpo-30764: Fix regrtest --fail-env-changed --forever (#2536)"

This reverts commit 5e87592.

* Revert "bpo-30822: Deduplicate ZoneInfoTest classes in test_datetime. (#2534)"

This reverts commit 34b5487.

* Revert "bpo-30822: Fix testing of datetime module. (#2530)"

This reverts commit 98b6bc3.
@serhiy-storchaka serhiy-storchaka deleted the co_extra-single-block branch July 5, 2017 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner approved these changes

@1st1 1st1 Awaiting requested review from 1st1

Assignees
No one assigned
Labels
performance Performance or resource usage
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@serhiy-storchaka @mention-bot @vstinner @the-knights-who-say-ni