[llvm-branch-commits] [llvm-branch] r118529 - in /llvm/branches/Apple/whitney: include/llvm/System/Threading.h lib/System/Threading.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Nov  9 11:28:21 2010
New Revision: 118529

URL: http://llvm.org/viewvc/llvm-project?rev=118529&view=rev
Log:
Merge r118222:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Thu Nov 4 01:26:25 2010 +0000

    System: Add llvm_execute_on_thread, which does what it says.
     - Primarily useful for running some code with a specified stack size, when
       pthreads are available.

Modified:
    llvm/branches/Apple/whitney/include/llvm/System/Threading.h
    llvm/branches/Apple/whitney/lib/System/Threading.cpp

Modified: llvm/branches/Apple/whitney/include/llvm/System/Threading.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/include/llvm/System/Threading.h?rev=118529&r1=118528&r2=118529&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/include/llvm/System/Threading.h (original)
+++ llvm/branches/Apple/whitney/include/llvm/System/Threading.h Tue Nov  9 11:28:21 2010
@@ -40,6 +40,20 @@
   /// release_global_lock - Release the global lock.  This is a no-op if called
   /// before llvm_start_multithreaded().
   void llvm_release_global_lock();
+
+  /// llvm_execute_on_thread - Execute the given \arg UserFn on a separate
+  /// thread, passing it the provided \arg UserData.
+  ///
+  /// This function does not guarantee that the code will actually be executed
+  /// on a separate thread or honoring the requested stack size, but tries to do
+  /// so where system support is available.
+  ///
+  /// \param UserFn - The callback to execute.
+  /// \param UserData - An argument to pass to the callback function.
+  /// \param RequestedStackSize - If non-zero, a requested size (in bytes) for
+  /// the thread stack.
+  void llvm_execute_on_thread(void (*UserFn)(void*), void *UserData,
+                              unsigned RequestedStackSize = 0);
 }
 
 #endif

Modified: llvm/branches/Apple/whitney/lib/System/Threading.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/lib/System/Threading.cpp?rev=118529&r1=118528&r2=118529&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/lib/System/Threading.cpp (original)
+++ llvm/branches/Apple/whitney/lib/System/Threading.cpp Tue Nov  9 11:28:21 2010
@@ -62,3 +62,55 @@
 void llvm::llvm_release_global_lock() {
   if (multithreaded_mode) global_lock->release();
 }
+
+#if defined(LLVM_MULTITHREADED) && defined(HAVE_PTHREAD_H)
+#include <pthread.h>
+
+struct ThreadInfo {
+  void (*UserFn)(void *);
+  void *UserData;
+};
+static void *ExecuteOnThread_Dispatch(void *Arg) {
+  ThreadInfo *TI = reinterpret_cast<ThreadInfo*>(Arg);
+  TI->UserFn(TI->UserData);
+  return 0;
+}
+
+void llvm::llvm_execute_on_thread(void (*Fn)(void*), void *UserData,
+                                  unsigned RequestedStackSize) {
+  ThreadInfo Info = { Fn, UserData };
+  pthread_attr_t Attr;
+  pthread_t Thread;
+
+  // Construct the attributes object.
+  if (::pthread_attr_init(&Attr) != 0)
+    return;
+
+  // Set the requested stack size, if given.
+  if (RequestedStackSize != 0) {
+    if (::pthread_attr_setstacksize(&Attr, RequestedStackSize) != 0)
+      goto error;
+  }
+
+  // Construct and execute the thread.
+  if (::pthread_create(&Thread, &Attr, ExecuteOnThread_Dispatch, &Info) != 0)
+    goto error;
+
+  // Wait for the thread and clean up.
+  ::pthread_join(Thread, 0);
+  
+ error:
+  ::pthread_attr_destroy(&Attr);
+}
+
+#else
+
+// No non-pthread implementation, currently.
+
+void llvm::llvm_execute_on_thread(void (*Fn)(void*), void *UserData,
+                                  unsigned RequestedStackSize) {
+  (void) RequestedStackSize;
+  Fn(UserData);
+}
+
+#endif