Changeset 20012

Timestamp:

09/27/08 11:23:53 (5 years ago)

Author:

tokuhirom

Message:

bug fixed around Process.GetInheritedIO.

Location:

lang/cplusplus/llv8call/trunk/ext

Files:

• nspr/io.cc (modified) (1 diff)
• nspr/nspr-v8.h (modified) (1 diff)
• nspr/process.cc (modified) (1 diff)
• posix/posix.cc (modified) (2 diffs)

lang/cplusplus/llv8call/trunk/ext/nspr/io.cc

@@ -10 +10 @@
 
 using namespace v8;
-
-static inline Handle<Object> nspr_namespace() {
-        return Context::GetCurrent()->Global()
-                      ->Get(String::New("org"))->ToObject()
-                      ->Get(String::New("coderepos"))->ToObject()
-                      ->Get(String::New("nspr"))->ToObject();
-}
 
 static Handle<Value> _Access(const Arguments& args) {

lang/cplusplus/llv8call/trunk/ext/nspr/nspr-v8.h

@@ -17 +17 @@
 }
 
+static inline v8::Handle<v8::Object> nspr_namespace() {
+        return v8::Context::GetCurrent()->Global()
+                      ->Get(v8::String::New("org"))->ToObject()
+                      ->Get(v8::String::New("coderepos"))->ToObject()
+                      ->Get(v8::String::New("nspr"))->ToObject();
+}
+

lang/cplusplus/llv8call/trunk/ext/nspr/process.cc

@@ -15 +15 @@
     String::Utf8Value name(args[0]->ToString());
     PRFileDesc *fd = PR_GetInheritedFD(*name);
-    Handle<Function> tmpl = Handle<Function>::Cast(Context::GetCurrent()->Global()->Get(String::New("IO")));
+    Handle<Function> tmpl = Handle<Function>::Cast(nspr_namespace()->Get(String::New("IO")));
     Handle<Object> obj = tmpl->NewInstance();
     obj->SetInternalField(0, External::New((void*)fd));

lang/cplusplus/llv8call/trunk/ext/posix/posix.cc

@@ -3 +3 @@
 #include <cstring>
 #include "v8ext.h"
-#include "llv8-util.h"
 #include <unistd.h>
 #include <sys/wait.h>
+
+#define assert_args(args, length) do { if ((args).Length() != (length)) { return v8::ThrowException(v8::String::New("Exception: missing args")); } } while (0)
 
 using namespace v8;
 
 static Handle<Value> _Fork(const Arguments& args) {
+    assert_args(args, 0);
     return Int32::New(fork());
+}
+
+static Handle<Value> _sleep(const Arguments& args) {
+    assert_args(args, 1);
+    sleep(args[0]->Int32Value());
+    return Undefined();
 }
 
@@ -19 +27 @@
     Handle<Object> target = Object::New();
     target->Set(String::New("Fork"), FunctionTemplate::New(_Fork)->GetFunction());
+    target->Set(String::New("Sleep"), FunctionTemplate::New(_sleep)->GetFunction());
     return target;
 }