mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 04:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

GH-91054: Reset static events counts in code watchers tests (#99978)

Browse source
This commit is contained in:
Itamar Ostricher 2022-12-04 04:38:21 -08:00 • committed by GitHub
parent 76f43fc09a
commit 1012dc1b43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_capi/test_watchers.py
View file

@ -383,11 +383,11 @@ class TestCodeObjectWatchers(unittest.TestCase):
del co3 del co3
self.assert_event_counts(2, 2, 1, 1) self.assert_event_counts(2, 2, 1, 1)
# verify counts remain as they were after both watchers are cleared # verify counts are reset and don't change after both watchers are cleared
co4 = _testcapi.code_newempty("test_watchers", "dummy4", 0) co4 = _testcapi.code_newempty("test_watchers", "dummy4", 0)
self.assert_event_counts(2, 2, 1, 1) self.assert_event_counts(0, 0, 0, 0)
del co4 del co4
self.assert_event_counts(2, 2, 1, 1) self.assert_event_counts(0, 0, 0, 0)
def test_clear_out_of_range_watcher_id(self): def test_clear_out_of_range_watcher_id(self):
with self.assertRaisesRegex(ValueError, r"Invalid code watcher ID -1"): with self.assertRaisesRegex(ValueError, r"Invalid code watcher ID -1"):

9
Modules/_testcapi/watchers.c
View file

@ -325,9 +325,13 @@ add_code_watcher(PyObject *self, PyObject *which_watcher)
long which_l = PyLong_AsLong(which_watcher); long which_l = PyLong_AsLong(which_watcher);
if (which_l == 0) { if (which_l == 0) {
watcher_id = PyCode_AddWatcher(first_code_object_callback); watcher_id = PyCode_AddWatcher(first_code_object_callback);
num_code_object_created_events[0] = 0;
num_code_object_destroyed_events[0] = 0;
} }
else if (which_l == 1) { else if (which_l == 1) {
watcher_id = PyCode_AddWatcher(second_code_object_callback); watcher_id = PyCode_AddWatcher(second_code_object_callback);
num_code_object_created_events[1] = 0;
num_code_object_destroyed_events[1] = 0;
} }
else { else {
return NULL; return NULL;
@ -346,6 +350,11 @@ clear_code_watcher(PyObject *self, PyObject *watcher_id)
if (PyCode_ClearWatcher(watcher_id_l) < 0) { if (PyCode_ClearWatcher(watcher_id_l) < 0) {
return NULL; return NULL;
} }
// reset static events counters
if (watcher_id_l >= 0 && watcher_id_l < NUM_CODE_WATCHERS) {
num_code_object_created_events[watcher_id_l] = 0;
num_code_object_destroyed_events[watcher_id_l] = 0;
}
Py_RETURN_NONE; Py_RETURN_NONE;
} }