diff options
author | Michaël Zasso <targos@protonmail.com> | 2016-09-06 22:49:51 +0200 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2016-09-22 09:51:19 +0200 |
commit | ec02b811a8a5c999bab4de312be2d732b7d9d50b (patch) | |
tree | ca3068017254f238cf413a451c57a803572983a4 /deps/v8/src/cancelable-task.h | |
parent | d2eb7ce0105369a9cad82787cb33a665e9bd00ad (diff) | |
download | android-node-v8-ec02b811a8a5c999bab4de312be2d732b7d9d50b.tar.gz android-node-v8-ec02b811a8a5c999bab4de312be2d732b7d9d50b.tar.bz2 android-node-v8-ec02b811a8a5c999bab4de312be2d732b7d9d50b.zip |
deps: update V8 to 5.4.500.27
Pick up latest commit from the 5.4-lkgr branch.
deps: edit V8 gitignore to allow trace event copy
deps: update V8 trace event to 315bf1e2d45be7d53346c31cfcc37424a32c30c8
deps: edit V8 gitignore to allow gtest_prod.h copy
deps: update V8 gtest to 6f8a66431cb592dad629028a50b3dd418a408c87
PR-URL: https://github.com/nodejs/node/pull/8317
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Diffstat (limited to 'deps/v8/src/cancelable-task.h')
-rw-r--r-- | deps/v8/src/cancelable-task.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/deps/v8/src/cancelable-task.h b/deps/v8/src/cancelable-task.h index a8387fcd95..b1d62aad4b 100644 --- a/deps/v8/src/cancelable-task.h +++ b/deps/v8/src/cancelable-task.h @@ -5,11 +5,12 @@ #ifndef V8_CANCELABLE_TASK_H_ #define V8_CANCELABLE_TASK_H_ +#include <map> + #include "include/v8-platform.h" -#include "src/atomic-utils.h" +#include "src/base/atomic-utils.h" #include "src/base/macros.h" #include "src/base/platform/condition-variable.h" -#include "src/hashmap.h" namespace v8 { namespace internal { @@ -51,7 +52,7 @@ class CancelableTaskManager { uint32_t task_id_counter_; // A set of cancelable tasks that are currently registered. - HashMap cancelable_tasks_; + std::map<uint32_t, Cancelable*> cancelable_tasks_; // Mutex and condition variable enabling concurrent register and removing, as // well as waiting for background tasks on {CancelAndWait}. @@ -104,13 +105,13 @@ class Cancelable { } CancelableTaskManager* parent_; - AtomicValue<Status> status_; + base::AtomicValue<Status> status_; uint32_t id_; // The counter is incremented for failing tries to cancel a task. This can be // used by the task itself as an indication how often external entities tried // to abort it. - AtomicNumber<intptr_t> cancel_counter_; + base::AtomicNumber<intptr_t> cancel_counter_; friend class CancelableTaskManager; |