Move tool version to code monitoring and force an instrument

Author: gaogaotiantian

Include/cpython/code.h

@@ -20,7 +20,6 @@ extern "C" {
 /* Tables of which tools are active for each monitored event. */
 typedef struct _Py_LocalMonitors {
     uint8_t tools[_PY_MONITORING_LOCAL_EVENTS];
-    uintptr_t tool_versions[_PY_MONITORING_TOOL_IDS];
 } _Py_LocalMonitors;
 
 typedef struct _Py_GlobalMonitors {
@@ -60,6 +59,8 @@ typedef struct {
     _Py_LocalMonitors active_monitors;
     /* The tools that are to be notified for events for the matching code unit */
     uint8_t *tools;
+    /* The version of tools when they instrument the code */
+    uintptr_t tool_versions[_PY_MONITORING_TOOL_IDS];
     /* Information to support line events */
     _PyCoLineInstrumentationData *lines;
     /* The tools that are to be notified for line events for the matching code unit */

Python/instrumentation.c

@@ -1663,12 +1663,13 @@ update_instrumentation_data(PyCodeObject *code, PyInterpreterState *interp)
     // If the local monitors are out of date, clear them up
     _Py_LocalMonitors *local_monitors = &code->_co_monitoring->local_monitors;
     for (int i = 0; i < PY_MONITORING_TOOL_IDS; i++) {
-        if (local_monitors->tool_versions[i] != interp->monitoring_tool_versions[i]) {
+        if (code->_co_monitoring->tool_versions[i] != interp->monitoring_tool_versions[i]) {
             for (int j = 0; j < _PY_MONITORING_LOCAL_EVENTS; j++) {
                 local_monitors->tools[j] &= ~(1 << i);
             }
         }
     }
+
     _Py_LocalMonitors all_events = local_union(
         interp->monitors,
         code->_co_monitoring->local_monitors);
@@ -2013,14 +2014,15 @@ _PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEvent
         goto done;
     }
 
+    code->_co_monitoring->tool_versions[tool_id] = interp->monitoring_tool_versions[tool_id];
+
     _Py_LocalMonitors *local = &code->_co_monitoring->local_monitors;
     uint32_t existing_events = get_local_events(local, tool_id);
     if (existing_events == events) {
         res = 0;
         goto done;
     }
     set_local_events(local, tool_id, events);
-    local->tool_versions[tool_id] = interp->monitoring_tool_versions[tool_id];
 
     res = force_instrument_lock_held(code, interp);
 
@@ -2071,8 +2073,9 @@ int _PyMonitoring_ClearToolId(int tool_id)
     }
     interp->monitoring_tool_versions[tool_id] = version;
     set_global_version(_PyThreadState_GET(), version);
+    int res = instrument_all_executing_code_objects(interp);
     _PyEval_StartTheWorld(interp);
-    return 0;
+    return res;
 }
 
 /*[clinic input]