Changeset 508 for trunk/zoo-project

Timestamp:

Oct 8, 2014, 4:28:05 PM (10 years ago)

Author:

djay

Message:

Stop blowing the stack in ulinet. Add API function addToMapWithSize for assigning binary data to map. Add support for binary inputs/outputs for the PHP language.

Location:

trunk/zoo-project/zoo-kernel

Files:

• service.h (modified) (1 diff)
• service_internal_php.c (modified) (12 diffs)
• service_internal_python.c (modified) (1 diff)
• ulinet.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/service.h

@@ -437 +437 @@
       tmp->value=zStrdup(v);
     }
+  }
+
+  static void addToMapWithSize(map* m,const char* n,const char* v,int size){
+    if(hasKey(m,n)==false){
+      map* _cursor=m;
+      if(_cursor!=NULL){
+        addToMap(m,n,"");
+      }else{
+        m=createMap(n,"");
+      }
+    }
+    map *tmp=getMap(m,n);
+    if(tmp->value!=NULL)
+      free(tmp->value);
+    tmp->value=(char*)malloc((size+1)*sizeof(char));
+    memmove(tmp->value,v,size*sizeof(char));
+    tmp->value[size]=0;
+    char sin[128];
+    sprintf(sin,"%ld",size);
+    addToMap(m,"size",sin);
   }
 

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

@@ -56 +56 @@
 
   php_embed_init(0,NULL,&tsrm_ls);
