8000 gh-100227: Add Missing Locks for Specific Global Runtime State by ericsnowcurrently · Pull Request #105470 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-100227: Add Missing Locks for Specific Global Runtime State #105470

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

Closed
wants to merge 7 commits into from
Closed

gh-100227: Add Missing Locks for Specific Global Runtime State #105470

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d87a2d7
Factor out LOCKS_INIT().
ericsnowcurrently Jun 7, 2023
95a9f15
Add a granular lock for global atexit state.
ericsnowcurrently Jun 7, 2023
0cc4ffe
Factor out _PyRuntimeState.audit_hooks.
ericsnowcurrently Jun 7, 2023
605936f
Add a granular lock for global audit hooks state.
ericsnowcurrently Jun 7, 2023
1382ad6
Add a granular lock for global allocators state.
ericsnowcurrently Jun 7, 2023
70303d1
Fix usage of the audit hooks lock.
ericsnowcurrently Jun 7, 2023
405a905
Fix some function signatures.
ericsnowcurrently Jun 7, 2023
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
Prev Previous commit
Next Next commit
Fix usage of the audit hooks lock.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jun 7, 2023
commit 70303d199b42f02ab9d9b54f53e97f32426a5ad9
59 changes: 36 additions & 23 deletions Python/sysmodule.c
View file
10000 Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,7 @@ should_audit(PyInterpreterState *interp)
if (!interp) {
return 0;
}
PyThread_acquire_lock(interp->runtime->audit_hooks.mutex, WAIT_LOCK);
int has_global_hooks = (interp->runtime->audit_hooks.head != NULL);
PyThread_release_lock(interp->runtime->audit_hooks.mutex);
return (has_global_hooks
return (interp->runtime->audit_hooks.head
|| interp->audit_hooks
|| PyDTrace_AUDIT_ENABLED());
}
Expand Down Expand Up @@ -227,10 +224,11 @@ sys_audit_tstate(PyThreadState *ts, const char *event,
goto exit;
}

/* Call global hooks */
PyThread_acquire_lock(is->runtime->audit_hooks.mutex, WAIT_LOCK);
/* Call global hooks
*
* We don't worry about any races on hooks getting added,
* since that would not leave is in an inconsistent state. */
_Py_AuditHookEntry *e = is->runtime->audit_hooks.head;
PyThread_release_lock(is->runtime->audit_hooks.mutex);
for (; e; e = e->next) {
if (e->hookCFunction(event, eventArgs, e->userData) < 0) {
goto exit;
Expand Down Expand Up @@ -358,17 +356,35 @@ _PySys_ClearAuditHooks(PyThreadState *ts)
_PySys_Audit(ts, "cpython._PySys_ClearAuditHooks", NULL);
_PyErr_Clear(ts);

PyThread_acquire_lock(runtime->audit_hooks.mutex, WAIT_LOCK);
/* We don't worry about the very unlikely race right here,
* since it's entirely benign. Nothing else removes entries
* from the list and adding an entry right now would not cause
* any trouble. */
_Py_AuditHookEntry *e = runtime->audit_hooks.head, *n;
runtime->audit_hooks.head = NULL;
PyThread_release_lock(runtime->audit_hooks.mutex);
while (e) {
n = e->next;
PyMem_RawFree(e);
e = n;
}
}

static void
add_audit_hook_entry_unlocked(_PyRuntimeState *runtime,
_Py_AuditHookEntry *entry)
{
if (runtime->audit_hooks.head == NULL) {
runtime->audit_hooks.head = entry;
}
else {
_Py_AuditHookEntry *last = runtime->audit_hooks.head;
while (last->next) {
last = last->next;
}
last->next = entry;
}
}

int
PySys_AddAuditHook(Py_AuditHookFunction hook, void *userData)
{
Expand Down Expand Up @@ -396,31 +412,28 @@ PySys_AddAuditHook(Py_AuditHookFunction hook, void *userData)
}
}

PyThread_acquire_lock(runtime->audit_hooks.mutex, WAIT_LOCK);
_Py_AuditHookEntry *e = runtime->audit_hooks.head;
if (!e) {
e = (_Py_AuditHookEntry*)PyMem_RawMalloc(sizeof(_Py_AuditHookEntry));
runtime->audit_hooks.head = e;
} else {
while (e->next) {
e = e->next;
}
e = e->next = (_Py_AuditHookEntry*)PyMem_RawMalloc(
_Py_AuditHookEntry *e = (_Py_AuditHookEntry*)PyMem_RawMalloc(
sizeof(_Py_AuditHookEntry));
}
PyThread_release_lock(runtime->audit_hooks.mutex);

if (!e) {
if (tstate != NULL) {
_PyErr_NoMemory(tstate);
}
return -1;
}

e->next = NULL;
e->hookCFunction = (Py_AuditHookFunction)hook;
e->userData = userData;

if (runtime->audit_hooks.mutex == NULL) {
/* The runtime must not be initailized yet. */
add_audit_hook_entry_unlocked(runtime, e);
}
else {
PyThread_acquire_lock(runtime->audit_hooks.mutex, WAIT_LOCK);
add_audit_hook_entry_unlocked(runtime, e);
PyThread_release_lock(runtime->audit_hooks.mutex);
}

return 0;
}

Expand Down
0