Changeset 15138

Timestamp:

03/22/13 17:31:33 (12 years ago)

Author:

tbretz

Message:

Replaced the pre-compiled v8.sleep() by an ulock and a usleep, which should have the same effect; added the count function to the String object

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (5 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -148 +148 @@
     TryCatch exception;
 
-    const Handle<Script> sleep = Script::Compile(String::New("v8.sleep();"), String::New("internal"));
-    if (sleep.IsEmpty())
-        return Undefined();
+    //const Handle<Script> sleep = Script::Compile(String::New("v8.sleep();"), String::New("internal"));
+    //if (sleep.IsEmpty())
+    //    return Undefined();
 
     Handle<Function> func = Handle<Function>::Cast(args[1]);
@@ -171 +171 @@
         // JavaScript ever now and then. This also allows us to catch
         // exceptions, either from the preemption or ConvertEvent
-        sleep->Run();
+        //sleep->Run();
+
+        // Theoretically, the CPU usage can be reduced by maybe a factor
+        // of four using a larger value, but this also means that the
+        // JavaScript is locked for a longer time.
+        const Unlocker unlock;
+        usleep(1000);
     }
 
@@ -1214 +1220 @@
     HandleScope handle_scope;
 
-    const Handle<Script> sleep = Script::Compile(String::New("v8.sleep();"), String::New("internal"));
-    if (sleep.IsEmpty())
-        return Undefined();
+    //const Handle<Script> sleep = Script::Compile(String::New("v8.sleep();"), String::New("internal"));
+    //if (sleep.IsEmpty())
+    //    return Undefined();
 
     const Handle<String> data   = String::New("data");
@@ -1273 +1279 @@
         // JavaScript ever now and then. This also allows us to catch
         // exceptions, either from the preemption or ConvertEvent
-        sleep->Run();
+        //sleep->Run();
+
+        // Theoretically, the CPU usage can be reduced by maybe a factor
+        // of four using a larger value, but this also means that the
+        // JavaScript is locked for a longer time.
+        const Unlocker unlock;
+        usleep(1000);
     }
 
@@ -2215 +2227 @@
         "{"
             "return String.form(this, Array.prototype.slice.call(arguments));"
+        "}"
+        "\n"
+        "String.prototype.count = function(c,i)"
+        "{"
+            "return (this.match(new RegExp(c,i?'gi':'g'))||[]).length;"
         "}"/*
         "\n"