避免Opaque冲突

Author: chexiongsheng

include/CppObjectMapperQuickjs.h

@@ -28,7 +28,7 @@ struct CppObjectMapper
 {
     inline static CppObjectMapper* Get(JSContext* ctx)
     {
-        return reinterpret_cast<CppObjectMapper*>(JS_GetRuntimeOpaque(JS_GetRuntime(ctx)));
+        return reinterpret_cast<CppObjectMapper*>(JS_GetRuntimeOpaque1(JS_GetRuntime(ctx)));
     }
 
     void Initialize(JSContext* ctx_);
@@ -60,8 +60,7 @@ struct CppObjectMapper
 
     inline static eastl::weak_ptr<int> GetEnvLifeCycleTracker(JSContext* ctx)
     {
-        JSRuntime* rt = JS_GetRuntime(ctx);
-        CppObjectMapper* mapper = reinterpret_cast<CppObjectMapper*>(JS_GetRuntimeOpaque(rt));
+        CppObjectMapper* mapper = Get(ctx);
         return mapper->GetEnvLifeCycleTracker();
     }
 

include/PapiData.h

@@ -68,12 +68,12 @@ namespace qjsimpl
 
 static struct pesapi_scope__ *getCurrentScope(JSContext *ctx)
 {
-	return (struct pesapi_scope__ *) JS_GetContextOpaque(ctx);
+	return (struct pesapi_scope__ *) JS_GetContextOpaque1(ctx);
 }
 
 static void setCurrentScope(JSContext *ctx, struct pesapi_scope__ *scope)
 {
-	JS_SetContextOpaque(ctx, scope);
+	JS_SetContextOpaque1(ctx, scope);
 }
 
 struct caught_exception_info

quickjs/quickjs.c

@@ -302,6 +302,7 @@ struct JSRuntime {
     JSShape **shape_hash;
     bf_context_t bf_ctx;
     void *user_opaque;
+    void *user_opaque1;
     void *libc_opaque;
     JSRuntimeFinalizerState *finalizers;
 };
@@ -442,6 +443,7 @@ struct JSContext {
                              const char *input, size_t input_len,
                              const char *filename, int flags, int scope_idx);
     void *user_opaque;
+    void *user_opaque1;
 };
 
 typedef union JSFloat64Union {
@@ -55902,4 +55904,24 @@ int JS_ValueRefCount(JSContext *ctx, JSValue v)
     return -1;
 }
 
+void *JS_GetContextOpaque1(JSContext *ctx)
+{
+    return ctx->user_opaque1;
+}
+
+void JS_SetContextOpaque1(JSContext *ctx, void *opaque)
+{
+    ctx->user_opaque1 = opaque;
+}
+
+void *JS_GetRuntimeOpaque1(JSRuntime *rt)
+{
+    return rt->user_opaque1;
+}
+
+void JS_SetRuntimeOpaque1(JSRuntime *rt, void *opaque)
+{
+    rt->user_opaque1 = opaque;
+}
+
 /*-------end additional function---------*/

quickjs/quickjs.h

@@ -1051,6 +1051,12 @@ JS_BOOL JS_GetArrayBufferViewInfo(JSContext *ctx, JSValueConst obj,
 
 int JS_ValueRefCount(JSContext *ctx, JSValue v);
 
+// avoid conflict
+void *JS_GetContextOpaque1(JSContext *ctx);
+void JS_SetContextOpaque1(JSContext *ctx, void *opaque);
+void *JS_GetRuntimeOpaque1(JSRuntime *rt);
+void JS_SetRuntimeOpaque1(JSRuntime *rt, void *opaque);
+
 /*-------end additional function---------*/
 
 #ifdef __cplusplus

source/CppObjectMapperQuickjs.cpp

@@ -15,7 +15,7 @@ struct FuncFinalizeData
 
 void PApiFuncFinalizer(JSRuntime* rt, JSValue val)
 {
-    CppObjectMapper* mapper = reinterpret_cast<CppObjectMapper*>(JS_GetRuntimeOpaque(rt));
+    CppObjectMapper* mapper = reinterpret_cast<CppObjectMapper*>(JS_GetRuntimeOpaque1(rt));
     FuncFinalizeData* data = (FuncFinalizeData*)JS_GetOpaque(val, mapper->funcTracerClassId);
     if (data->finalize)
     {
@@ -68,7 +68,7 @@ JSValue CppObjectMapper::CreateError(JSContext* ctx, const char* message)
 
 void PApiObjectFinalizer(JSRuntime* rt, JSValue val)
 {
-    CppObjectMapper* mapper = reinterpret_cast<CppObjectMapper*>(JS_GetRuntimeOpaque(rt));
+    CppObjectMapper* mapper = reinterpret_cast<CppObjectMapper*>(JS_GetRuntimeOpaque1(rt));
     ObjectUserData* object_udata = (ObjectUserData*)JS_GetOpaque(val, mapper->classId);
 
     if (object_udata->callFinalize && object_udata->typeInfo->Finalize)
@@ -338,7 +338,7 @@ void CppObjectMapper::Initialize(JSContext* ctx_)
 {
     ctx = ctx_;
     rt = JS_GetRuntime(ctx);
-    JS_SetRuntimeOpaque(rt, this);
+    JS_SetRuntimeOpaque1(rt, this);
     //new (&CDataCache) eastl::unordered_map<const void*, FObjectCacheNode, eastl::hash<const void*>, 
     //        eastl::equal_to<const void*>, eastl::allocator_malloc>();
     //new (&TypeIdToFunctionMap) eastl::unordered_map<const void*, JSValue, eastl::hash<const void*>, 
@@ -441,7 +441,7 @@ void destroy_qjs_env(pesapi_env_ref env_ref)
     //auto scope = pesapi::qjsimpl::g_pesapi_ffi.open_scope(env_ref);
     JSContext* ctx = reinterpret_cast<JSContext*>(pesapi::qjsimpl::g_pesapi_ffi.get_env_from_ref(env_ref));
     JSRuntime* rt = JS_GetRuntime(ctx);
-    pesapi::qjsimpl::CppObjectMapper* mapper = reinterpret_cast<pesapi::qjsimpl::CppObjectMapper*>(JS_GetRuntimeOpaque(rt));
+    pesapi::qjsimpl::CppObjectMapper* mapper = pesapi::qjsimpl::CppObjectMapper::Get(ctx);
     //pesapi::qjsimpl::g_pesapi_ffi.close_scope(scope);
     pesapi::qjsimpl::g_pesapi_ffi.release_env_ref(env_ref);
     mapper->Cleanup();