[Lldb-commits] [PATCH] Fixes http://reviews.llvm.org/rL230691

[Chaoren Lin]

Hi ki.stfu,

OS X doesn't implement pthread barriers, using a simple atomic flag instead.

http://reviews.llvm.org/D7933

Files:
  test/functionalities/watchpoint/hello_watchlocation/main.cpp

Index: test/functionalities/watchpoint/hello_watchlocation/main.cpp
===================================================================
--- test/functionalities/watchpoint/hello_watchlocation/main.cpp
+++ test/functionalities/watchpoint/hello_watchlocation/main.cpp
@@ -13,12 +13,13 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <atomic>
 
 pthread_t g_thread_1 = NULL;
 pthread_t g_thread_2 = NULL;
 pthread_t g_thread_3 = NULL;
 
-pthread_barrier_t g_barrier;
+std::atomic_bool g_ready(false);
 
 char *g_char_ptr = NULL;
 
@@ -54,7 +55,7 @@
     uint32_t thread_index = *((uint32_t *)arg);
     printf ("%s (thread index = %u) startng...\n", __FUNCTION__, thread_index);
 
-    pthread_barrier_wait(&g_barrier);
+    while (!g_ready);
 
     uint32_t count = 0;
     uint32_t val;
@@ -88,23 +89,18 @@
     g_char_ptr = (char *)malloc (1);
     *g_char_ptr = 0;
 
-    pthread_barrier_init(&g_barrier, NULL, 4);
-
     // Create 3 threads
     err = ::pthread_create (&g_thread_1, NULL, thread_func, &thread_index_1);
     err = ::pthread_create (&g_thread_2, NULL, thread_func, &thread_index_2);
     err = ::pthread_create (&g_thread_3, NULL, thread_func, &thread_index_3);
 
     printf ("Before turning all three threads loose...\n"); // Set break point at this line.
-    pthread_barrier_wait(&g_barrier);
+    g_ready = true;
 
     // Join all of our threads
     err = ::pthread_join (g_thread_1, &thread_result);
     err = ::pthread_join (g_thread_2, &thread_result);
     err = ::pthread_join (g_thread_3, &thread_result);
 
-    pthread_barrier_destroy(&g_barrier);
-    free(g_char_ptr);
-
     return 0;
 }

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D7933.20830.patch
Type: text/x-patch
Size: 1653 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150227/c5a65274/attachment.bin>