gh-117657: Fix some simple races in instrumentation.c (GH-120118)

Fidget-Spinner · web-flow · commit b1b61dc4cee4 · 2024-06-13T17:31:21.000+08:00
* stop the world when setting local events
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -1977,7 +1977,7 @@ _PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEvent
     }
 
     int res;
-    LOCK_CODE(code);
+    _PyEval_StopTheWorld(interp);
     if (allocate_instrumentation_data(code)) {
         res = -1;
         goto done;
@@ -1994,7 +1994,7 @@ _PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEvent
     res = force_instrument_lock_held(code, interp);
 
 done:
-    UNLOCK_CODE();
+    _PyEval_StartTheWorld(interp);
     return res;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1977,7 +1977,7 @@ _PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEvent`
`1977`	`1977`	`}`
`1978`	`1978`
`1979`	`1979`	`int res;`
`1980`		`- LOCK_CODE(code);`
	`1980`	`+ _PyEval_StopTheWorld(interp);`
`1981`	`1981`	`if (allocate_instrumentation_data(code)) {`
`1982`	`1982`	`res = -1;`
`1983`	`1983`	`goto done;`
`@@ -1994,7 +1994,7 @@ _PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEvent`
`1994`	`1994`	`res = force_instrument_lock_held(code, interp);`
`1995`	`1995`
`1996`	`1996`	`done:`
`1997`		`- UNLOCK_CODE();`
	`1997`	`+ _PyEval_StartTheWorld(interp);`
`1998`	`1998`	`return res;`
`1999`	`1999`	`}`
`2000`	`2000`