-
-  fprintf(stderr,"PHP EMBEDED\n");
   
   zend_try {
-    fprintf(stderr,"PHP EMBEDED include script %s\n",tmp->value);
     php_execute_script(&iscript TSRMLS_CC);
-    fprintf(stderr,"PHP EMBEDED include script done\n");
 
     zval *iargs[3];
@@ -68 +64 @@
       
     ZVAL_STRING(&ifunc, s->name, 0);
-    fprintf(stderr,"PHP EMBEDED include script done\n");
     iargs[0] = php_Array_from_maps(*main_conf);
-    fprintf(stderr,"PHP EMBEDED include script done\n");
     iargs[1] = php_Array_from_maps(*real_inputs);
-    fprintf(stderr,"PHP EMBEDED include script done\n");
     iargs[2] = php_Array_from_maps(*real_outputs);
-    fprintf(stderr,"PHP EMBEDED include script done\n");
     
     call_user_function(EG(function_table), NULL, &ifunc, &iret, 3, iargs TSRMLS_CC);
@@ -81 +73 @@
     *real_outputs=php_maps_from_Array(t);
     
-    dumpMaps(*real_outputs);
-
     char tmp1[1024];
-
-    sprintf(tmp1,"PHP EMBEDED ran function successfully and return %d !?",Z_STRVAL(iret));
 
     res=SERVICE_SUCCEEDED;
@@ -106 +94 @@
   maps* tmp=t;
   int tres=0;
-  fprintf(stderr,"arra_init\n");
   MAKE_STD_ZVAL(mapArray);
   tres=array_init(mapArray);
-  fprintf(stderr,"arra_init %d\n",tres);
   while(tmp!=NULL){
     add_assoc_zval(mapArray,tmp->name,php_Array_from_map(tmp->content));
@@ -122 +108 @@
   map* tmp=t;
   int tres=0;
-  fprintf(stderr,"arra_init\n");
   MAKE_STD_ZVAL(mapArray);
   tres=array_init(mapArray);
-  fprintf(stderr,"arra_init\n");
   while(tmp!=NULL){
-    fprintf(stderr,"=> %s %d %s %d \n",tmp->name,strlen(tmp->name),tmp->value,strlen(tmp->value));
-    tres=add_assoc_string(mapArray,tmp->name,tmp->value,1);
+    map* sMap=getMapArray(tmp,"size",i);
+    if(strncmp(tmp->name,"value",5)==0 && sMap!=NULL){
+      tres=add_assoc_stringl(mapArray,tmp->name,tmp->value,atoi(sMap->value),1);
+    }else
+      tres=add_assoc_string(mapArray,tmp->name,tmp->value,1);
     tmp=tmp->next;
   }
@@ -135 +122 @@
 
 maps* php_maps_from_Array(HashTable *t){
-  //#ifdef DEBUG
-  fprintf(stderr,"mapsFromPHPArray start\n");
-  //#endif
   maps* final_res=NULL;
   maps* cursor=final_res;
@@ -150 +134 @@
     zval **ppzval, tmpcopy; 
     type = zend_hash_get_current_key_ex(t, &key, &keylen, &idx, 0, NULL); 
-    fprintf(stderr,"key : %s\n",key);
     if (zend_hash_get_current_data(t, (void**)&ppzval) == FAILURE) { 
       /**
@@ -161 +144 @@
      */
     tmpcopy = **ppzval;
-    fprintf(stderr,"key : %s\n",key);
+#ifdef DEBUG
+    fprintf(stderr,"key : %s\n",key);
+#endif
     zval_copy_ctor(&tmpcopy); 
-    fprintf(stderr,"key : %s\n",key);
+#ifdef DEBUG
+    fprintf(stderr,"key : %s\n",key);
+#endif
     /**
      * Reset refcount & Convert
@@ -178 +165 @@
     fprintf(stderr,"key : %s\n",key);
     HashTable* t=HASH_OF(*ppzval);
-    fprintf(stderr,"key : %s\n",key);
+#ifdef DEBUG
+    fprintf(stderr,"key : %s\n",key);
+#endif
     cursor->content=php_map_from_HasTable(t);
     cursor->next=NULL;
@@ -185 +174 @@
     else
       addMapsToMaps(&final_res,cursor);
-    fprintf(stderr,"key : %s\n",key);
+#ifdef DEBUG
+    fprintf(stderr,"key : %s\n",key);
+#endif
     /**
      * Toss out old copy
@@ -201 +192 @@
   final_res=NULL;
   char key[1024];
-  for(zend_hash_internal_pointer_reset(t); 
-      zend_hash_has_more_elements(t) == SUCCESS; 
-      zend_hash_move_forward(t)) { 
-    char *key; 
-    uint keylen; 
-    ulong idx; 
-    int type; 
-    zval **ppzval, tmpcopy; 
+  for(zend_hash_internal_pointer_reset(t);
+      zend_hash_has_more_elements(t) == SUCCESS;
+      zend_hash_move_forward(t)) {
+    char *key;
+    uint keylen;
+    ulong idx;
+    int type;
+    int len;
+    zval **ppzval, tmpcopy;
     type = zend_hash_get_current_key_ex(t, &key, &keylen, &idx, 0, NULL); 
     if (zend_hash_get_current_data(t, (void**)&ppzval) == FAILURE) { 
@@ -223 +215 @@
      */ 
     INIT_PZVAL(&tmpcopy); 
-    convert_to_string(&tmpcopy); 
-    if(final_res==NULL){
-      fprintf(stderr,"%s => %s\n",key,Z_STRVAL(tmpcopy));
-      final_res=createMap(key,Z_STRVAL(tmpcopy));
+    convert_to_string(&tmpcopy);
+    if(strncmp(key,"value")==0){
+      len=Z_STRLEN_P(varcopy);
+      addToMapWithSize(final_res,key,Z_STRVAL_P(tmpcopy),len);
     }
     else{
-      fprintf(stderr,"%s => %s\n",key,Z_STRVAL(tmpcopy));
-      addMapToMap(&final_res,createMap(key,Z_STRVAL(tmpcopy)));
+      if(final_res==NULL){
+#ifdef DEBUG
+        fprintf(stderr,"%s => %s\n",key,Z_STRVAL(tmpcopy));
+#endif
+        final_res=createMap(key,Z_STRVAL(tmpcopy));
+      }
+      else{
+#ifdef DEBUG
+        fprintf(stderr,"%s => %s\n",key,Z_STRVAL(tmpcopy));
+#endif
+        addToMap(&final_res,key,Z_STRVAL(tmpcopy));
+      }
     }
     /* Toss out old copy */ 

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

@@ -502 +502 @@
       PyString_AsStringAndSize(value,&buffer,&size);
 #endif
-      if(res!=NULL){
-        addToMap(res,PyString_AsString(key),"");
-      }else{
-        res=createMap(PyString_AsString(key),"");
-      }
-      map* tmpR=getMap(res,"value");
-      free(tmpR->value);
-      tmpR->value=(char*)malloc((size+1)*sizeof(char));
-      memmove(tmpR->value,buffer,size*sizeof(char));
-      tmpR->value[size]=0;
-      char sin[1024];
-      sprintf(sin,"%ld",size);
-      addToMap(res,"size",sin);
+      addToMapWithSize(res,"value",buffer,size);
     }else{
       char* lkey=PyString_AsString(key);

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

@@ -61 +61 @@
   if(strncmp("Set-Cookie: ",buffer,12)==0){
     int i;
-    char env[1024];
-    char path[1024];
-    char domain[1024];
+    char env[256];
+    char path[256];
+    char domain[256];
     char* tmp;
     for(i=0;i<12;i++)