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.

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

gh-117122: Fix pystats after incremental GC changes #117123

Closed
wants to merge 2 commits into from

Conversation

mdboom
Copy link
Contributor

@mdboom mdboom commented Mar 21, 2024

Python/gc.c Show resolved Hide resolved
@@ -1421,7 +1420,7 @@ gc_collect_increment(PyThreadState *tstate, struct gc_collection_stats *stats)
gc_set_old_space(gc, gcstate->visited_space);
increment_size += expand_region_transitively_reachable(&increment, gc, gcstate);
}
GC_STAT_ADD(1, objects_queued, region_size);
GC_STAT_ADD(1, objects_queued, increment_size);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know if this is correct, but region_size doesn't exist.

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure if this make sense anymore. Maybe just drop the "queued" stat?

@mdboom mdboom requested a review from markshannon March 21, 2024 13:47
Copy link
Member

@markshannon markshannon left a comment

Choose a reason for hiding this comment

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

This is going to conflict with #117120.
Once that's in, I'll review this properly.

@@ -1421,7 +1420,7 @@ gc_collect_increment(PyThreadState *tstate, struct gc_collection_stats *stats)
gc_set_old_space(gc, gcstate->visited_space);
increment_size += expand_region_transitively_reachable(&increment, gc, gcstate);
}
GC_STAT_ADD(1, objects_queued, region_size);
GC_STAT_ADD(1, objects_queued, increment_size);
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure if this make sense anymore. Maybe just drop the "queued" stat?

@markshannon
Copy link
Member

Actually, don't worry about the merge conflict. I can fix it in my PR

@mdboom
Copy link
Contributor Author

mdboom commented Mar 21, 2024

I'm not sure if this make sense anymore. Maybe just drop the "queued" stat?

I leave that to you, but this stat is new as of #116206 (it's just that it never compiled).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants