Changeset 877 for branches/prototype-v0/zoo-project/zoo-kernel/request_parser.c

Timestamp:

Aug 16, 2018, 8:00:56 AM (6 years ago)

Author:

djay

Message:

Fixes for supporting properly the memory=protect which force the ZOO-Kernel to not store any downloaded files in memory. Add footer to the HPC support. Fix the autotools to build service_json and sshapi only when required so, when HPC support is activated, this also avoid adding too much dependencies at compilation time. Store md5 of the downloaded files to avoid uploading on HPC server the same file more than once, in case the md5 correspond.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/request_parser.c (modified) (5 diffs)

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

@@ -521 +521 @@
   int l = 0;
   map* version=getMapFromMaps(*main_conf,"main","rversion");
+  map* memory=getMapFromMaps(*main_conf,"main","memory");
   int vid=getVersionId(version->value);
   for (k=0; k < nodes->nodeNr; k++)
@@ -788 +789 @@
                                                           INTERNET_OPEN_TYPE_PRECONFIG,
                                                           NULL, NULL, 0);
+#ifndef WIN32
                                 if (!CHECK_INET_HANDLE (bInternet))
                                   fprintf (stderr,
                                            "WARNING : bInternet handle failed to initialize");
+#endif
                                 bInternet.waitingRequests[0] =
                                   strdup ((char *) val);
@@ -1109 +1112 @@
               }
             }
+          if(memory!=NULL && strncasecmp(memory->value,"load",4)!=0)
+            if(getMap(tmpmaps->content,"to_load")==NULL){
+              addToMap(tmpmaps->content,"to_load","false");
+            }
           {
             map* test=getMap(tmpmaps->content,"value");
@@ -1189 +1196 @@
     }
   }
+  return 0;
 }
 
@@ -1970 +1978 @@
           addToMap(res->content,name,token1);
         free(name);
+        name=NULL;
         i=0;
       }
       token1 = strtok_r (NULL, "=", &saveptr1);
     }
+    if(name!=NULL)
+      free(name);
     token = strtok_r (NULL, "; ", &saveptr);
   }