Skip to content

Acquire GIL in the master process when --py-call-uwsgi-fork-hooks is set #2766

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

Open
OutOfFocus4 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Acquire GIL in the master process when --py-call-uwsgi-fork-hooks is set #2766

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ uint64_t uwsgi_swap64(uint64_t x) {
int check_hex(char *str, int len) {
int i;
for (i = 0; i < len; i++) {
if ((str[i] < '0' && str[i] > '9') && (str[i] < 'a' && str[i] > 'f') && (str[i] < 'A' && str[i] > 'F')
if (!(str[i] >= '0' && str[i] <= '9') && !(str[i] >= 'a' && str[i] <= 'f') && !(str[i] >= 'A' && str[i] <= 'F')
) {
return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/python/python_plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,15 +1007,15 @@ int uwsgi_python_mount_app(char *mountpoint, char *app) {
uwsgi.wsgi_req->appid = mountpoint;
uwsgi.wsgi_req->appid_len = strlen(mountpoint);
// lazy ?
if (uwsgi.mywid > 0) UWSGI_GET_GIL
if (uwsgi.mywid > 0 || up.call_uwsgi_fork_hooks) UWSGI_GET_GIL
if (uwsgi.single_interpreter) {
id = init_uwsgi_app(LOADER_MOUNT, app, uwsgi.wsgi_req, up.main_thread, PYTHON_APP_TYPE_WSGI);
}
else {
id = init_uwsgi_app(LOADER_MOUNT, app, uwsgi.wsgi_req, NULL, PYTHON_APP_TYPE_WSGI);
}
// lazy ?
if (uwsgi.mywid > 0) UWSGI_RELEASE_GIL
if (uwsgi.mywid > 0 || up.call_uwsgi_fork_hooks) UWSGI_RELEASE_GIL
return id;
}
return -1;
Expand Down