Skip to content

[3.12] gh-126425: Refactor _lsprof_Profiler_enable (GH-126426) #126443

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 1 commit into from
Nov 5, 2024
Merged
Changes from all commits
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
37 changes: 25 additions & 12 deletions Modules/_lsprof.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,34 +750,47 @@ profiler_enable(ProfilerObject *self, PyObject *args, PyObject *kwds)
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_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(callback);
all_events |= (1 << callback_table[i].event);
if (register_result == NULL) {
goto error;
}
Py_DECREF(register_result);
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