Changeset 507 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Oct 8, 2014, 11:38:12 AM (10 years ago)

Author:

djay

Message:

Add concurrency gesture for background services. Fix tickets #102 and #103.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (6 diffs)

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

@@ -2629 +2629 @@
        * process answer to http client.
        */
+#ifndef WIN32
+      zSleep(1);
+#endif
       r_inputs=getMapFromMaps(m,"main","tmpPath");
       map* r_inputs1=getMap(s1->content,"ServiceProvider");
@@ -2641 +2644 @@
 #endif
       freopen(flog, "w+", stderr);
+      semid lid=getShmLockId(m,1);
+      fflush(stderr);
+      if(lid<0){
+        fprintf(stderr,"ERROR %s %d\n",__FILE__,__LINE__);
+        fflush(stderr);
+        return -1;
+      }
+      else{
+        if(lockShm(lid)<0){
+          fprintf(stderr,"ERROR %s %d\n",__FILE__,__LINE__);
+          fflush(stderr);
+          return -1;
+        }
+        fflush(stderr);
+      }
       f0=freopen(fbkp , "w+", stdout);
+      rewind(stdout);
 #ifndef WIN32
       fclose(stdin);
@@ -2654 +2673 @@
       printProcessResponse(m,request_inputs,cpid,s1,r_inputs1->value,SERVICE_STARTED,
                            request_input_real_format,request_output_real_format);
-#ifndef WIN32
       fflush(stdout);
-      rewind(stdout);
-#else
-#endif
+      unlockShm(lid);
+      fflush(stderr);
       fbkp1=(char*)malloc((strlen(r_inputs->value)+strlen(r_inputs1->value)+1024)*sizeof(char));
       sprintf(fbkp1,"%s/%s_final_%d.xml",r_inputs->value,r_inputs1->value,cpid);
@@ -2697 +2714 @@
     fclose(stdout);
     fclose(stderr);
-    unhandleStatus(m);
     /**
      * Dump back the final file fbkp1 to fbkp
@@ -2704 +2720 @@
     fclose(f1);
     FILE* f2=fopen(fbkp1,"rb");
+    semid lid=getShmLockId(m,1);
+    if(lid<0)
+      return -1;
+    lockShm(lid);
     FILE* f3=fopen(fbkp,"wb+");
     free(fbkp);
@@ -2714 +2734 @@
     fclose(f2);
     fclose(f3);
+    unlockShm(lid);
     unlink(fbkp1);
     free(fbkp1);
     free(tmps1);
+    unhandleStatus(m);
   }