gh-124872: Move PyThreadState to first argument for consistency

rhansen · rhansen · commit d3b889f2f23e · 2024-10-01T19:19:06.000-04:00
diff --git a/Python/context.c b/Python/context.c
@@ -112,7 +112,8 @@ context_event_name(PyContextEvent event) {
     Py_UNREACHABLE();
 }
 
-static void notify_context_watchers(PyContextEvent event, PyContext *ctx, PyThreadState *ts)
+static void
+notify_context_watchers(PyThreadState *ts, PyContextEvent event, PyContext *ctx)
 {
     assert(Py_REFCNT(ctx) > 0);
     PyInterpreterState *interp = ts->interp;
@@ -192,7 +193,7 @@ _PyContext_Enter(PyThreadState *ts, PyObject *octx)
     ts->context = Py_NewRef(ctx);
     ts->context_ver++;
 
-    notify_context_watchers(Py_CONTEXT_EVENT_ENTER, ctx, ts);
+    notify_context_watchers(ts, Py_CONTEXT_EVENT_ENTER, ctx);
     return 0;
 }
 
@@ -226,7 +227,7 @@ _PyContext_Exit(PyThreadState *ts, PyObject *octx)
         return -1;
     }
 
-    notify_context_watchers(Py_CONTEXT_EVENT_EXIT, ctx, ts);
+    notify_context_watchers(ts, Py_CONTEXT_EVENT_EXIT, ctx);
     Py_SETREF(ts->context, (PyObject *)ctx->ctx_prev);
     ts->context_ver++;
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,8 @@ context_event_name(PyContextEvent event) {`
`112`	`112`	`Py_UNREACHABLE();`
`113`	`113`	`}`
`114`	`114`
`115`		`-static void notify_context_watchers(PyContextEvent event, PyContext ctx, PyThreadState ts)`
	`115`	`+static void`
	`116`	`+notify_context_watchers(PyThreadState ts, PyContextEvent event, PyContext ctx)`
`116`	`117`	`{`
`117`	`118`	`assert(Py_REFCNT(ctx) > 0);`
`118`	`119`	`PyInterpreterState *interp = ts->interp;`
`@@ -192,7 +193,7 @@ _PyContext_Enter(PyThreadState ts, PyObject octx)`
`192`	`193`	`ts->context = Py_NewRef(ctx);`
`193`	`194`	`ts->context_ver++;`
`194`	`195`
`195`		`- notify_context_watchers(Py_CONTEXT_EVENT_ENTER, ctx, ts);`
	`196`	`+ notify_context_watchers(ts, Py_CONTEXT_EVENT_ENTER, ctx);`
`196`	`197`	`return 0;`
`197`	`198`	`}`
`198`	`199`
`@@ -226,7 +227,7 @@ _PyContext_Exit(PyThreadState ts, PyObject octx)`
`226`	`227`	`return -1;`
`227`	`228`	`}`
`228`	`229`
`229`		`- notify_context_watchers(Py_CONTEXT_EVENT_EXIT, ctx, ts);`
	`230`	`+ notify_context_watchers(ts, Py_CONTEXT_EVENT_EXIT, ctx);`
`230`	`231`	`Py_SETREF(ts->context, (PyObject *)ctx->ctx_prev);`
`231`	`232`	`ts->context_ver++;`
`232`	`233`