[Atomics] Rename Atomics.futex*, remove Atomics.futexWakeOrRequeue

src/futex-emulation.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/futex-emulation.h"
 
 #include <limits>
 
 #include "src/base/macros.h"
 #include "src/base/platform/time.h"
@@ skipping 66 matching lines @@
                              int32_t value, double rel_timeout_ms) {
   DCHECK(addr < NumberToSize(isolate, array_buffer->byte_length()));
 
   void* backing_store = array_buffer->backing_store();
   int32_t* p =
       reinterpret_cast<int32_t*>(static_cast<int8_t*>(backing_store) + addr);
 
   base::LockGuard<base::Mutex> lock_guard(mutex_.Pointer());
 
   if (*p != value) {
-    return Smi::FromInt(Result::kNotEqual);
+    return isolate->heap()->not_equal();
   }
 
   FutexWaitListNode* node = isolate->futex_wait_list_node();
 
   node->backing_store_ = backing_store;
   node->wait_addr_ = addr;
   node->waiting_ = true;
 
   bool use_timeout = rel_timeout_ms != V8_INFINITY;
 
@@ skipping 52 matching lines @@
     }
 
     mutex_.Pointer()->Lock();
 
     if (node->interrupted_) {
       // An interrupt occured while the mutex_ was unlocked. Don't wait yet.
       continue;
     }
 
     if (!node->waiting_) {
-      result = Smi::FromInt(Result::kOk);
+      result = isolate->heap()->ok();
       break;
     }
 
     // No interrupts, now wait.
     if (use_timeout) {
       current_time = base::TimeTicks::Now();
       if (current_time >= timeout_time) {
-        result = Smi::FromInt(Result::kTimedOut);
+        result = isolate->heap()->timed_out();
         break;
       }
 
       base::TimeDelta time_until_timeout = timeout_time - current_time;
       DCHECK(time_until_timeout.InMicroseconds() >= 0);
       bool wait_for_result =
           node->cond_.WaitFor(mutex_.Pointer(), time_until_timeout);
       USE(wait_for_result);
     } else {
       node->cond_.Wait(mutex_.Pointer());
@@ skipping 27 matching lines @@
       waiters_woken++;
     }
 
     node = node->next_;
   }
 
   return Smi::FromInt(waiters_woken);
 }
 
 
-Object* FutexEmulation::WakeOrRequeue(Isolate* isolate,
-                                      Handle<JSArrayBuffer> array_buffer,
-                                      size_t addr, int num_waiters_to_wake,
-                                      int32_t value, size_t addr2) {
-  DCHECK(addr < NumberToSize(isolate, array_buffer->byte_length()));
-  DCHECK(addr2 < NumberToSize(isolate, array_buffer->byte_length()));
-
-  void* backing_store = array_buffer->backing_store();
-  int32_t* p =
-      reinterpret_cast<int32_t*>(static_cast<int8_t*>(backing_store) + addr);
-
-  base::LockGuard<base::Mutex> lock_guard(mutex_.Pointer());
-  if (*p != value) {
-    return Smi::FromInt(Result::kNotEqual);
-  }
-
-  // Wake |num_waiters_to_wake|
-  int waiters_woken = 0;
-  FutexWaitListNode* node = wait_list_.Pointer()->head_;
-  while (node) {
-    if (backing_store == node->backing_store_ && addr == node->wait_addr_) {
-      if (num_waiters_to_wake > 0) {
-        node->waiting_ = false;
-        node->cond_.NotifyOne();
-        --num_waiters_to_wake;
-        waiters_woken++;
-      } else {
-        node->wait_addr_ = addr2;
-      }
-    }
-
-    node = node->next_;
-  }
-
-  return Smi::FromInt(waiters_woken);
-}
-
-
 Object* FutexEmulation::NumWaitersForTesting(Isolate* isolate,
                                              Handle<JSArrayBuffer> array_buffer,
                                              size_t addr) {
   DCHECK(addr < NumberToSize(isolate, array_buffer->byte_length()));
   void* backing_store = array_buffer->backing_store();
 
   base::LockGuard<base::Mutex> lock_guard(mutex_.Pointer());
 
   int waiters = 0;
   FutexWaitListNode* node = wait_list_.Pointer()->head_;
   while (node) {
     if (backing_store == node->backing_store_ && addr == node->wait_addr_ &&
         node->waiting_) {
       waiters++;
     }
 
     node = node->next_;
   }
 
   return Smi::FromInt(waiters);
 }
 
 }  // namespace internal
 }  // namespace v8