Fix formatting

python · mpage · Nov 4, 2024 · Aug 15, 2024 · Aug 27, 2024 · Aug 20, 2024
commit a18396fa60ea54b04e3a375c951fa27e0288f31a
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
@@ -639,7 +639,8 @@ typedef enum {
     _PY_TLBC_UNLIMITED = 0,
 
     // The total amount of memory consumed by thread-local bytecode must be
-    // <= PyInterpreterState::tlbc_limit. State transitions to _PY_TLBC_DISABLED
+    // <= PyInterpreterState::tlbc_limit. State transitions to
+    // _PY_TLBC_DISABLED
     // when the limit is reached.
     _PY_TLBC_LIMITED = 1,
 

diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h
@@ -86,7 +86,9 @@ static inline PyCodeObject *_PyFrame_GetCode(_PyInterpreterFrame *f) {
     return (PyCodeObject *)f->f_executable;
 }
 
-static inline _Py_CODEUNIT *_PyFrame_GetBytecode(_PyInterpreterFrame *f) {
+static inline _Py_CODEUNIT *
+_PyFrame_GetBytecode(_PyInterpreterFrame *f)
+{
 #ifdef Py_GIL_DISABLED
     return f->bytecode;
 #else
@@ -228,7 +230,8 @@ _PyFrame_IsIncomplete(_PyInterpreterFrame *frame)
         return true;
     }
     return frame->owner != FRAME_OWNED_BY_GENERATOR &&
-        frame->instr_ptr < _PyFrame_GetBytecode(frame) + _PyFrame_GetCode(frame)->_co_firsttraceable;
+           frame->instr_ptr < _PyFrame_GetBytecode(frame) +
+                                  _PyFrame_GetCode(frame)->_co_firsttraceable;
 }
 
 static inline _PyInterpreterFrame *

@@ -225,7 +225,8 @@ struct _is {
     struct _Py_type_id_pool type_ids;
     PyMutex weakref_locks[NUM_WEAKREF_LIST_LOCKS];
     _PyIndexPool tlbc_indices;
-    // Number of bytes available for thread-local bytecode, counts down to zero.
+    // Number of bytes available for thread-local bytecode, counts down to
+    // zero.
     Py_ssize_t tlbc_avail;
     PyMutex tlbc_avail_mutex;
     _Py_TLBC_State tlbc_state;

diff --git a/Modules/_opcode.c b/Modules/_opcode.c
@@ -417,7 +417,6 @@ opcode_functions[] =  {
     {NULL, NULL, 0, NULL}
 };
 
-
 static int
 _opcode_exec(PyObject *m) {
 #define ADD(X)                                         \

diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
@@ -1969,13 +1969,14 @@ static PyCodeObject *
 get_code(PyObject *obj)
 {
     if (PyCode_Check(obj)) {
-        return (PyCodeObject *) obj;
+        return (PyCodeObject *)obj;
     }
     else if (PyFunction_Check(obj)) {
-        return (PyCodeObject *) PyFunction_GetCode(obj);
+        return (PyCodeObject *)PyFunction_GetCode(obj);
     }
-    return (PyCodeObject *) PyErr_Format(PyExc_TypeError,
-        "expected function or code object, got %s", Py_TYPE(obj)->tp_name);
+    return (PyCodeObject *)PyErr_Format(
+        PyExc_TypeError, "expected function or code object, got %s",
+        Py_TYPE(obj)->tp_name);
 }
 
 static PyObject *
@@ -1989,7 +1990,7 @@ get_tlbc(PyObject *Py_UNUSED(module), PyObject *obj)
     if (bc == NULL) {
         Py_RETURN_NONE;
     }
-    return PyBytes_FromStringAndSize((const char *) bc, _PyCode_NBYTES(code));
+    return PyBytes_FromStringAndSize((const char *)bc, _PyCode_NBYTES(code));
 }
 
 static PyObject *
@@ -2090,7 +2091,6 @@ identify_type_slot_wrappers(PyObject *self, PyObject *Py_UNUSED(ignored))
     return _PyType_GetSlotWrapperNames();
 }
 
-
 static PyMethodDef module_functions[] = {
     {"get_configs", get_configs, METH_NOARGS},
     {"get_recursion_depth", get_recursion_depth, METH_NOARGS},

@@ -2699,14 +2699,15 @@ _PyCode_Fini(PyInterpreterState *interp)
 // The total amount of memory consumed by thread-local bytecode can be limited
 // at runtime by setting either `-X tlbc_limit` or `PYTHON_TLBC_LIMIT`. When
 // the limit is reached, no new copies of thread-local bytecode can be created
-// and specialization is disabled for the "main" copy of the bytecode (the bytecode
-// at index 0 of the `co_tlbc` array). Threads can continue to specialize
-// existing thread-local copies of the bytecode (other than the "main" copy).
-// All other execution will use the unspecialized, "main" copy of the bytecode.
+// and specialization is disabled for the "main" copy of the bytecode (the
+// bytecode at index 0 of the `co_tlbc` array). Threads can continue to
+// specialize existing thread-local copies of the bytecode (other than the
+// "main" copy). All other execution will use the unspecialized, "main" copy of
+// the bytecode.
 //
-// Concurrent modifications to the bytecode made by the specializing interpreter
-// and instrumentation use atomics, with specialization taking care not to
-// overwrite an instruction that was instrumented concurrently.
+// Concurrent modifications to the bytecode made by the specializing
+// interpreter and instrumentation use atomics, with specialization taking care
+// not to overwrite an instruction that was instrumented concurrently.
 
 void
 _PyCode_InitState(PyInterpreterState *interp)
@@ -2735,14 +2736,15 @@ _Py_ReserveTLBCIndex(PyInterpreterState *interp)
 void
 _Py_ClearTLBCIndex(_PyThreadStateImpl *tstate)
 {
-    PyInterpreterState *interp = ((PyThreadState*) tstate)->interp;
+    PyInterpreterState *interp = ((PyThreadState *)tstate)->interp;
     _PyIndexPool_FreeIndex(&interp->tlbc_indices, tstate->tlbc_index);
 }
 
 static _PyCodeArray *
 _PyCodeArray_New(Py_ssize_t size)
 {
-    _PyCodeArray *arr = PyMem_Calloc(1, sizeof(_PyCodeArray) + sizeof(void*) * size);
+    _PyCodeArray *arr =
+        PyMem_Calloc(1, sizeof(_PyCodeArray) + sizeof(void *) * size);
     if (arr == NULL) {
         PyErr_NoMemory();
         return NULL;
@@ -2787,7 +2789,7 @@ create_tlbc_lock_held(PyCodeObject *co, Py_ssize_t idx)
         if (new_tlbc == NULL) {
             return NULL;
         }
-        memcpy(new_tlbc->entries, tlbc->entries, tlbc->size * sizeof(void*));
+        memcpy(new_tlbc->entries, tlbc->entries, tlbc->size * sizeof(void *));
         _Py_atomic_store_ptr_release(&co->co_tlbc, new_tlbc);
         _PyMem_FreeDelayed(tlbc);
         tlbc = new_tlbc;
@@ -2811,27 +2813,27 @@ reserve_bytes_for_tlbc(PyCodeObject *co)
     PyMutex_LockFlags(&interp->tlbc_avail_mutex, _Py_LOCK_DONT_DETACH);
     Py_ssize_t nbytes_reserved;
     switch (interp->tlbc_state) {
-    case _PY_TLBC_UNLIMITED: {
-        nbytes_reserved = code_size;
-        break;
-    }
-    case _PY_TLBC_LIMITED: {
-        if (interp->tlbc_avail >= code_size) {
+        case _PY_TLBC_UNLIMITED: {
             nbytes_reserved = code_size;
-            interp->tlbc_avail -= code_size;
+            break;
         }
-        else {
+        case _PY_TLBC_LIMITED: {
+            if (interp->tlbc_avail >= code_size) {
+                nbytes_reserved = code_size;
+                interp->tlbc_avail -= code_size;
+            }
+            else {
+                nbytes_reserved = -1;
+            }
+            break;
+        }
+        case _PY_TLBC_DISABLED: {
             nbytes_reserved = -1;
+            break;
+        }
+        default: {
+            Py_UNREACHABLE();
         }
-        break;
-    }
-    case _PY_TLBC_DISABLED: {
-        nbytes_reserved = -1;
-        break;
-    }
-    default: {
-        Py_UNREACHABLE();
-    }
     }
     PyMutex_Unlock(&interp->tlbc_avail_mutex);
     return nbytes_reserved;
@@ -2853,12 +2855,12 @@ release_bytes_for_tlbc(Py_ssize_t nbytes)
 }
 
 static int
-disable_specialization(PyObject *obj, void*)
+disable_specialization(PyObject *obj, void *)
 {
     if (!PyCode_Check(obj)) {
         return 1;
     }
-    PyCodeObject *co = (PyCodeObject *) obj;
+    PyCodeObject *co = (PyCodeObject *)obj;
     _PyCode_DisableSpecialization(_PyCode_CODE(co), Py_SIZE(co));
     return 1;
 }
@@ -2881,7 +2883,9 @@ disable_new_tlbc(void)
     interp->tlbc_state = _PY_TLBC_DISABLED;
     _PyEval_StartTheWorld(interp);
     PyUnstable_GC_VisitObjects(disable_specialization, NULL);
-    if (PyErr_WarnEx(PyExc_ResourceWarning, "Reached memory limit for thread-local bytecode", 1) < 0) {
+    if (PyErr_WarnEx(PyExc_ResourceWarning,
+                     "Reached memory limit for thread-local bytecode",
+                     1) < 0) {
         PyErr_WriteUnraisable(NULL);
     }
 }
@@ -2890,10 +2894,10 @@ static _Py_CODEUNIT *
 get_tlbc_lock_held(PyCodeObject *co)
 {
     _PyCodeArray *tlbc = co->co_tlbc;
-    _PyThreadStateImpl *tstate = (_PyThreadStateImpl *) PyThreadState_GET();
+    _PyThreadStateImpl *tstate = (_PyThreadStateImpl *)PyThreadState_GET();
     Py_ssize_t idx = tstate->tlbc_index;
     if (idx < tlbc->size && tlbc->entries[idx] != NULL) {
-        return (_Py_CODEUNIT *) tlbc->entries[idx];
+        return (_Py_CODEUNIT *)tlbc->entries[idx];
     }
     Py_ssize_t reserved = reserve_bytes_for_tlbc(co);
     if (reserved == -1) {

@@ -1865,9 +1865,9 @@ frame_init_get_vars(_PyInterpreterFrame *frame)
     // here:
     PyCodeObject *co = _PyFrame_GetCode(frame);
     int lasti = _PyInterpreterFrame_LASTI(frame);
-    if (!(lasti < 0 && _PyFrame_GetBytecode(frame)->op.code == COPY_FREE_VARS
-          && PyFunction_Check(frame->f_funcobj)))
-    {
+    if (!(lasti < 0 &&
+          _PyFrame_GetBytecode(frame)->op.code == COPY_FREE_VARS &&
+          PyFunction_Check(frame->f_funcobj))) {
         /* Free vars are initialized */
         return;
     }

@@ -11547,8 +11547,8 @@ super_descr_get(PyObject *self, PyObject *obj, PyObject *type)
 }
 
 static int
-super_init_without_args(_PyInterpreterFrame *cframe,
-                        PyTypeObject **type_p, PyObject **obj_p)
+super_init_without_args(_PyInterpreterFrame *cframe, PyTypeObject **type_p,
+                        PyObject **obj_p)
 {
     PyCodeObject *co = _PyFrame_GetCode(cframe);
     if (co->co_argcount == 0) {

@@ -810,7 +810,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
          * we need to update instrumentation */
 #ifdef Py_GIL_DISABLED
         /* Load thread-local bytecode */
-        _Py_CODEUNIT *bytecode = _PyCode_GetExecutableCode(_PyFrame_GetCode(frame));
+        _Py_CODEUNIT *bytecode =
+            _PyCode_GetExecutableCode(_PyFrame_GetCode(frame));
         if (frame->bytecode != bytecode) {
             int off = frame->instr_ptr - frame->bytecode;
             frame->bytecode = bytecode;

@@ -315,9 +315,9 @@ GETITEM(PyObject *v, Py_ssize_t i) {
  * limit is reached and they all execute the main copy of the bytecode. This is
  * approximate, we do not need the RMW cycle to be atomic.
  */
-#define RECORD_BRANCH_TAKEN(bitset, flag)  \
-    FT_ATOMIC_STORE_UINT16_RELAXED(bitset,  \
-        (FT_ATOMIC_LOAD_UINT16_RELAXED(bitset) << 1) | (flag))
+#define RECORD_BRANCH_TAKEN(bitset, flag) \
+    FT_ATOMIC_STORE_UINT16_RELAXED(       \
+        bitset, (FT_ATOMIC_LOAD_UINT16_RELAXED(bitset) << 1) | (flag))
 #else
 #define RECORD_BRANCH_TAKEN(bitset, flag)
 #endif

diff --git a/Python/frame.c b/Python/frame.c
@@ -63,7 +63,8 @@ take_ownership(PyFrameObject *f, _PyInterpreterFrame *frame)
         // This may be a newly-created generator or coroutine frame. Since it's
         // dead anyways, just pretend that the first RESUME ran:
         PyCodeObject *code = _PyFrame_GetCode(frame);
-        frame->instr_ptr = _PyFrame_GetBytecode(frame) + code->_co_firsttraceable + 1;
+        frame->instr_ptr =
+            _PyFrame_GetBytecode(frame) + code->_co_firsttraceable + 1;
     }
     assert(!_PyFrame_IsIncomplete(frame));
     assert(f->f_back == NULL);

diff --git a/Python/index_pool.c b/Python/index_pool.c
@@ -45,13 +45,13 @@ parent(Py_ssize_t i)
 static inline Py_ssize_t
 left_child(Py_ssize_t i)
 {
-    return 2*i + 1;
+    return 2 * i + 1;
 }
 
 static inline Py_ssize_t
 right_child(Py_ssize_t i)
 {
-    return 2*i + 2;
+    return 2 * i + 2;
 }
 
 static void

diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -46,16 +46,16 @@
 
 #define UNLOCK_CODE()   Py_END_CRITICAL_SECTION()
 
-#define MODIFY_BYTECODE(code, func, args...)                       \
-    do {                                                           \
-        PyCodeObject *co = (code);                                 \
-        for (Py_ssize_t i = 0; i < code->co_tlbc->size; i++) {     \
-            char *bc = co->co_tlbc->entries[i];                    \
-            if (bc == NULL) {                                      \
-                continue;                                          \
-            }                                                      \
-            (func)((_Py_CODEUNIT *) bc, args);                     \
-        }                                                          \
+#define MODIFY_BYTECODE(code, func, args...)                   \
+    do {                                                       \
+        PyCodeObject *co = (code);                             \
+        for (Py_ssize_t i = 0; i < code->co_tlbc->size; i++) { \
+            char *bc = co->co_tlbc->entries[i];                \
+            if (bc == NULL) {                                  \
+                continue;                                      \
+            }                                                  \
+            (func)((_Py_CODEUNIT *)bc, args);                  \
+        }                                                      \
     } while (0)
 
 #else
@@ -599,7 +599,8 @@ _Py_CODEUNIT
 _Py_GetBaseCodeUnit(PyCodeObject *code, int i)
 {
     _Py_CODEUNIT *src_instr = _PyCode_CODE(code) + i;
-    _Py_CODEUNIT inst = {.cache = FT_ATOMIC_LOAD_UINT16_RELAXED(*(uint16_t *)src_instr)};
+    _Py_CODEUNIT inst = {
+        .cache = FT_ATOMIC_LOAD_UINT16_RELAXED(*(uint16_t *)src_instr)};
     int opcode = inst.op.code;
     if (opcode < MIN_INSTRUMENTED_OPCODE) {
         inst.op.code = _PyOpcode_Deopt[opcode];
@@ -635,7 +636,8 @@ _Py_GetBaseCodeUnit(PyCodeObject *code, int i)
 }
 
 static void
-de_instrument(_Py_CODEUNIT *bytecode, _PyCoMonitoringData *monitoring, int i, int event)
+de_instrument(_Py_CODEUNIT *bytecode, _PyCoMonitoringData *monitoring, int i,
+              int event)
 {
     assert(event != PY_MONITORING_EVENT_INSTRUCTION);
     assert(event != PY_MONITORING_EVENT_LINE);
@@ -665,7 +667,8 @@ de_instrument(_Py_CODEUNIT *bytecode, _PyCoMonitoringData *monitoring, int i, in
 }
 
 static void
-de_instrument_line(_Py_CODEUNIT *bytecode, _PyCoMonitoringData *monitoring, int i)
+de_instrument_line(_Py_CODEUNIT *bytecode, _PyCoMonitoringData *monitoring,
+                   int i)
 {
     _Py_CODEUNIT *instr = &bytecode[i];
     int opcode = instr->op.code;
@@ -713,7 +716,6 @@ de_instrument_per_instruction(_Py_CODEUNIT *bytecode,
     assert(instr->op.code != INSTRUMENTED_INSTRUCTION);
 }
 
-
 static void
 instrument(_Py_CODEUNIT *bytecode, _PyCoMonitoringData *monitoring, int i)
 {
@@ -738,8 +740,9 @@ instrument(_Py_CODEUNIT *bytecode, _PyCoMonitoringData *monitoring, int i)
         assert(instrumented);
         FT_ATOMIC_STORE_UINT8_RELAXED(*opcode_ptr, instrumented);
         if (_PyOpcode_Caches[deopt]) {
-            FT_ATOMIC_STORE_UINT16_RELAXED(instr[1].counter.as_counter,
-                                           adaptive_counter_warmup().as_counter);
+            FT_ATOMIC_STORE_UINT16_RELAXED(
+                instr[1].counter.as_counter,
+                adaptive_counter_warmup().as_counter);
         }
     }
 }