Move hpy_trace_get_ctx to hpy_jni.c

fangerer · fangerer · commit c3f4075efd64 · 2023-08-08T13:03:13.000+02:00
diff --git a/graalpython/com.oracle.graal.python.jni/src/hpy_jni.c b/graalpython/com.oracle.graal.python.jni/src/hpy_jni.c
@@ -97,6 +97,7 @@ CUSTOM_UPCALLS
 #undef UPCALL
 
 static jmethodID jniMethod_hpy_debug_get_context;
+static jmethodID jniMethod_hpy_trace_get_context;
 
 
 #define MAX_UNCLOSED_HANDLES 32
@@ -408,6 +409,12 @@ CUSTOM_UPCALLS
         return PTR_UP(NULL);
     }
 
+    jniMethod_hpy_trace_get_context = (*env)->GetMethodID(env, clazz, "getHPyTraceContext", "()" SIG_PTR);
+    if (jniMethod_hpy_trace_get_context == NULL) {
+        LOGS("ERROR: jni method getHPyTraceContext not found found !\n");
+        return PTR_UP(NULL);
+    }
+
     return PTR_UP(ctx);
 }
 
@@ -479,3 +486,13 @@ HPyContext * hpy_debug_get_ctx(HPyContext *uctx)
     }
     return dctx;
 }
+
+HPyContext * hpy_trace_get_ctx(HPyContext *uctx)
+{
+    HPyContext *tctx = (HPyContext *) DO_UPCALL_PTR_NOARGS(CONTEXT_INSTANCE(uctx), hpy_trace_get_context);
+    if (uctx == tctx) {
+        HPy_FatalError(uctx, "hpy_trace_get_ctx: expected an universal ctx, "
+                             "got a trace ctx");
+    }
+    return tctx;
+}
diff --git a/graalpython/com.oracle.graal.python.jni/src/trace/trace_ctx.c b/graalpython/com.oracle.graal.python.jni/src/trace/trace_ctx.c
@@ -42,18 +42,6 @@ int hpy_trace_ctx_free(HPyContext *tctx)
     return 0;
 }
 
-HPyContext * hpy_trace_get_ctx(HPyContext *uctx)
-{
-    HPyContext *tctx = &g_trace_ctx;
-    if (uctx == tctx) {
-        HPy_FatalError(uctx, "hpy_trace_get_ctx: expected an universal ctx, "
-                             "got a trace ctx");
-    }
-    if (hpy_trace_ctx_init(tctx, uctx) < 0)
-        return NULL;
-    return tctx;
-}
-
 void hpy_trace_set_ctx(HPyContext *tctx)
 {
     g_trace_ctx = *tctx;
