Changeset 652 for trunk/zoo-project/zoo-kernel/response_print.c

Timestamp:

Jun 11, 2015, 3:07:11 PM (9 years ago)

Author:

djay

Message:

Better concurrency gesture for asynchronous requests, add db backend support for status informations.

File:

• trunk/zoo-project/zoo-kernel/response_print.c (modified) (9 diffs)

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

@@ -1515 +1515 @@
       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,lpid);
+      map* tmpm3=getMap(tmp_maps->content,"tmpUrl");
+      if(tmpm1!=NULL && tmpm3!=NULL){
+        if( strncasecmp( tmpm3->value, "http://", 7) == 0 ||
+            strncasecmp( tmpm3->value, "https://", 8 ) == 0 ){
+          sprintf(url,"%s/%s_%s.xml",tmpm3->value,service,tmpm2->value);
         }else
-          sprintf(url,"%s/%s/%s_%i.xml",tmpm1->value,tmpm2->value,service,lpid);
+          sprintf(url,"%s/%s_%s.xml",tmpm1->value,service,tmpm2->value);
       }
     }
@@ -1529 +1528 @@
     }
     int lpid;
-    tmpm1=getMapFromMaps(m,"lenv","usid");
-    lpid=atoi(tmpm1->value);
+    map* tmpm2=getMapFromMaps(m,"lenv","usid");
     tmpm1=getMapFromMaps(m,"main","TmpPath");
-    sprintf(stored_path,"%s/%s_%i.xml",tmpm1->value,service,lpid);
+    sprintf(stored_path,"%s/%s_%s.xml",tmpm1->value,service,tmpm2->value);
   }
 
@@ -1683 +1681 @@
   }
 
-  if(hasStoredExecuteResponse==true && status!=SERVICE_STARTED){
-    semid lid=getShmLockId(m,1);
+  if(hasStoredExecuteResponse==true && status!=SERVICE_STARTED && status!=SERVICE_ACCEPTED){
+#ifndef RELY_ON_DB
+    semid lid=acquireLock(m);//,1);
     if(lid<0){
       /* If the lock failed */
@@ -1694 +1693 @@
     }
     else{
-#ifdef DEBUG
-      fprintf(stderr,"LOCK %s %d !\n",__FILE__,__LINE__);
 #endif
-      lockShm(lid);
       /* We need to write the ExecuteResponse Document somewhere */
       FILE* output=fopen(stored_path,"w");
@@ -1709 +1705 @@
         xmlCleanupParser();
         zooXmlCleanupNs();
+#ifndef RELY_ON_DB
         unlockShm(lid);
+#endif
         return;
       }
@@ -1718 +1716 @@
       xmlFree(xmlbuff);
       fclose(output);
+#ifndef RELY_ON_DB
 #ifdef DEBUG
       fprintf(stderr,"UNLOCK %s %d !\n",__FILE__,__LINE__);
 #endif
       unlockShm(lid);
-      map* test1=getMap(request,"status");
-      if(test1==NULL || strcasecmp(test1->value,"true")!=0){
-        removeShmLock(m,1);
-      }
-    }
+      map* v=getMapFromMaps(m,"lenv","sid");
+      // Remove the lock when running as a normal task
+      if(getpid()==atoi(v->value)){
+        removeShmLock (m, 1);
+      }
+    }
+#endif
   }
   printDocument(m,doc,pid);
@@ -2316 +2317 @@
 #endif
     maps* tmpI=request_outputs;
-
+    map* usid=getMapFromMaps(m,"lenv","usid");
+    int itn=0;
     while(tmpI!=NULL){
 #ifdef USE_MS
@@ -2354 +2356 @@
           }
 
-          if(gfile==NULL){
+          if(gfile==NULL) {
             map *ext=getMap(tmpI->content,"extension");
             char *file_path;
@@ -2369 +2371 @@
             }
                 
-            file_name=(char*)malloc((strlen(s->name)+strlen(file_ext)+strlen(tmpI->name)+1024)*sizeof(char));
-            int cpid0=cpid+time(NULL);      
-            sprintf(file_name,"%s_%s_%i.%s",s->name,tmpI->name,cpid0,file_ext);
+            file_name=(char*)malloc((strlen(s->name)+strlen(usid->value)+strlen(file_ext)+strlen(tmpI->name)+45)*sizeof(char));
+            sprintf(file_name,"%s_%s_%s_%d.%s",s->name,tmpI->name,usid->value,itn,file_ext);
+            itn++;
             file_path=(char*)malloc((strlen(tmp1->value)+strlen(file_name)+2)*sizeof(char));
             sprintf(file_path,"%s/%s",tmp1->value,file_name);
     
-                FILE *ofile=fopen(file_path,"wb");
+            FILE *ofile=fopen(file_path,"wb");
             if(ofile==NULL){
               char tmpMsg[1024];