JavaScriptCore-721.26.tar.gz

[apple/javascriptcore.git] / wtf / MainThread.h

diff --git a/wtf/MainThread.h b/wtf/MainThread.h
index 953b9867c7c38b79c4ab7bf95c6db161bfd881fd..157e2cc794c19ab7be00145c2870712ea6b2a348 100644 (file)
--- a/wtf/MainThread.h
+++ b/wtf/MainThread.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2010 Apple Inc. All rights reserved.

  * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
  *
  * Redistribution and use in source and binary forms, with or without


@@ -30,28 +30,43 @@
 #ifndef MainThread_h
 #define MainThread_h
 
 #ifndef MainThread_h
 #define MainThread_h
 

-namespace WTF {
+#include <stdint.h>

 
 

-class Mutex;
+namespace WTF {

 
 

+typedef uint32_t ThreadIdentifier;

 typedef void MainThreadFunction(void*);
 
 typedef void MainThreadFunction(void*);
 

+// Must be called from the main thread.
+void initializeMainThread();
+

 void callOnMainThread(MainThreadFunction*, void* context);
 void callOnMainThreadAndWait(MainThreadFunction*, void* context);
 void callOnMainThread(MainThreadFunction*, void* context);
 void callOnMainThreadAndWait(MainThreadFunction*, void* context);

+void cancelCallOnMainThread(MainThreadFunction*, void* context);

 
 void setMainThreadCallbacksPaused(bool paused);
 
 
 void setMainThreadCallbacksPaused(bool paused);
 

-// Must be called from the main thread (Darwin is an exception to this rule).
-void initializeMainThread();
+bool isMainThread();
+bool isWebThread();

 
 

-// These functions are internal to the callOnMainThread implementation.
-void dispatchFunctionsFromMainThread();
+// NOTE: these functions are internal to the callOnMainThread implementation.
+void initializeMainThreadPlatform();

 void scheduleDispatchFunctionsOnMainThread();
 void scheduleDispatchFunctionsOnMainThread();

-Mutex& mainThreadFunctionQueueMutex();
+void dispatchFunctionsFromMainThread();
+
+#if PLATFORM(MAC)
+// This version of initializeMainThread sets up the main thread as corresponding
+// to the process's main thread, and not necessarily the thread that calls this
+// function. It should only be used as a legacy aid for Mac WebKit.
+void initializeMainThreadToProcessMainThread();
+void initializeMainThreadToProcessMainThreadPlatform();
+#endif

 
 } // namespace WTF
 
 using WTF::callOnMainThread;
 
 } // namespace WTF
 
 using WTF::callOnMainThread;

+using WTF::callOnMainThreadAndWait;
+using WTF::cancelCallOnMainThread;

 using WTF::setMainThreadCallbacksPaused;
 using WTF::setMainThreadCallbacksPaused;

-
+using WTF::isMainThread;

 #endif // MainThread_h
 #endif // MainThread_h