Changeset 882 for branches

Timestamp:

Sep 13, 2018, 3:51:18 PM (6 years ago)

Author:

djay

Message:

Fix to use same default mode when memory is not set and service is run asynchronously. Add sleep function to the JS ZOO-API (for polling).

Location:

branches/prototype-v0/zoo-project/zoo-kernel

Files:

• service_internal_js.c (modified) (2 diffs)
• service_internal_js.h (modified) (1 diff)
• zoo_service_loader.c (modified) (1 diff)

branches/prototype-v0/zoo-project/zoo-kernel/service_internal_js.c

@@ -157 +157 @@
     return 1;
   if (!JS_DefineFunction(cx, global, "alert", JSAlert, 2, 0))
+    return 1;  
+  if (!JS_DefineFunction(cx, global, "sleep", JSSleep, 1, 0))
     return 1;  
   if (!JS_DefineFunction(cx, global, "importScripts", JSLoadScripts, 1, 0))
@@ -1027 +1029 @@
 }
 
+/**
+ * The function used as sleep from the JavaScript environment
+ * (ZOO-API).
+ *
+ * @param cx the JavaScript context
+ * @param argc the number of parameters
+ * @param argv1 the parameter values
+ * @return true
+ */
+JSBool
+JSSleep(JSContext *cx, uintN argc, jsval *argv1)
+{
+  jsval *argv = JS_ARGV(cx,argv1);
+  JS_MaybeGC(cx);
+  int isleep=0;
+  if(JS_ValueToInt32(cx,argv[0],&isleep)==JS_TRUE){
+    zSleep(isleep);
+  }
+  JS_MaybeGC(cx);
+  return JS_TRUE;
+}
+

branches/prototype-v0/zoo-project/zoo-kernel/service_internal_js.h

@@ -49 +49 @@
   JSBool JSRequest(JSContext*, uintN, jsval*);
   JSBool JSUpdateStatus(JSContext*,uintN,jsval *);
+  JSBool JSSleep(JSContext*,uintN,jsval *);
 
   void reportError(JSContext *cx, const char *message, JSErrorReport *report);

branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -2568 +2568 @@
           }else{
             map* testMap=getMapFromMaps(m,"main","memory");
-            if(testMap!=NULL && strcasecmp(testMap->value,"load")!=0)
+            if(testMap==NULL || strcasecmp(testMap->value,"load")!=0)
               dumpMapsValuesToFiles(&m,&request_input_real_format);
             loadServiceAndRun (&m, s1, request_inputs,