fix global.

Author: mattn

Makefile

@@ -8,8 +8,8 @@ clean:
 	rm -f *.dll
 else
 libv8wrap.so : v8wrap.cc v8.go
-	g++ -fPIC -shared -o libv8wrap.so -I. v8wrap.cc -lv8
-	go build -x .
+	g++ -fPIC -shared -o libv8wrap.so -I. v8wrap.cc -lv8_base -lv8_snapshot
+	go build .
 
 clean:
 	rm -f *.so

v8wrap.cc

@@ -7,8 +7,7 @@
 
 extern "C" {
 
-static v8wrap_callback _go_callback = NULL;
-static v8::Handle<v8::ObjectTemplate> global;
+static volatile v8wrap_callback __go_callback = NULL;
 
 static std::string
 to_json(v8::Handle<v8::Value> value) {
@@ -44,41 +43,48 @@ _go_call(const v8::Arguments& args) {
   uint32_t id = args[0]->ToUint32()->Value();
   v8::String::Utf8Value name(args[1]);
   v8::String::Utf8Value argv(args[2]);
-  v8::HandleScope scope;
-  v8::Handle<v8::Value> ret = v8::Undefined();
-  char* retv = _go_callback(id, *name, *argv);
+  v8::TryCatch try_catch;
+  char* retv;
+  retv = __go_callback(id, *name, *argv);
   if (retv != NULL) {
-    ret = from_json(retv);
+    v8::Handle<v8::Value> ret = from_json(retv);
     free(retv);
+    return ret;
   }
-  return ret;
+  return v8::Undefined();
 }
 
 class V8Context {
 public:
   V8Context() {
     v8::Locker v8Locker;
     v8::HandleScope scope;
-    global = v8::ObjectTemplate::New();
-    global->Set(v8::String::New("_go_call"),
-        v8::FunctionTemplate::New(_go_call));
-    v8::Handle<v8::Context> context = v8::Context::New(NULL, global);
+    global_ = v8::Persistent<v8::ObjectTemplate>::New(v8::ObjectTemplate::New());
+    global_->Set(v8::String::New("_go_call"),
+      v8::FunctionTemplate::New(_go_call));
+    v8::Handle<v8::Context> context = v8::Context::New(NULL, global_);
     context_ = v8::Persistent<v8::Context>::New(context);
   };
 
-  virtual ~V8Context() { context_.Dispose(); };
+  virtual ~V8Context() {
+    context_.Dispose();
+    global_.Dispose();
+  };
   v8::Handle<v8::Context> context() { return context_; };
   std::string err() const { return err_; };
   void err(const std::string err) { this->err_ = err; }
 
 private:
+  v8::Persistent<v8::ObjectTemplate> global_;
   v8::Persistent<v8::Context> context_;
+  v8::HandleScope handle_scope_;
   std::string err_;
 };
 
 void
 v8_init(void *p) {
-  _go_callback = (v8wrap_callback) p;
+  v8::HandleScope scope;
+  __go_callback = (v8wrap_callback) p;
 }
 
 void*