Changeset 94191 in webkit for trunk/Source/JavaScriptCore/wtf/ThreadingPthreads.cpp

Timestamp:

Aug 31, 2011, 8:10:10 AM (14 years ago)

Author:

[email protected]

Message:

Investigate current uses of OS(ANDROID)
​https://bugs.webkit.org/show_bug.cgi?id=66761

Reviewed by Darin Adler.

Remove the last legacy Android code.

No new tests needed as the code wasn't tested in the first place.

Source/JavaScriptCore:

• wtf/Atomics.h:
• wtf/Platform.h:
• wtf/ThreadingPthreads.cpp:

(WTF::createThreadInternal):

Source/WebCore:

• bridge/jni/JNIUtility.cpp:

(JSC::Bindings::getJNIEnv):

File:

• trunk/Source/JavaScriptCore/wtf/ThreadingPthreads.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/wtf/ThreadingPthreads.cpp

@@ -51 +51 @@
 #endif
 
-#if OS(ANDROID)
-#include "JNIUtility.h"
-#include "ThreadFunctionInvocation.h"
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-#endif
-
 #if OS(MAC_OS_X) && !defined(BUILDING_ON_LEOPARD)
 #include <objc/objc-auto.h>
@@ -154 +147 @@
 }
 
-#if OS(ANDROID)
-static void* runThreadWithRegistration(void* arg)
-{
-    OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(arg));
-    JavaVM* vm = JSC::Bindings::getJavaVM();
-    JNIEnv* env;
-    void* ret = 0;
-    if (vm->AttachCurrentThread(&env, 0) == JNI_OK) {
-        ret = invocation->function(invocation->data);
-        vm->DetachCurrentThread();
-    }
-    return ret;
-}
-
-ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*)
-{
-    pthread_t threadHandle;
-
-    // On the Android platform, threads must be registered with the VM before they run.
-    OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(new ThreadFunctionInvocation(entryPoint, data));
-
-    if (pthread_create(&threadHandle, 0, runThreadWithRegistration, invocation.get())) {
-        LOG_ERROR("Failed to create pthread at entry point %p with data %p", entryPoint, data);
-        return 0;
-    }
-
-    // The thread will take ownership of invocation.
-    invocation.leakPtr();
-
-    return establishIdentifierForPthreadHandle(threadHandle);
-}
-#else
 ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*)
 {
@@ -196 +157 @@
     return establishIdentifierForPthreadHandle(threadHandle);
 }
-#endif
 
 void initializeCurrentThreadInternal(const char* threadName)