Changeset 16102 for trunk/FACT++/src

Timestamp:

05/24/13 13:36:21 (11 years ago)

Author:

tbretz

Message:

Added a user supplied 'this' argument to v8.timeout and the Thread class.

Location:

trunk/FACT++/src

Files:

• InterpreterV8.cc (modified) (7 diffs)
• InterpreterV8.h (modified) (1 diff)

trunk/FACT++/src/InterpreterV8.cc

@@ -141 +141 @@
         return ThrowException(String::New("Argument 1 not a function."));
 
+    if (args.Length()>2 && !args[2]->IsObject())
+        return ThrowException(String::New("Argument 2 not an object."));
+
     const int32_t timeout = args[0]->IsNull() ? 0 : args[0]->Int32Value();
     const bool    null    = args[0]->IsNull();
@@ -148 +151 @@
     Handle<Function> func = Handle<Function>::Cast(args[1]);
 
-    Handle<Value> argv[args.Length()-2];
-    for (int i=0; i<args.Length()-2; i++)
-        argv[i] = args[i+2];
+    const int nn = args.Length()==2 ? 0 : args.Length()-3;
+
+    Handle<Value> argv[nn];
+    for (int i=0; i<nn; i++)
+        argv[i] = args[i+3];
 
     Time t;
     while (1)
     {
-        const Handle<Value> rc = func->Call(func, args.Length()-2, argv);
+        const Handle<Value> rc = args.Length()<3 ? func->Call(func, nn, argv) : func->Call(args[2]->ToObject(), nn, argv);
         if (rc.IsEmpty())
             return Undefined();
@@ -179 +184 @@
 }
 
-void InterpreterV8::Thread(int &id, Persistent<Function> func, uint32_t ms)
+void InterpreterV8::Thread(int &id, Persistent<Object> _this, Persistent<Function> func, uint32_t ms)
 {
     const Locker lock;
@@ -206 +211 @@
     const bool rc = ms==0 || !ExecuteInternal("v8.sleep("+to_string(ms)+");").IsEmpty();
     if (rc)
-        func->Call(func, 0, NULL);
+    {
+        if (_this.IsEmpty())
+            func->Call(func, 0, NULL);
+        else
+            func->Call(_this, 0, NULL);
+    }
 
     func.Dispose();
+    _this.Dispose();
+
     fThreadIds.erase(id_local);
 
@@ -220 +232 @@
         return ThrowException(String::New("Thread must be called as constructor."));
 
-    if (args.Length()!=2)
-        return ThrowException(String::New("Number of arguments must be two."));
+    if (args.Length()!=2 && args.Length()!=3)
+        return ThrowException(String::New("Number of arguments must be two or three."));
 
     if (!args[0]->IsUint32())
@@ -229 +241 @@
         return ThrowException(String::New("Argument 1 not a function."));
 
+    if (args.Length()==3 && !args[2]->IsObject())
+        return ThrowException(String::New("Argument 2 not an object."));
+
     //if (!args.IsConstructCall())
     //    return Constructor(args);
@@ -236 +251 @@
     Handle<Function> handle = Handle<Function>::Cast(args[1]);
 
-    Persistent<Function> func = Persistent<Function>::New(handle);
+    Persistent<Function> func =  Persistent<Function>::New(handle);
+    Persistent<Object> _this;
+    if (args.Length()==3)
+        _this = Persistent<Object>::New(args[2]->ToObject());
 
     const uint32_t ms = args[0]->Uint32Value();
 
     int id=-2;
-    fThreads.push_back(thread(bind(&InterpreterV8::Thread, this, ref(id), func, ms)));
+    fThreads.push_back(thread(bind(&InterpreterV8::Thread, this, ref(id), _this, func, ms)));
     {
         // Allow the thread to lock, so we can get the thread id.

trunk/FACT++/src/InterpreterV8.h

@@ -65 +65 @@
     v8::Handle<v8::Value> ExecuteInternal(const std::string &code);
 
-    void Thread(int &id, v8::Persistent<v8::Function> func, uint32_t ms);
+    void Thread(int &id, v8::Persistent<v8::Object> _this, v8::Persistent<v8::Function> func, uint32_t ms);
 
     std::vector<std::string> ValueToArray(const v8::Handle<v8::Value> &val, bool only=true);