Changeset 850 for branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.c

Timestamp:

Aug 29, 2017, 10:52:39 AM (7 years ago)

Author:

djay

Message:

Fix various memory leaks and enhance the callback support. Add the prohibited keyword to the callback section to avoid calling callback for such services.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.c (modified) (8 diffs)

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

@@ -80 +80 @@
           }
           free(tmp[i]->name);
+          if(tmp[i]->format!=NULL)
+            free(tmp[i]->format);
           tmp[i]->format=zStrdup("ComplexData");
           freeMap(&tmp[i]->content);
@@ -160 +162 @@
     cur=cur->next;
   }
+  //dumpElements((*s)->outputs);
 }
 
@@ -351 +354 @@
   }
   
-  fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
-  fflush(stderr);
-  invokeCallback(m,inputs,NULL,3,0);
-  fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
-  fflush(stderr);
-
   // Produce the SBATCH File locally
   char *scriptPath=(char*)malloc((strlen(s->name)+strlen(tmpPath->value)+strlen(uuid->value)+10)*sizeof(char));
@@ -489 +486 @@
       setMapInMaps(*main_conf,"lenv","message",_("Unable to fetch the remote error log file"));
     tmpPath=getMapFromMaps(*main_conf,"lenv","message");
+    fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
+    fflush(stderr);
     invokeCallback(m,NULL,NULL,7,1);
+    fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
+    fflush(stderr);
     sprintf(tmpS, "Cannot execute the HPC ZOO-Service %s: %s", s->name, tmpPath->value);
     errorException(m,tmpS,"NoApplicableCode",NULL);
@@ -533 +534 @@
         sleep(1);
         setMapInMaps(*main_conf,"lenv","message",_("Read closed"));
+        invokeCallback(m,NULL,NULL,7,1);
         return -1;
       }else{
         if(rc<0){
           setMapInMaps(*main_conf,"lenv","message",_("Read error"));
+          invokeCallback(m,NULL,NULL,7,1);
           return -1;
         }
@@ -543 +546 @@
       res=atoi(buf);
       unlink(sname);
-      //free(sname);  
+      //free(sname);
 
       if(res==3){
@@ -597 +600 @@
           input=input->next;
         }
+        fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
+        fflush(stderr);
+        invokeCallback(m,NULL,outputs,5,1);
+        fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
+        fflush(stderr);
       }
       //free(buf);
@@ -607 +615 @@
     }
   }
+  fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
+  fflush(stderr);
   ssh_close(*main_conf);
+  fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
+  fflush(stderr);
   return res;
 }