Changeset 851 for branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Aug 31, 2017, 4:14:46 PM (7 years ago)

Author:

djay

Message:

Invoke callback asynchronously. Still the ZOO-Kernel has still to wait for every requests to finish before stoping its execution.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (6 diffs)

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

@@ -2269 +2269 @@
   _tmpMaps = createMaps("renv");
   for (; s; ei++) {
-    int len=strlen(s);
-    char* tmpName=zStrdup(s);
-    char* tmpValue=strstr(s,"=")+1;
-    char* tmpName1=(char*)malloc((1+(len-strlen(tmpValue)))*sizeof(char));
-    snprintf(tmpName1,(len-strlen(tmpValue))+1,"%s",tmpName);
-    if(_tmpMaps->content == NULL)
-      _tmpMaps->content = createMap (tmpName1,tmpValue);
-    else
-      addToMap (_tmpMaps->content,tmpName1,tmpValue);
-    free(tmpName);
-    free(tmpName1);
+    if(strstr(s,"=")!=NULL && strlen(strstr(s,"="))>1){
+      int len=strlen(s);
+      char* tmpName=zStrdup(s);
+      char* tmpValue=strstr(s,"=")+1;
+      char* tmpName1=(char*)malloc((1+(len-strlen(tmpValue)))*sizeof(char));
+      snprintf(tmpName1,(len-strlen(tmpValue))+1,"%s",tmpName);
+      if(_tmpMaps->content == NULL)
+        _tmpMaps->content = createMap (tmpName1,tmpValue);
+      else
+        addToMap (_tmpMaps->content,tmpName1,tmpValue);
+      free(tmpName1);
+      free(tmpName);
+    }
     s = *(orig+ei);
   }
@@ -2353 +2355 @@
       loadServiceAndRun (&m, s1, request_inputs, &request_input_real_format,
                          &request_output_real_format, &eres);
+#ifdef RELY_ON_DB
+#ifdef META_DB
+      close_sql(m,1);
+      //end_sql();
+#endif
+      close_sql(m,0);
+#endif      
     }
   else
@@ -2586 +2595 @@
   if (((int) getpid ()) != cpid || cgiSid != NULL)
     {
+      fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
+      fflush(stderr);
+      invokeCallback(m,NULL,request_output_real_format,5,1);
+      fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
+      fflush(stderr);
+
       fclose (stdout);
 
@@ -2611 +2626 @@
       recordResponse(m,fbkp1);
       fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
-      invokeCallback(m,NULL,request_output_real_format,5,1);
+      invokeCallback(m,NULL,request_output_real_format,6,0);
       fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
 #endif
@@ -2617 +2632 @@
       free(bmap);
       unlink (fbkp1);
+      unhandleStatus (m);
+#ifdef RELY_ON_DB
+#ifdef META_DB
+      cleanupCallbackThreads();
+      close_sql(m,1);
+      //end_sql();
+#endif
+      close_sql(m,0);
+#endif
       unlink (flog);
-      unhandleStatus (m);
-#ifdef META_DB
-      close_sql(m,0);
-      //end_sql();
-#endif
       free(fbkpid);
       free(fbkpres); 
@@ -2630 +2649 @@
       if(cgiSid!=NULL)
         free(cgiSid);
-      //InternetCloseHandle (&hInternet);  
+      //InternetCloseHandle (&hInternet);
       fprintf (stderr, "RUN IN BACKGROUND MODE %s %d \n",__FILE__,__LINE__);
       fflush(stderr);