Changeset 15241 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 8, 2006, 9:58:18 PM (19 years ago)

Author:

thatcher

Message:

Reviewed by Maciej.

Moved KJS_GetCreatedJavaVMs to jni_utility.cpp.
Switched KJS_GetCreatedJavaVMs over to use dlopen and dlsym
now that NSAddImage, NSLookupSymbolInImage and NSAddressOfSymbol
are deprecated in Leopard.

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bindings/jni/jni_utility.cpp: (KJS::Bindings::KJS_GetCreatedJavaVMs):
• bindings/softlinking.c: Removed.
• bindings/softlinking.h: Removed.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (7 diffs)
• bindings/jni/jni_utility.cpp (modified) (1 diff)
• bindings/softlinking.c (deleted)
• bindings/softlinking.h (deleted)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-07-08  Timothy Hatcher  <[email protected]>
+
+        Reviewed by Maciej.
+
+        Moved KJS_GetCreatedJavaVMs to jni_utility.cpp.
+        Switched KJS_GetCreatedJavaVMs over to use dlopen and dlsym
+        now that NSAddImage, NSLookupSymbolInImage and NSAddressOfSymbol
+        are deprecated in Leopard.
+
+        * JavaScriptCore.exp:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * bindings/jni/jni_utility.cpp:
+        (KJS::Bindings::KJS_GetCreatedJavaVMs):
+        * bindings/softlinking.c: Removed.
+        * bindings/softlinking.h: Removed.
+
 2006-07-08  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -71 +71 @@
 _JSValueToNumber
 _JSValueToObject
-_KJS_GetCreatedJavaVMs
 _KJS_JSCreateNativeJSObject
 _KJS_JSObject_JSFinalize

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -237 +237 @@
                 932F5BCE0822A1C700736975 /* WebScriptObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51863FC406542D3100E9E8DD /* WebScriptObject.mm */; };
                 932F5BCF0822A1C700736975 /* jni_objc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517EF37306D695930007C1BA /* jni_objc.mm */; };
-                932F5BD00822A1C700736975 /* softlinking.c in Sources */ = {isa = PBXBuildFile; fileRef = 8442A376074175C2000AE2ED /* softlinking.c */; };
                 932F5BD30822A1C700736975 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */; };
                 932F5BD40822A1C700736975 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6560A63D04B3B69F008AE952 /* CoreServices.framework */; };
@@ -258 +257 @@
                 93E26BFE08B151D400F85226 /* ucpinternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26BFC08B151D400F85226 /* ucpinternal.h */; };
                 93E26C1308B1523D00F85226 /* ucptable.c in Headers */ = {isa = PBXBuildFile; fileRef = 93E26C0D08B1520900F85226 /* ucptable.c */; };
-                93E26CCF08B2921900F85226 /* softlinking.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26CCE08B2921900F85226 /* softlinking.h */; };
                 93E26CF708B29A1C00F85226 /* pcre_get.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26CF608B29A1C00F85226 /* pcre_get.c */; };
                 93E26DDC08B2A4F400F85226 /* pcre_printint.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26DDB08B2A4F400F85226 /* pcre_printint.c */; };
@@ -475 +473 @@
                 70B16A260569A10900DB756D /* runtime_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_object.cpp; path = bindings/runtime_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
                 70B16A270569A10900DB756D /* runtime_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = runtime_object.h; path = bindings/runtime_object.h; sourceTree = "<group>"; tabWidth = 8; };
-                8442A376074175C2000AE2ED /* softlinking.c */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = softlinking.c; path = bindings/softlinking.c; sourceTree = "<group>"; tabWidth = 8; };
                 84ABF1DE070B628C00A3AC05 /* npruntime_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = npruntime_impl.h; path = bindings/npruntime_impl.h; sourceTree = "<group>"; tabWidth = 8; };
                 9303F567099118FA00AD71B8 /* OwnPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnPtr.h; sourceTree = "<group>"; };
@@ -511 +508 @@
                 93E26BFC08B151D400F85226 /* ucpinternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = ucpinternal.h; path = pcre/ucpinternal.h; sourceTree = "<group>"; tabWidth = 8; };
                 93E26C0D08B1520900F85226 /* ucptable.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; indentWidth = 4; name = ucptable.c; path = pcre/ucptable.c; sourceTree = "<group>"; tabWidth = 8; };
-                93E26CCE08B2921900F85226 /* softlinking.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = softlinking.h; path = bindings/softlinking.h; sourceTree = "<group>"; tabWidth = 8; };
                 93E26CF608B29A1C00F85226 /* pcre_get.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = pcre_get.c; path = pcre/pcre_get.c; sourceTree = "<group>"; tabWidth = 8; };
                 93E26DDB08B2A4F400F85226 /* pcre_printint.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; name = pcre_printint.c; path = pcre/pcre_printint.c; sourceTree = "<group>"; tabWidth = 8; };
@@ -774 +770 @@
                                 5114F47B05E4426200D1BBBD /* runtime_root.cpp */,
                                 5114F47C05E4426200D1BBBD /* runtime_root.h */,
-                                8442A376074175C2000AE2ED /* softlinking.c */,
-                                93E26CCE08B2921900F85226 /* softlinking.h */,
                                 51863F6F065420E800E9E8DD /* WebScriptObject.h */,
                                 51863FC406542D3100E9E8DD /* WebScriptObject.mm */,
@@ -1077 +1071 @@
                                 93E26BFE08B151D400F85226 /* ucpinternal.h in Headers */,
                                 93E26C1308B1523D00F85226 /* ucptable.c in Headers */,
-                                93E26CCF08B2921900F85226 /* softlinking.h in Headers */,
                                 652C107F08DA7B1E0020887D /* protected_reference.h in Headers */,
                                 65E217BD08E7EECC0023E5F6 /* Assertions.h in Headers */,
@@ -1390 +1383 @@
                                 932F5BCE0822A1C700736975 /* WebScriptObject.mm in Sources */,
                                 932F5BCF0822A1C700736975 /* jni_objc.mm in Sources */,
-                                932F5BD00822A1C700736975 /* softlinking.c in Sources */,
                                 65621E6D089E859700760F35 /* property_slot.cpp in Sources */,
                                 930754C108B0F68000AB3056 /* pcre_compile.c in Sources */,

trunk/JavaScriptCore/bindings/jni/jni_utility.cpp

@@ -32 +32 @@
 #include "runtime_array.h"
 #include "runtime_object.h"
-#include "softlinking.h"
+#include <dlfcn.h>
 
 namespace KJS {
 
 namespace Bindings {
+
+static jint KJS_GetCreatedJavaVMs(JavaVM** vmBuf, jsize bufLen, jsize* nVMs)
+{
+    static void* javaVMFramework = 0;
+    if (!javaVMFramework)
+        javaVMFramework = dlopen("/System/Library/Frameworks/JavaVM.framework/JavaVM", RTLD_LAZY);
+    if (!javaVMFramework)
+        return JNI_ERR;
+
+    static jint(*functionPointer)(JavaVM**, jsize, jsize *) = 0;
+    if (!functionPointer)
+        functionPointer = (jint(*)(JavaVM**, jsize, jsize *))dlsym(javaVMFramework, "JNI_GetCreatedJavaVMs");
+    if (!functionPointer)
+        return JNI_ERR;
+    return functionPointer(vmBuf, bufLen, nVMs);
+}
 
 static JavaVM *jvm = 0;