commit c9a659c57b256001fd63f9825bde69e660c2655b
author Yabin Cui <yabinc@google.com> Thu Nov 05 15:36:08 2015 -0800
committer Yabin Cui <yabinc@google.com> Thu Nov 19 13:42:03 2015 -0800
tree 74de618379f38c2726cc41956144f560dd6be9ea
parent b804b9d67b9e3a8c63471ff9892f6abea2a58684

Use FUTEX_WAIT_BITSET to avoid converting timeouts.

Add unittests for pthread APIs with timeout parameter.

Bug: 17569991

Change-Id: I6b3b9b2feae03680654cd64c3112ce7644632c87

libc/bionic/__cxa_guard.cpp

diff --git a/libc/bionic/__cxa_guard.cpp b/libc/bionic/__cxa_guard.cpp
index 5b34b58..97284d5 100644
--- a/libc/bionic/__cxa_guard.cpp
+++ b/libc/bionic/__cxa_guard.cpp
@@ -109,7 +109,7 @@
       }
     }
 
-    __futex_wait_ex(&gv->state, false, CONSTRUCTION_UNDERWAY_WITH_WAITER, NULL);
+    __futex_wait_ex(&gv->state, false, CONSTRUCTION_UNDERWAY_WITH_WAITER, false, nullptr);
     old_value = atomic_load_explicit(&gv->state, memory_order_relaxed);
   }
 }