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

Timestamp:

Jan 3, 2019, 12:44:57 PM (5 years ago)

Author:

knut

Message:

Added some new logging functionality (function logMessage(), macros zooLog, zooLogMsg). Added utility functions setErrorMessage(), hasvalue(), and nonempty() in service.c. Added enum WPSException and arrays WPSExceptionText and WPSExceptionCode (see also function setErrorMessage). New conditional definition of type bool in service.c (to fix issue with bool). Null pointer check in function addToMap. Added missing return values and explicit type casts in some functions. Removed Windows-specific code in function dumpBackFinalFile (zoo_service_loader.c) that may cause error for async raw data output in formats other than XML.

File:

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

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

@@ -159 +159 @@
   lockShm (lid);
 #endif
-  FILE *f3 = fopen (fbkp, "wb+");
-  free (fbkp);
+  FILE *f3 = fopen (fbkp, "wb+");  
+  free (fbkp);  
   fseek (f2, 0, SEEK_END);
   long flen = ftell (f2);
   fseek (f2, 0, SEEK_SET);
   char *tmps1 = (char *) malloc ((flen + 1) * sizeof (char));
-  fread (tmps1, flen, 1, f2);
+  fread (tmps1, flen, 1, f2);  
 #ifdef WIN32
-  char *pchr=strrchr(tmps1,'>');
-  flen=strlen(tmps1)-strlen(pchr)+1;
-  tmps1[flen]=0;
-#endif
+  /* knut: I think this block can be dropped; pchr may be NULL if result is not in XML format
+  char *pchr=strrchr(tmps1,'>');   
+  flen=strlen(tmps1)-strlen(pchr)+1;  
+  tmps1[flen]=0;  
+  */
+#endif  
   fwrite (tmps1, 1, flen, f3);
+  free(tmps1);
   fclose (f2);
-  fclose (f3);
+  fclose (f3);  
   return 1;
 }
@@ -2218 +2221 @@
           addToMap(bmap->content,"sid",tmpm->value);
           addIntToMap(bmap->content,"pid",getpid());
-          
+                  
           // Create PID file referencing the OS process identifier
           fbkpid =
@@ -2309 +2312 @@
             if(dumpBackFinalFile(m,fbkp,fbkp1)<0)
               return -1;
-            unlink (fbkpid);
+            unlink (fbkpid);            
             unhandleStatus (m);
             freeMaps (&m);
@@ -2364 +2367 @@
   signal (SIGABRT, donothing);
 #endif
-
   if (((int) getpid ()) != cpid || cgiSid != NULL)
-    {
+    {     
       fclose (stdout);
       fclose (stderr);
@@ -2372 +2374 @@
       fclose (f0);
       fclose (f1);
-
-      if(dumpBackFinalFile(m,fbkp,fbkp1)<0)
-        return -1;
-      unlink (fbkpid);
+         
+          if (dumpBackFinalFile(m, fbkp, fbkp1) < 0)
+                  return -1;
+        
+      unlink (fbkpid);    
       switch(eres){
       default:
@@ -2387 +2390 @@
         break;
       }      
-#ifndef RELY_ON_DB
+#ifndef RELY_ON_DB        
       dumpMapsToFile(bmap,fbkpres,1);
       removeShmLock (m, 1);