fix instrumentation

Author: kumaraditya303

Python/instrumentation.c

@@ -827,7 +827,7 @@ instrument_per_instruction(PyCodeObject *code, _Py_CODEUNIT *bytecode,
 static void
 remove_tools(PyCodeObject * code, int offset, int event, int tools)
 {
-    ASSERT_WORLD_STOPPED_OR_LOCKED(code);
+    ASSERT_WORLD_STOPPED();
     assert(event != PY_MONITORING_EVENT_LINE);
     assert(event != PY_MONITORING_EVENT_INSTRUCTION);
     assert(PY_MONITORING_IS_INSTRUMENTED_EVENT(event));
@@ -863,7 +863,7 @@ tools_is_subset_for_event(PyCodeObject * code, int event, int tools)
 static void
 remove_line_tools(PyCodeObject * code, int offset, int tools)
 {
-    ASSERT_WORLD_STOPPED_OR_LOCKED(code);
+    ASSERT_WORLD_STOPPED();
 
     _PyCoMonitoringData *monitoring = code->_co_monitoring;
     assert(monitoring);
@@ -888,7 +888,7 @@ remove_line_tools(PyCodeObject * code, int offset, int tools)
 static void
 add_tools(PyCodeObject * code, int offset, int event, int tools)
 {
-    ASSERT_WORLD_STOPPED_OR_LOCKED(code);
+    ASSERT_WORLD_STOPPED();
     assert(event != PY_MONITORING_EVENT_LINE);
     assert(event != PY_MONITORING_EVENT_INSTRUCTION);
     assert(PY_MONITORING_IS_INSTRUMENTED_EVENT(event));
@@ -909,7 +909,7 @@ add_tools(PyCodeObject * code, int offset, int event, int tools)
 static void
 add_line_tools(PyCodeObject * code, int offset, int tools)
 {
-    ASSERT_WORLD_STOPPED_OR_LOCKED(code);
+    ASSERT_WORLD_STOPPED();
 
     assert(tools_is_subset_for_event(code, PY_MONITORING_EVENT_LINE, tools));
     assert(code->_co_monitoring);
@@ -927,7 +927,7 @@ add_line_tools(PyCodeObject * code, int offset, int tools)
 static void
 add_per_instruction_tools(PyCodeObject * code, int offset, int tools)
 {
-    ASSERT_WORLD_STOPPED_OR_LOCKED(code);
+    ASSERT_WORLD_STOPPED();
 
     assert(tools_is_subset_for_event(code, PY_MONITORING_EVENT_INSTRUCTION, tools));
     assert(code->_co_monitoring);
@@ -1190,9 +1190,9 @@ call_instrumentation_vector(
                 break;
             }
             else {
-                LOCK_CODE(code);
+                _PyEval_StopTheWorld(tstate->interp);
                 remove_tools(code, offset, event, 1 << tool);
-                UNLOCK_CODE();
+                _PyEval_StartTheWorld(tstate->interp);
             }
         }
     }
@@ -1773,7 +1773,7 @@ update_instrumentation_data(PyCodeObject *code, PyInterpreterState *interp)
 static int
 force_instrument_lock_held(PyCodeObject *code, PyInterpreterState *interp)
 {
-    ASSERT_WORLD_STOPPED_OR_LOCKED(code);
+    ASSERT_WORLD_STOPPED();
 
 #ifdef _Py_TIER2
     if (code->co_executors != NULL) {
@@ -1904,7 +1904,7 @@ force_instrument_lock_held(PyCodeObject *code, PyInterpreterState *interp)
 static int
 instrument_lock_held(PyCodeObject *code, PyInterpreterState *interp)
 {
-    ASSERT_WORLD_STOPPED_OR_LOCKED(code);
+    ASSERT_WORLD_STOPPED();
 
     if (is_version_up_to_date(code, interp)) {
         assert(
@@ -1921,9 +1921,9 @@ int
 _Py_Instrument(PyCodeObject *code, PyInterpreterState *interp)
 {
     int res;
-    LOCK_CODE(code);
+    _PyEval_StopTheWorld(interp);
     res = instrument_lock_held(code, interp);
-    UNLOCK_CODE();
+    _PyEval_StartTheWorld(interp);
     return res;
 }