Skip to content

gh-126425: Refactor _lsprof_Profiler_enable #126426

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
merged 3 commits into from
Nov 5, 2024
Merged

gh-126425: Refactor _lsprof_Profiler_enable #126426

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a98ae8
gh-126425: Refactor `_lsprof_Profiler_enable`
sobolevn Nov 5, 2024
07b4b42
Address review
sobolevn Nov 5, 2024
a396d59
Address review
sobolevn Nov 5, 2024
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
38 changes: 26 additions & 12 deletions Modules/_lsprof.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,34 +780,48 @@ _lsprof_Profiler_enable_impl(ProfilerObject *self, int subcalls,
return NULL;
}

if (PyObject_CallMethod(monitoring, "use_tool_id", "is", self->tool_id, "cProfile") == NULL) {
PyObject *check = PyObject_CallMethod(monitoring,
"use_tool_id", "is",
self->tool_id, "cProfile");
if (check == NULL) {
PyErr_Clear();
PyErr_Format(PyExc_ValueError, "Another profiling tool is already active");
Py_DECREF(monitoring);
return NULL;
goto error;
}
Py_DECREF(check);

for (int i = 0; callback_table[i].callback_method; i++) {
int event = (1 << callback_table[i].event);
PyObject* callback = PyObject_GetAttrString((PyObject*)self, callback_table[i].callback_method);
if (!callback) {
Py_DECREF(monitoring);
return NULL;
goto error;
}
Py_XDECREF(PyObject_CallMethod(monitoring, "register_callback", "iiO", self->tool_id,
(1 << callback_table[i].event),
callback));
PyObject *register_result = PyObject_CallMethod(monitoring, "register_callback",
"iiO", self->tool_id,
event, callback);
Py_DECREF(register_result);
Py_DECREF(callback);
all_events |= (1 << callback_table[i].event);
if (register_result == NULL) {
goto error;
}
all_events |= event;
}

if (!PyObject_CallMethod(monitoring, "set_events", "ii", self->tool_id, all_events)) {
Py_DECREF(monitoring);
return NULL;
PyObject *event_result = PyObject_CallMethod(monitoring, "set_events", "ii",
self->tool_id, all_events);
if (event_result == NULL) {
goto error;
}

Py_DECREF(event_result);
Py_DECREF(monitoring);

self->flags |= POF_ENABLED;
Py_RETURN_NONE;

error:
Py_DECREF(monitoring);
return NULL;
}

static void
Expand Down
Loading