Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 06:01:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-136870: fix data races in instrumentation of bytecode (#136994)

Browse source 
De-instrumenting code objects modifies the thread local bytecode for all threads as such, holding the critical section on the code object is not sufficient and leads to data races. Now, the de-instrumentation is now performed under a stop the world pause as such no thread races with executing the thread local bytecode while it is being de-instrumented.
This commit is contained in:
Kumar Aditya 2025-07-24 23:28:46 +05:30 • committed by GitHub
parent 245671555b
commit 9a6b60af40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Python/instrumentation.c
View file

@ -1190,9 +1190,10 @@ call_instrumentation_vector(
break;
}
else {
LOCK_CODE(code);
PyInterpreterState *interp = tstate->interp;
_PyEval_StopTheWorld(interp);
remove_tools(code, offset, event, 1 << tool);
UNLOCK_CODE();
_PyEval_StartTheWorld(interp);
}
}
}
@ -1381,9 +1382,10 @@ _Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame,
}
else {
/* DISABLE */
LOCK_CODE(code);
PyInterpreterState *interp = tstate->interp;
_PyEval_StopTheWorld(interp);
remove_line_tools(code, i, 1 << tool);
UNLOCK_CODE();
_PyEval_StartTheWorld(interp);
}
} while (tools);
Py_DECREF(line_obj);
@ -1438,9 +1440,10 @@ _Py_call_instrumentation_instruction(PyThreadState *tstate, _PyInterpreterFrame*
}
else {
/* DISABLE */
LOCK_CODE(code);
PyInterpreterState *interp = tstate->interp;
_PyEval_StopTheWorld(interp);
remove_per_instruction_tools(code, offset, 1 << tool);
UNLOCK_CODE();
_PyEval_StartTheWorld(interp);
}
}
Py_DECREF(offset_obj);
@ -2995,9 +2998,10 @@ branch_handler_vectorcall(
// Orphaned NOT_TAKEN -- Jump removed by the compiler
return res;
}
LOCK_CODE(code);
PyInterpreterState *interp = _PyInterpreterState_GET();
_PyEval_StopTheWorld(interp);
remove_tools(code, offset, other_event, 1 << self->tool_id);
UNLOCK_CODE();
_PyEval_StartTheWorld(interp);
}
return res;
}