author | Lars T Hansen <lhansen@mozilla.com> |
Mon, 02 May 2016 10:18:20 +0200 | |
changeset 295813 | 4a3493053ffb01506babf159fd0b43e177be0f62 |
parent 295812 | 5ff6c23714396e0c4d8d1add6b3ec3e2815b9880 |
child 295814 | 094a64103807bc86dace7c7885328681b9dd2fd7 |
push id | 76100 |
push user | lhansen@mozilla.com |
push date | Tue, 03 May 2016 09:35:18 +0000 |
treeherder | mozilla-inbound@4a3493053ffb [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bbouvier |
bugs | 1262062 |
milestone | 49.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
js/src/builtin/AtomicsObject.cpp | file | annotate | diff | comparison | revisions | |
js/src/builtin/AtomicsObject.h | file | annotate | diff | comparison | revisions |
--- a/js/src/builtin/AtomicsObject.cpp +++ b/js/src/builtin/AtomicsObject.cpp @@ -1113,19 +1113,17 @@ const JSFunctionSpec AtomicsMethods[] = JS_INLINABLE_FN("exchange", atomics_exchange, 3,0, AtomicsExchange), JS_INLINABLE_FN("add", atomics_add, 3,0, AtomicsAdd), JS_INLINABLE_FN("sub", atomics_sub, 3,0, AtomicsSub), JS_INLINABLE_FN("and", atomics_and, 3,0, AtomicsAnd), JS_INLINABLE_FN("or", atomics_or, 3,0, AtomicsOr), JS_INLINABLE_FN("xor", atomics_xor, 3,0, AtomicsXor), JS_INLINABLE_FN("isLockFree", atomics_isLockFree, 1,0, AtomicsIsLockFree), JS_FN("wait", atomics_wait, 4,0), - JS_FN("futexWait", atomics_wait, 4,0), JS_FN("wake", atomics_wake, 3,0), - JS_FN("futexWake", atomics_wake, 3,0), JS_FS_END }; JSObject* AtomicsObject::initClass(JSContext* cx, Handle<GlobalObject*> global) { // Create Atomics Object. RootedObject objProto(cx, global->getOrCreateObjectPrototype(cx));
--- a/js/src/builtin/AtomicsObject.h +++ b/js/src/builtin/AtomicsObject.h @@ -113,17 +113,17 @@ public: enum FutexState { Idle, // We are not waiting or woken Waiting, // We are waiting, nothing has happened yet WaitingNotifiedForInterrupt, // We are waiting, but have been interrupted, // and have not yet started running the // interrupt handler WaitingInterrupted, // We are waiting, but have been interrupted // and are running the interrupt handler - Woken // Woken by a script call to futexWake + Woken // Woken by a script call to Atomics.wake }; // Condition variable that this runtime will wait on. PRCondVar* cond_; // Current futex state for this runtime. When not in a wait this // is Idle; when in a wait it is Waiting or the reason the futex // is about to wake up.