Changeset 850 for branches/prototype-v0/zoo-project/zoo-kernel/meta_sql.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/meta_sql.c (modified) (6 diffs)

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

@@ -144 +144 @@
       if(strlen(tmp)>0)
         if(*ap==NULL){
-          *ap=createMap(fields[i],tmp);
+          (*ap)=createMap(fields[i],tmp);
           addToMap(*ap,"fromDb","true");
         }
@@ -306 +306 @@
   // Extract metadata
   fillMetadata(conf,&res->metadata,input->GetFieldAsString( 0 ));
+  res->additional_parameters=NULL;
   fillAdditionalParameters(conf,&res->additional_parameters,input->GetFieldAsString( 0 ));
   res->defaults=NULL;
@@ -401 +402 @@
       if(minimal==1){
         OGRFeature::DestroyFeature( poFeature );
+        cleanFetchSql(conf,0,res);
         return s;
       }
@@ -410 +412 @@
       while( (input = inputs->GetNextFeature()) != NULL ){
         elements* in=extractInput(conf,input);
-        addToElements(&s->inputs,in);
-        freeElements(&in);
-        free(in);       
+        if(in!=NULL){
+          if(s->inputs==NULL)
+            s->inputs=dupElements(in);
+          else
+            addToElements(&s->inputs,in);
+          freeElements(&in);
+          free(in);
+        }
         OGRFeature::DestroyFeature( input );
       }
@@ -424 +431 @@
       while( (output = outputs->GetNextFeature()) != NULL ){
         elements* in=extractOutput(conf,output);
-        addToElements(&s->outputs,in);
+        if(s->outputs==NULL)
+          s->outputs=dupElements(in);
+        else
+          addToElements(&s->outputs,in);
         freeElements(&in);
         free(in);
@@ -463 +473 @@
     poFeature = res->GetNextFeature();
     while( poFeature != NULL ){
-      fprintf(stderr,"************************* %s %d\n\n",__FILE__,__LINE__);
-      fflush(stderr);
       service* s=extractServiceFromDb(conf,poFeature->GetFieldAsString( 1 ),minimal);
 #ifdef USE_HPC
       addNestedOutputs(&s);
 #endif
-      fprintf(stderr,"************************* %s %d\n\n",__FILE__,__LINE__);
-      fflush(stderr);
-      dumpMap(s->content);
-      fprintf(stderr,"************************* %s %d\n\n",__FILE__,__LINE__);
-      fflush(stderr);
       func(reg,conf,doc,n,s);
-      fprintf(stderr,"************************* %s %d\n\n",__FILE__,__LINE__);
-      fflush(stderr);
       freeService(&s);
-      fprintf(stderr,"************************* %s %d\n\n",__FILE__,__LINE__);
-      fflush(stderr);
       free(s);
       OGRFeature::DestroyFeature( poFeature );
       poFeature = res->GetNextFeature();
       result++;
-      fprintf(stderr,"************************* %s %d\n\n",__FILE__,__LINE__);
-      fflush(stderr);
-    }
-  }
-  fprintf(stderr,"************************* %s %d\n\n",__FILE__,__LINE__);
-  fflush(stderr);
+    }
+    cleanFetchSql(conf,0,res);
+  }
   return result;
 }