Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions news/908.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix integration with the ``greenlet`` package when greenlet 3.4.0 is installed
and when tracing is started before the greenlet module is imported.
1 change: 1 addition & 0 deletions news/908.removal.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Drop integration with 0.x versions of the ``greenlet`` module (which are from 2020 or earlier).
4 changes: 1 addition & 3 deletions src/memray/_memray/hooks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,7 @@ dlopen(const char* filename, int flag) noexcept
}
if (ret) {
tracking_api::Tracker::invalidate_module_cache();
if (filename
&& (nullptr != strstr(filename, "/_greenlet.") || nullptr != strstr(filename, "/greenlet.")))
{
if (filename && nullptr != strstr(filename, "/_greenlet.")) {
tracking_api::Tracker::beginTrackingGreenlets();
}
}
Expand Down
6 changes: 1 addition & 5 deletions src/memray/_memray/tracking_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -537,11 +537,7 @@ PythonStackTracker::installGreenletTraceFunctionIfNeeded()
// `greenlet._greenlet` has already been imported.
PyObject* _greenlet = PyDict_GetItemString(modules, "greenlet._greenlet");
if (!_greenlet) {
// Before greenlet 1.0, the extension module was just named "greenlet"
_greenlet = PyDict_GetItemString(modules, "greenlet");
if (!_greenlet) {
return;
}
return;
}

// Borrowed reference
Expand Down
Loading