Changeset 514 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Oct 27, 2014, 4:46:05 PM (9 years ago)

Author:

djay

Message:

Use unique identifier as reference for asynchronous service execution.

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (7 diffs)

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

@@ -125 +125 @@
 
 char* getKeyValue(maps* conf){
+  if(conf==NULL)
+     return "700666";
   map *tmpMap=getMapFromMaps(conf,"lenv","lid");
   if(tmpMap==NULL)
-    tmpMap=getMapFromMaps(conf,"lenv","sid");
+    tmpMap=getMapFromMaps(conf,"lenv","usid");
   char* key="-1";
   if(tmpMap!=NULL){
@@ -202 +204 @@
   char *s=NULL;
   map *tmpMap1;
-  map *tmpMap=getMapFromMaps(conf,"lenv","sid");
+  map *tmpMap=getMapFromMaps(conf,"lenv","usid");
   semid lockid=getShmLockId(conf,1);
   if(lockid==NULL){
@@ -337 +339 @@
 
 int getKeyValue(maps* conf){
+  if(conf==NULL)
+     return 700666;
   map *tmpMap=getMapFromMaps(conf,"lenv","lid");
   if(tmpMap==NULL)
-    tmpMap=getMapFromMaps(conf,"lenv","sid");
+    tmpMap=getMapFromMaps(conf,"lenv","usid");
   int key=-1;
   if(tmpMap!=NULL)
@@ -449 +453 @@
   void *shm;
   struct shmid_ds shmids;
-  map *tmpMap=getMapFromMaps(conf,"lenv","sid");
+  map *tmpMap=getMapFromMaps(conf,"lenv","usid");
   if(tmpMap!=NULL){
     key=atoi(tmpMap->value);
@@ -531 +535 @@
 #endif
     }else{
-      return (char*)shm;
+      char *ret=strdup((char*)shm);
+      shmdt((void *)shm);
+      return ret;
     }
   }
@@ -1718 +1724 @@
       map* tmpm=getMap(tmp_maps->content,"rewriteUrl");
       map *tmp_lenv=NULL;
-      tmp_lenv=getMapFromMaps(m,"lenv","sid");
+      tmp_lenv=getMapFromMaps(m,"lenv","usid");
       if(tmp_lenv==NULL)
         sprintf(currentSid,"%i",pid);
@@ -1735 +1741 @@
       }
     }else{
-      map* tmpm2=getMap(tmp_maps->content,"tmpUrl");
+      int lpid;
+      map* tmpm2=getMapFromMaps(m,"lenv","usid");
+      lpid=atoi(tmpm2->value);
+      tmpm2=getMap(tmp_maps->content,"tmpUrl");
       if(tmpm1!=NULL && tmpm2!=NULL){
         if( strncasecmp( tmpm2->value, "http://", 7) == 0 ||
             strncasecmp( tmpm2->value, "https://", 8 ) == 0 ){
-          sprintf(url,"%s/%s_%i.xml",tmpm2->value,service,pid);
+          sprintf(url,"%s/%s_%i.xml",tmpm2->value,service,lpid);
         }else
-          sprintf(url,"%s/%s/%s_%i.xml",tmpm1->value,tmpm2->value,service,pid);
+          sprintf(url,"%s/%s/%s_%i.xml",tmpm1->value,tmpm2->value,service,lpid);
       }
     }
     if(tmpm1!=NULL)
       sprintf(tmp,"%s",tmpm1->value);
+    int lpid;
+    tmpm1=getMapFromMaps(m,"lenv","usid");
+    lpid=atoi(tmpm1->value);
     tmpm1=getMapFromMaps(m,"main","TmpPath");
-    sprintf(stored_path,"%s/%s_%i.xml",tmpm1->value,service,pid);
+    sprintf(stored_path,"%s/%s_%i.xml",tmpm1->value,service,lpid);
   }