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

Jump to bottom

HPCC-18841 Embedded python may lock up at process termination #10707

Merged
merged 1 commit into from Dec 6, 2017
+13 −4
Merged

HPCC-18841 Embedded python may lock up at process termination #10707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion plugins/py3embed/py3embed.cpp
View file
Open in desktop
Expand Up @@ -252,6 +252,8 @@ static void releaseContext()

// Use a global object to ensure that the Python interpreter is initialized on main thread

static HINSTANCE keepLoadedHandle;

static class Python3xGlobalState
{
public:
Expand Down Expand Up @@ -289,6 +291,9 @@ static class Python3xGlobalState
}
~Python3xGlobalState()
{
if (keepLoadedHandle)
FreeSharedObject(keepLoadedHandle); // Must be process termination - ok to free now (and helps stop lockups at closedown in some Python libraries eg Tensorflow).

if (threadContext)
delete threadContext; // The one on the main thread won't get picked up by the thread hook mechanism
threadContext = NULL;
Expand Down Expand Up @@ -493,7 +498,7 @@ MODULE_INIT(INIT_PRIORITY_STANDARD)
if (tail)
{
tail[strlen(SharedObjectExtension)] = 0;
HINSTANCE h = LoadSharedObject(fullName, false, false);
keepLoadedHandle = LoadSharedObject(fullName, false, false);
break;
}
}
Expand Down
10 changes: 7 additions & 3 deletions plugins/pyembed/pyembed.cpp
View file
Open in desktop
Expand Up @@ -245,6 +245,8 @@ static void releaseContext()

// Use a global object to ensure that the Python interpreter is initialized on main thread

static HINSTANCE keepLoadedHandle;

static class Python27GlobalState
{
public:
Expand Down Expand Up @@ -282,6 +284,9 @@ static class Python27GlobalState
}
~Python27GlobalState()
{
if (keepLoadedHandle)
FreeSharedObject(keepLoadedHandle); // Must be process termination - ok to free now (and helps stop lockups at closedown in some Python libraries eg Tensorflow).

if (threadContext)
delete threadContext; // The one on the main thread won't get picked up by the thread hook mechanism
threadContext = NULL;
Expand Down Expand Up @@ -458,7 +463,7 @@ static class Python27GlobalState

MODULE_INIT(INIT_PRIORITY_STANDARD)
{
// Make sure we are never unloaded (as Python may crash if we are)
// Make sure we are never dynamically unloaded (as Python may crash if we are)
// we do this by doing a dynamic load of the pyembed library
// This also allows eclcc to be able to use the library for constant folding
#ifdef _WIN32
Expand All @@ -477,8 +482,7 @@ MODULE_INIT(INIT_PRIORITY_STANDARD)
StringBuffer modname;
if (findLoadedModule(modname, "libpy2embed"))
{
HINSTANCE h = LoadSharedObject(modname, false, false);
// Deliberately leak this handle
keepLoadedHandle = LoadSharedObject(modname, false, false);
}
#endif
return true;
Expand Down