Changeset 863 for branches/prototype-v0/zoo-project/zoo-kernel/service_internal_python.c

Timestamp:

Feb 5, 2018, 1:19:13 PM (6 years ago)

Author:

djay

Message:

Change the default ZOO-Kernel behavior, if an input has been passed by reference, the ZOO-Service will receive a cache_file map rather than the value field which was usually returned, same for array value apply. To use the previous behavior, one can add "memory=load" to the main section of the main.cfg file. Update ZOO-Services for using this new field if available.

File:

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

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

@@ -425 +425 @@
   map* isArray=getMap(tmp,"isArray");
   map* size=getMap(tmp,"size");
+  map* useFile=getMap(tmp,"use_file");
+  map* cacheFile=getMap(tmp,"cache_file");
   map* tmap=getMapType(tmp);
   while(tmp!=NULL){
@@ -435 +437 @@
         PyObject* mvalue=PyList_New(cnt);
         PyObject* svalue=PyList_New(cnt);
+        PyObject* cvalue=PyList_New(cnt);
 
         for(int i=0;i<cnt;i++){
           
-          map* vMap=getMapArray(tmp,"value",i);     
-          map* sMap=getMapArray(tmp,"size",i);
+          map* vMap=getMapArray(t,"value",i);
+          map* uMap=getMapArray(t,"use_file",i);
+          map* sMap=getMapArray(t,"size",i);
+          map* cMap=getMapArray(t,"cache_file",i);
 
           if(vMap!=NULL){
@@ -445 +450 @@
             PyObject* lvalue;
             PyObject* lsvalue;
-            if(sMap==NULL){
+            PyObject* lcvalue;
+            if(sMap==NULL || uMap!=NULL){
               lvalue=PyString_FromString(vMap->value);
-              lsvalue=Py_None;
             }
             else{    
               lvalue=PyString_FromStringAndSize(vMap->value,atoi(sMap->value));
+            }
+            if(sMap!=NULL){
               lsvalue=PyString_FromString(sMap->value);
               hasSize=1;
             }
+            else
+              lsvalue=Py_None;
+            if(uMap!=NULL){
+              lcvalue=PyString_FromString(cMap->value);;
+            }else
+              lcvalue=Py_None;
 
             if(PyList_SetItem(value,i,lvalue)<0){
@@ -463 +476 @@
               return NULL;
             } 
+            if(PyList_SetItem(cvalue,i,lcvalue)<0){
+              fprintf(stderr,"Unable to set key value pair...");
+              return NULL;
+            }
           }
           
+          PyObject* lmvalue;
           map* mMap=getMapArray(tmp,tmap->name,i);
-          PyObject* lmvalue;
           if(mMap!=NULL){
             lmvalue=PyString_FromString(mMap->value);
@@ -487 +504 @@
           return NULL;
         }
+        if(PyDict_SetItem(res,PyString_FromString("cache_file"),cvalue)<0){
+          fprintf(stderr,"Unable to set key value pair...");
+          return NULL;
+        }
         if(hasSize>0)
           if(PyDict_SetItem(res,PyString_FromString("size"),svalue)<0){
@@ -493 +514 @@
           }
       }
-      else if(size!=NULL){
+      else if(size!=NULL && useFile==NULL){
         PyObject* value=PyString_FromStringAndSize(tmp->value,atoi(size->value));
         if(PyDict_SetItem(res,name,value)<0){