@@ -977,7 +977,6 @@ struct _is {
     struct _obmalloc_state *obmalloc;
 
     PyObject *audit_hooks;
-    PyMutex audit_hooks_mutex;
     PyType_WatchCallback type_watchers[TYPE_MAX_WATCHERS];
     PyCode_WatchCallback code_watchers[CODE_MAX_WATCHERS];
     PyContext_WatchCallback context_watchers[CONTEXT_MAX_WATCHERS];
 
@@ -44,20 +44,6 @@ def worker(worker_id):
         workers = [lambda: worker(i) for i in range(5)]
         threading_helper.run_concurrently(workers)
 
-    def test_sys_audit_hooks(self):
-        def _hook(*args):
-            return None
-
-        def adder():
-            for _ in range(100):
-                sys.addaudithook(_hook)
-
-        def auditor():
-            for _ in range(2000):
-                sys.audit("fusil.tsan.test")
-
-        threading_helper.run_concurrently([adder, auditor])
-
 
 if __name__ == "__main__":
     unittest.main()
@@ -578,7 +578,6 @@ init_interpreter(PyInterpreterState *interp,
     llist_init(&interp->mem_free_queue.head);
     llist_init(&interp->asyncio_tasks_head);
     interp->asyncio_tasks_lock = (PyMutex){0};
-    interp->audit_hooks_mutex = (PyMutex){0};
     for (int i = 0; i < _PY_MONITORING_UNGROUPED_EVENTS; i++) {
         interp->monitors.tools[i] = 0;
     }
 
@@ -236,7 +236,7 @@ should_audit(PyInterpreterState *interp)
         return 0;
     }
     return (interp->runtime->audit_hooks.head
-            || FT_ATOMIC_LOAD_PTR_ACQUIRE(interp->audit_hooks)
+            || interp->audit_hooks
             || PyDTrace_AUDIT_ENABLED());
 }
 
@@ -306,14 +306,13 @@ sys_audit_tstate(PyThreadState *ts, const char *event,
     }
 
     /* Call interpreter hooks */
-    PyObject *audit_hooks = FT_ATOMIC_LOAD_PTR_ACQUIRE(is->audit_hooks);
-    if (audit_hooks) {
+    if (is->audit_hooks) {
         eventName = PyUnicode_FromString(event);
         if (!eventName) {
             goto exit;
         }
 
-        hooks = PyObject_GetIter(audit_hooks);
+        hooks = PyObject_GetIter(is->audit_hooks);
         if (!hooks) {
             goto exit;
         }
@@ -537,29 +536,20 @@ sys_addaudithook_impl(PyObject *module, PyObject *hook)
     }
 
     PyInterpreterState *interp = tstate->interp;
-    PyMutex mutex = interp->audit_hooks_mutex;
-    PyMutex_Lock(&mutex);
-
     if (interp->audit_hooks == NULL) {
-        PyObject *new_list = PyList_New(0);
-        if (new_list == NULL) {
-            goto error;
+        interp->audit_hooks = PyList_New(0);
+        if (interp->audit_hooks == NULL) {
+            return NULL;
         }
         /* Avoid having our list of hooks show up in the GC module */
-        PyObject_GC_UnTrack(new_list);
-        FT_ATOMIC_STORE_PTR_RELEASE(interp->audit_hooks, new_list);
+        PyObject_GC_UnTrack(interp->audit_hooks);
     }
 
     if (PyList_Append(interp->audit_hooks, hook) < 0) {
-        goto error;
+        return NULL;
     }
 
-    PyMutex_Unlock(&mutex);
     Py_RETURN_NONE;
-
-error:
-    PyMutex_Unlock(&mutex);
-    return NULL;
 }
 
 /*[clinic input]
Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,6 @@ init_interpreter(PyInterpreterState *interp,`
`578`	`578`	`llist_init(&interp->mem_free_queue.head);`
`579`	`579`	`llist_init(&interp->asyncio_tasks_head);`
`580`	`580`	`interp->asyncio_tasks_lock = (PyMutex){0};`
`581`		`- interp->audit_hooks_mutex = (PyMutex){0};`
`582`	`581`	`for (int i = 0; i < _PY_MONITORING_UNGROUPED_EVENTS; i++) {`
`583`	`582`	`interp->monitors.tools[i] = 0;`
`584`	`583`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ should_audit(PyInterpreterState *interp)`
`236`	`236`	`return 0;`
`237`	`237`	`}`
`238`	`238`	`return (interp->runtime->audit_hooks.head`
`239`		`- \|\| FT_ATOMIC_LOAD_PTR_ACQUIRE(interp->audit_hooks)`
	`239`	`+ \|\| interp->audit_hooks`
`240`	`240`	`\|\| PyDTrace_AUDIT_ENABLED());`
`241`	`241`	`}`
`242`	`242`
`@@ -306,14 +306,13 @@ sys_audit_tstate(PyThreadState ts, const char event,`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`/* Call interpreter hooks */`
`309`		`- PyObject *audit_hooks = FT_ATOMIC_LOAD_PTR_ACQUIRE(is->audit_hooks);`
`310`		`- if (audit_hooks) {`
	`309`	`+ if (is->audit_hooks) {`
`311`	`310`	`eventName = PyUnicode_FromString(event);`
`312`	`311`	`if (!eventName) {`
`313`	`312`	`goto exit;`
`314`	`313`	`}`
`315`	`314`
`316`		`- hooks = PyObject_GetIter(audit_hooks);`
	`315`	`+ hooks = PyObject_GetIter(is->audit_hooks);`
`317`	`316`	`if (!hooks) {`
`318`	`317`	`goto exit;`
`319`	`318`	`}`
`@@ -537,29 +536,20 @@ sys_addaudithook_impl(PyObject module, PyObject hook)`
`537`	`536`	`}`
`538`	`537`
`539`	`538`	`PyInterpreterState *interp = tstate->interp;`
`540`		`- PyMutex mutex = interp->audit_hooks_mutex;`
`541`		`- PyMutex_Lock(&mutex);`
`542`		`-`
`543`	`539`	`if (interp->audit_hooks == NULL) {`
`544`		`- PyObject *new_list = PyList_New(0);`
`545`		`- if (new_list == NULL) {`
`546`		`- goto error;`
	`540`	`+ interp->audit_hooks = PyList_New(0);`
	`541`	`+ if (interp->audit_hooks == NULL) {`
	`542`	`+ return NULL;`
`547`	`543`	`}`
`548`	`544`	`/* Avoid having our list of hooks show up in the GC module */`
`549`		`- PyObject_GC_UnTrack(new_list);`
`550`		`- FT_ATOMIC_STORE_PTR_RELEASE(interp->audit_hooks, new_list);`
	`545`	`+ PyObject_GC_UnTrack(interp->audit_hooks);`
`551`	`546`	`}`
`552`	`547`
`553`	`548`	`if (PyList_Append(interp->audit_hooks, hook) < 0) {`
`554`		`- goto error;`
	`549`	`+ return NULL;`
`555`	`550`	`}`
`556`	`551`
`557`		`- PyMutex_Unlock(&mutex);`
`558`	`552`	`Py_RETURN_NONE;`
`559`		`-`
`560`		`-error:`
`561`		`- PyMutex_Unlock(&mutex);`
`562`		`- return NULL;`
`563`	`553`	`}`
`564`	`554`
`565`	`555`	`/*[clinic input]`