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.

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

Addressing Incorrect Handling of Python GIL that Leads to a SEGFAULT #361

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Addressing Incorrect Handling of Python GIL that Leads to a SEGFAULT #361

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd16f69
Resolved issue; need to acquire GIL before calling C.PyCallable_Check
Scusemua Jul 20, 2024
c86786f
Added newline character to closing bracket
Scusemua Jul 20, 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
16 changes: 12 additions & 4 deletions bind/symbols.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,24 +1083,32 @@ func (sym *symtab) addSignatureType(pkg *types.Package, obj types.Object, t type

py2g := fmt.Sprintf("%s { ", nsig)

py2g += "_gstate := C.PyGILState_Ensure()\n"

// TODO: use strings.Builder
if rets.Len() == 0 {
py2g += "if C.PyCallable_Check(_fun_arg) == 0 { return }\n"
py2g += "if C.PyCallable_Check(_fun_arg) == 0 {\n"
py2g += "C.PyGILState_Release(_gstate)\n" // Release GIL
py2g += "return\n"
py2g += "}\n"
} else {
zstr, err := sym.ZeroToGo(ret.Type(), rsym)
if err != nil {
return err
}
py2g += fmt.Sprintf("if C.PyCallable_Check(_fun_arg) == 0 { return %s }\n", zstr)
py2g += "if C.PyCallable_Check(_fun_arg) == 0 {\n"
py2g += "C.PyGILState_Release(_gstate)\n" // Release GIL
py2g += fmt.Sprintf("return %s\n", zstr)
py2g += "}\n"
}
py2g += "_gstate := C.PyGILState_Ensure()\n"

if nargs > 0 {
bstr, err := sym.buildTuple(args, "_fcargs", "_fun_arg")
if err != nil {
return err
}
py2g += bstr + retstr
py2g += fmt.Sprintf("C.PyObject_CallObject(_fun_arg, _fcargs)\n")
py2g += "C.PyObject_CallObject(_fun_arg, _fcargs)\n"
py2g += "C.gopy_decref(_fcargs)\n"
} else {
// TODO: methods not supported for no-args case -- requires self arg..
Expand Down