Merge lp:~marcustomlinson/v8-cpp/async-callbacks into lp:v8-cpp

[Marcus Tomlinson]

Added v8cpp::Locker class

=== modified file 'src/internal/require.h'
--- src/internal/require.h	2015-07-16 14:30:30 +0000
+++ src/internal/require.h	2015-07-29 10:40:55 +0000
@@ -41,7 +41,7 @@
 };
 
 ///!extern "C" void node_module_register(void* m)
-///!
+///!{
 ///!    auto mp = static_cast<NodeModule*>(m);
 ///!
 ///!    // For now we only know that version 14 works here
 
=== added file 'src/locker.h'
--- src/locker.h	1970-01-01 00:00:00 +0000
+++ src/locker.h	2015-07-29 10:40:55 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#pragma once
+
+#include <memory>
+
+namespace v8cpp
+{
+
+class Locker
+{
+public:
+    explicit Locker(v8::Isolate* isolate)
+    {
+        if (v8::Locker::IsActive() && !v8::Locker::IsLocked(isolate))
+        {
+            locker_ = std::make_shared<v8::Locker>(isolate);
+            isolate_scope_ = std::make_shared<v8::Isolate::Scope>(isolate);
+            handle_scope_ = std::make_shared<v8::HandleScope>(isolate);
+            context_scope_ = std::make_shared<v8::Context::Scope>(v8::Context::New(isolate));
+        }
+    }
+
+private:
+    std::shared_ptr<v8::Locker> locker_;
+    std::shared_ptr<v8::Isolate::Scope> isolate_scope_;
+    std::shared_ptr<v8::HandleScope> handle_scope_;
+    std::shared_ptr<v8::Context::Scope> context_scope_;
+};
+
+class Unlocker
+{
+public:
+    explicit Unlocker(v8::Isolate* isolate)
+    {
+        if (v8::Locker::IsActive() && v8::Locker::IsLocked(isolate))
+        {
+            unlocker_ = std::make_shared<v8::Unlocker>(isolate);
+        }
+    }
+
+private:
+    std::shared_ptr<v8::Unlocker> unlocker_;
+};
+
+}  // namespace v8cpp
 
=== modified file 'src/v8-cpp.h'
--- src/v8-cpp.h	2015-06-18 12:48:38 +0000
+++ src/v8-cpp.h	2015-07-29 10:40:55 +0000
@@ -19,5 +19,6 @@
 #include <call.h>
 #include <class.h>
 #include <convert.h>
+#include <locker.h>
 #include <module.h>
 #include <run.h>