Changeset 492 for trunk/zoo-project/zoo-kernel/service_internal_js.c

Timestamp:

Jul 11, 2014, 10:14:03 PM (10 years ago)

Author:

djay

Message:

Inputs passed by reference downloaded in parallel. Conform behavior for DescribeProcess? when the Identifier was not found.

File:

• trunk/zoo-project/zoo-kernel/service_internal_js.c (modified) (7 diffs)

trunk/zoo-project/zoo-kernel/service_internal_js.c

@@ -732 +732 @@
 }
 
-HINTERNET setHeader(HINTERNET handle,JSContext *cx,JSObject *header){
+HINTERNET setHeader(HINTERNET* handle,JSContext *cx,JSObject *header){
   jsuint length=0;
   jsint i=0;
@@ -747 +747 @@
     fprintf(stderr,"header is an array of %d elements\n",length);
 #endif
-    handle.header=NULL;
+    handle->ihandle[handle->nb].header=NULL;
     for(i=0;i<length;i++){
       jsval tmp;
@@ -753 +753 @@
       tmp1=JSValToChar(cx,&tmp);
 #ifdef ULINET_DEBUG
-      curl_easy_setopt(handle.handle,CURLOPT_VERBOSE,1);
+      curl_easy_setopt(handle->ihandle[handle->nb].handle,CURLOPT_VERBOSE,1);
       fprintf(stderr,"Element of array n° %d, value : %s\n",i,tmp1);
 #endif
-      handle.header=curl_slist_append(handle.header, tmp1);
+      handle->ihandle[handle->nb].header=curl_slist_append(handle->ihandle[handle->nb].header, tmp1);
       free(tmp1);
     }
@@ -763 +763 @@
     fprintf(stderr,"not an array !!!!!!!\n");
   }
-  return handle;
+  return *handle;
 }
 
@@ -804 +804 @@
     url=JSValToChar(cx,argv);
   }
+  hInternet.waitingRequests[hInternet.nb]=strdup(url);
   if(argc==4){
     char *body;
@@ -812 +813 @@
 #endif
     if(JS_IsArrayObject(cx,header))
-      res1=setHeader(hInternet,cx,header);
+      setHeader(&hInternet,cx,header);
 #ifdef ULINET_DEBUG
     fprintf(stderr,"BODY (%s)\n",body);
 #endif
-    res=InternetOpenUrl(res1,url,body,strlen(body),
-                        INTERNET_FLAG_NO_CACHE_WRITE,0);    
+    InternetOpenUrl(&hInternet,hInternet.waitingRequests[hInternet.nb],body,strlen(body),
+                    INTERNET_FLAG_NO_CACHE_WRITE,0);    
+    processDownloads(&hInternet);
     free(body);
   }else{
     if(argc==3){
       char *body=JSValToChar(cx,&argv[2]);
-      res=InternetOpenUrl(hInternet,url,body,strlen(body),
-                          INTERNET_FLAG_NO_CACHE_WRITE,0);
+      InternetOpenUrl(&hInternet,hInternet.waitingRequests[hInternet.nb],body,strlen(body),
+                      INTERNET_FLAG_NO_CACHE_WRITE,0);
+      processDownloads(&hInternet);
       free(body);
-    }
-    res=InternetOpenUrl(hInternet,url,NULL,0,
-                        INTERNET_FLAG_NO_CACHE_WRITE,0);
-  }
-  tmpValue=(char*)malloc((res.nDataLen+1)*sizeof(char));
-  InternetReadFile(res,(LPVOID)tmpValue,res.nDataLen,&dwRead);
+    }else{
+      InternetOpenUrl(&hInternet,hInternet.waitingRequests[hInternet.nb],NULL,0,
+                      INTERNET_FLAG_NO_CACHE_WRITE,0);
+      processDownloads(&hInternet);
+    }
+  }
+  tmpValue=(char*)malloc((hInternet.ihandle[0].nDataLen+1)*sizeof(char));
+  InternetReadFile(hInternet.ihandle[0],(LPVOID)tmpValue,hInternet.ihandle[0].nDataLen,&dwRead);
 #ifdef ULINET_DEBUG
   fprintf(stderr,"content downloaded (%d) (%s) \n",dwRead,tmpValue);
@@ -846 +851 @@
   if(argc>=2)
     free(method);
-  if(argc==4 && res.header!=NULL){
-    curl_slist_free_all(res.header);
-  }
-  InternetCloseHandle(hInternet);
+  InternetCloseHandle(&hInternet);
   JS_MaybeGC(cx);
   return JS_TRUE;