Changeset 881 for branches

Timestamp:

Sep 12, 2018, 6:05:49 PM (6 years ago)

Author:

djay

Message:

Make sure to initialize properly every field of a service.

Location:

branches/prototype-v0/zoo-project/zoo-kernel

Files:

• service.c (modified) (1 diff)
• service.h (modified) (1 diff)
• zoo_service_loader.c (modified) (5 diffs)

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

@@ -452 +452 @@
 }
 
+
+/**
+ * Allocate memory for a service.
+ * Require to call free after calling this function.
+ *
+ * @return the service
+ */
+service* createService(){
+  service *s1 = (service *) malloc (SERVICE_SIZE);
+  s1->name=NULL;
+  s1->content=NULL;
+  s1->metadata=NULL;
+  s1->additional_parameters=NULL;
+  s1->inputs=NULL;
+  s1->outputs=NULL;
+  return s1;
+}
+
 /**
  * Free allocated memory of a service.
- * Require to call free on e after calling this function.
+ * Require to be invoked for every createService call.
  *
  * @param s the service to free

branches/prototype-v0/zoo-project/zoo-kernel/service.h

@@ -296 +296 @@
   ZOO_DLL_EXPORT void freeElements(elements**);
   ZOO_DLL_EXPORT void setServiceName(service**,char*);
+  ZOO_DLL_EXPORT service* createService();
   ZOO_DLL_EXPORT void freeService(service**);
   ZOO_DLL_EXPORT void addToMap(map*,const char*,const char*);

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

@@ -337 +337 @@
             map* import = getMapFromMaps (m, IMPORTSERVICE, tmpsn);
             if (import == NULL || import->value == NULL || zoo_path_compare(tmps1, import->value) != 0 ) { // service is not in [include] block 
-              service *s1 = (service *) malloc (SERVICE_SIZE);
+              service *s1 = createService();
               if (s1 == NULL)
                 {
@@ -1523 +1523 @@
                         if(s2==NULL){
 #endif
-                          s1 = (service *) malloc (SERVICE_SIZE);
+                          s1 = createService();
                           t = readServiceFile (m, import->value, &s1, import->name);
                 
@@ -1586 +1586 @@
                          #endif
                         */
-                        s1 = (service *) malloc (SERVICE_SIZE);
+                        s1 = createService();
                         t = readServiceFile (m, buff1, &s1, tmpMapI->value);
                         if (t < 0)
@@ -1671 +1671 @@
                                   snprintf (buff1, 1024, "%s/%s", conf_dir,
                                             dp->d_name);
-                                  s1 = (service *) malloc (SERVICE_SIZE);
+                                  s1 = createService();
                                   if (s1 == NULL)
                                     {
@@ -1927 +1927 @@
   }else /* Not found in MetaDB */{
 #endif
-    s1 = (service *) malloc (SERVICE_SIZE);
+    s1 = createService();
     if (s1 == NULL)
       {