summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedor Indutny <fedor@indutny.com>2014-10-11 02:17:03 +0400
committerFedor Indutny <fedor@indutny.com>2014-10-12 02:05:02 +0400
commit50839a042edba3466d8a013c1814a076f1cc8318 (patch)
tree7863ce7ff3eaa854f444ab32687d8cd2098feb0d
parent6bcea4ff932144a5fd02affefd45164fbf471e67 (diff)
downloadnode-new-50839a042edba3466d8a013c1814a076f1cc8318.tar.gz
v8_platform: provide default v8::Platform impl
Provide default Platform implementation for v8's purposes.
-rw-r--r--node.gyp1
-rw-r--r--src/node.cc12
-rw-r--r--src/node_v8_platform.cc166
-rw-r--r--src/node_v8_platform.h74
4 files changed, 248 insertions, 5 deletions
diff --git a/node.gyp b/node.gyp
index 2f5cf0e565..b1dc5f2eca 100644
--- a/node.gyp
+++ b/node.gyp
@@ -102,6 +102,7 @@
'src/node_main.cc',
'src/node_os.cc',
'src/node_v8.cc',
+ 'src/node_v8_platform.cc',
'src/node_stat_watcher.cc',
'src/node_watchdog.cc',
'src/node_zlib.cc',
diff --git a/src/node.cc b/src/node.cc
index db22ea9a2d..50081c059a 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -26,6 +26,7 @@
#include "node_http_parser.h"
#include "node_javascript.h"
#include "node_version.h"
+#include "node_v8_platform.h"
#if defined HAVE_PERFCTR
#include "node_counters.h"
@@ -3481,11 +3482,6 @@ void Init(int* argc,
V8::SetArrayBufferAllocator(&ArrayBufferAllocator::the_singleton);
- // Fetch a reference to the main isolate, so we have a reference to it
- // even when we need it to access it from another (debugger) thread.
- node_isolate = Isolate::New();
- Isolate::Scope isolate_scope(node_isolate);
-
#ifdef __POSIX__
// Raise the open file descriptor limit.
{ // NOLINT (whitespace/braces)
@@ -3722,8 +3718,14 @@ int Start(int argc, char** argv) {
V8::SetEntropySource(crypto::EntropySource);
#endif
+ V8::InitializePlatform(new Platform(4));
+
int code;
V8::Initialize();
+
+ // Fetch a reference to the main isolate, so we have a reference to it
+ // even when we need it to access it from another (debugger) thread.
+ node_isolate = Isolate::New();
{
Locker locker(node_isolate);
Isolate::Scope isolate_scope(node_isolate);
diff --git a/src/node_v8_platform.cc b/src/node_v8_platform.cc
new file mode 100644
index 0000000000..566fd798db
--- /dev/null
+++ b/src/node_v8_platform.cc
@@ -0,0 +1,166 @@
+// Copyright Fedor Indutny and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#include "node_v8_platform.h"
+
+#include "node.h"
+#include "util.h"
+#include "util-inl.h"
+#include "uv.h"
+#include "v8-platform.h"
+
+namespace node {
+
+using v8::Task;
+using v8::Isolate;
+
+// The last task to encounter before killing the worker
+class StopTask : public Task {
+ public:
+ StopTask() {}
+ ~StopTask() {}
+
+ void Run() {}
+};
+
+static StopTask stop_task_;
+
+
+Platform::Platform(unsigned int worker_count) : worker_count_(worker_count) {
+ workers_ = new uv_thread_t[worker_count_];
+
+ for (unsigned int i = 0; i < worker_count_; i++) {
+ int err;
+
+ err = uv_thread_create(worker_at(i), WorkerBody, this);
+ CHECK_EQ(err, 0);
+ }
+}
+
+
+Platform::~Platform() {
+ // Push stop task
+ for (unsigned int i = 0; i < worker_count(); i++)
+ global_queue()->Push(&stop_task_);
+
+ // And wait for workers to exit
+ for (unsigned int i = 0; i < worker_count(); i++) {
+ int err;
+
+ err = uv_thread_join(worker_at(i));
+ CHECK_EQ(err, 0);
+ }
+ delete[] workers_;
+}
+
+
+void Platform::CallOnBackgroundThread(Task* task,
+ ExpectedRuntime expected_runtime) {
+ global_queue()->Push(task);
+}
+
+
+void Platform::CallOnForegroundThread(Isolate* isolate, Task* task) {
+ // TODO(indutny): create per-isolate thread pool
+ global_queue()->Push(task);
+}
+
+
+void Platform::WorkerBody(void* arg) {
+ Platform* p = static_cast<Platform*>(arg);
+
+ for (;;) {
+ Task* task = p->global_queue()->Shift();
+ if (task == &stop_task_)
+ break;
+
+ task->Run();
+ delete task;
+ }
+}
+
+
+TaskQueue::TaskQueue() {
+ int err;
+
+ STATIC_ASSERT(kRingSize == (kRingSize & (~(kRingSize - 1))));
+
+ size_ = kRingSize;
+ ring_ = new Task*[size_];
+ mask_ = size_ - 1;
+ read_off_ = 0;
+ write_off_ = 0;
+
+ err = uv_sem_init(&sem_, 0);
+ CHECK_EQ(err, 0);
+
+ err = uv_cond_init(&cond_);
+ CHECK_EQ(err, 0);
+
+ err = uv_mutex_init(&mutex_);
+ CHECK_EQ(err, 0);
+}
+
+
+TaskQueue::~TaskQueue() {
+ CHECK_EQ(read_off_, write_off_);
+
+ delete[] ring_;
+ ring_ = NULL;
+ uv_sem_destroy(&sem_);
+ uv_cond_destroy(&cond_);
+ uv_mutex_destroy(&mutex_);
+}
+
+
+void TaskQueue::Push(Task* task) {
+ uv_mutex_lock(&mutex_);
+
+ // Wait for empty cell
+ while (ring_[write_off_] != NULL)
+ uv_cond_wait(&cond_, &mutex_);
+
+ ring_[write_off_] = task;
+ write_off_++;
+ write_off_ &= mask_;
+ uv_mutex_unlock(&mutex_);
+
+ uv_sem_post(&sem_);
+}
+
+
+Task* TaskQueue::Shift() {
+ uv_sem_wait(&sem_);
+
+ uv_mutex_lock(&mutex_);
+ Task* task = ring_[read_off_];
+ ring_[read_off_] = NULL;
+ uv_cond_signal(&cond_);
+
+ read_off_++;
+ read_off_ &= mask_;
+ uv_mutex_unlock(&mutex_);
+
+ return task;
+}
+
+
+} // namespace node
diff --git a/src/node_v8_platform.h b/src/node_v8_platform.h
new file mode 100644
index 0000000000..d8bc7378cc
--- /dev/null
+++ b/src/node_v8_platform.h
@@ -0,0 +1,74 @@
+// Copyright Fedor Indutny and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#ifndef SRC_NODE_V8_PLATFORM_H_
+#define SRC_NODE_V8_PLATFORM_H_
+
+#include "uv.h"
+#include "v8-platform.h"
+
+namespace node {
+
+class TaskQueue {
+ public:
+ TaskQueue();
+ ~TaskQueue();
+
+ void Push(v8::Task* task);
+ v8::Task* Shift();
+
+ private:
+ static const unsigned int kRingSize = 1024;
+
+ uv_sem_t sem_;
+ uv_cond_t cond_;
+ uv_mutex_t mutex_;
+ v8::Task** ring_;
+ unsigned int size_;
+ unsigned int mask_;
+ unsigned int read_off_;
+ unsigned int write_off_;
+};
+
+class Platform : public v8::Platform {
+ public:
+ explicit Platform(unsigned int worker_count);
+ ~Platform();
+
+ void CallOnBackgroundThread(v8::Task* task,
+ ExpectedRuntime expected_runtime);
+ void CallOnForegroundThread(v8::Isolate* isolate, v8::Task* task);
+
+ protected:
+ static void WorkerBody(void* arg);
+
+ inline TaskQueue* global_queue() { return &global_queue_; }
+ inline uv_thread_t* worker_at(unsigned int index) { return &workers_[index]; }
+ inline unsigned int worker_count() const { return worker_count_; }
+
+ uv_thread_t* workers_;
+ unsigned int worker_count_;
+ TaskQueue global_queue_;
+};
+
+} // namespace node
+
+#endif // SRC_NODE_V8_PLATFORM_H_