Changeset 917 for trunk/zoo-project/zoo-kernel/service_internal_ruby.c

Timestamp:

May 7, 2019, 2:17:08 PM (5 years ago)

Author:

djay

Message:

Merge prototype-v0 branch in trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• zoo-project/zoo-kernel/service_internal_ruby.c (modified) (6 diffs)

trunk/zoo-project/zoo-kernel/service_internal_ruby.c

@@ -260 +260 @@
   int hasSize=0;
   map* isArray=getMap(tmp,"isArray");
+  map* useFile=getMap(tmp,"use_file");
   map* size=getMap(tmp,"size");
   map* tmap=getMapType(tmp);
@@ -271 +272 @@
         VALUE mvalue=rb_ary_new2(cnt);
         VALUE svalue=rb_ary_new2(cnt);
+        VALUE cvalue=rb_ary_new2(cnt);
 
         for(int i=0;i<cnt;i++){
@@ -276 +278 @@
           map* vMap=getMapArray(tmp,"value",i);     
           map* sMap=getMapArray(tmp,"size",i);
+          map* uMap=getMapArray(tmp,"use_file",i);
+          map* cMap=getMapArray(tmp,"cache_file",i);
 
           if(vMap!=NULL){
@@ -281 +285 @@
             VALUE lvalue;
             VALUE lsvalue;
-            if(sMap==NULL){
+            VALUE lcvalue;
+            if(sMap==NULL || uMap==NULL){
               lvalue=rb_str_new2(vMap->value);
-              lsvalue=Qnil;
+              if(sMap==NULL)
+                lsvalue=Qnil;
+              else
+                lsvalue=rb_str_new2(sMap->value);
             }
             else{
@@ -290 +298 @@
               hasSize=1;
             }
+            if(uMap!=NULL)
+              lcvalue=rb_str_new2(cMap->value);
+            else
+              lcvalue=Qnil;
 
             rb_ary_push(value,lvalue);
             rb_ary_push(svalue,lsvalue);
+            rb_ary_push(cvalue,lcvalue);
           }
           
@@ -308 +321 @@
         rb_hash_aset(res, name, mvalue);
         rb_hash_aset(res, rb_str_new2(tmap->name), mvalue);
+        VALUE lname0=rb_str_new2("cache_size");
+        rb_hash_aset(res, lname0, value);
       
         if(hasSize>0){