Changeset 27160

Timestamp:

Mar 3, 2010, 1:54:33 PM (16 years ago)

Author:

Paul Price

Message:

Reorganise so that statistics file gets written out even when we don't make it to the bottom of ppStackLoop().

Location:

trunk/ppStack/src

Files:

• ppStack.c (modified) (3 diffs)
• ppStackFinish.c (modified) (1 diff)
• ppStackLoop.c (modified) (3 diffs)
• ppStackLoop.h (modified) (1 diff)

trunk/ppStack/src/ppStack.c

@@ -24 +24 @@
 
     pmConfig *config = pmConfigRead(&argc, argv, PPSTACK_RECIPE); // Configuration
+    ppStackOptions *options = NULL;                               // Options for stacking
     if (!config) {
         goto die;
@@ -54 +55 @@
     }
 
-    if (!ppStackLoop(config)) {
+    options = ppStackOptionsAlloc();
+    if (!ppStackLoop(config, options)) {
         goto die;
     }
@@ -76 +78 @@
             }
         }
+
+        // Write out summary statistics
+        if (options && options->stats) {
+
+            psMetadataAddS32(options->stats, PS_LIST_TAIL, "QUALITY", PS_META_REPLACE,
+                             "Bad data quality flag", options->quality);
+            psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_STACK", 0,
+                             "Total time", psTimerClear("PPSTACK_TOTAL"));
+
+            const char *statsMDC = psMetadataConfigFormat(options->stats);
+            if (!statsMDC || strlen(statsMDC) == 0) {
+                psError(PS_ERR_IO, false, "Unable to get statistics MDC file.");
+                return false;
+            }
+            if (fprintf(options->statsFile, "%s", statsMDC) != strlen(statsMDC)) {
+                psError(PS_ERR_IO, false, "Unable to write statistics MDC file.");
+                return false;
+            }
+            psFree(statsMDC);
+            if (fclose(options->statsFile) == EOF) {
+                psError(PS_ERR_IO, false, "Unable to close statistics MDC file.");
+                return false;
+            }
+            options->statsFile = NULL;
+            pmConfigRunFilenameAddWrite(config, "STATS",
+                                        psMetadataLookupStr(NULL, config->arguments, "STATS"));
+        }
+        psFree(options);
 
         // Dump configuration

trunk/ppStack/src/ppStackFinish.c

@@ -68 +68 @@
     psFree(options->outRO); options->outRO = NULL;
 
-    // Write out summary statistics
-    if (options->stats) {
-
-        psMetadataAddS32(options->stats, PS_LIST_TAIL, "QUALITY", PS_META_REPLACE,
-                         "Bad data quality flag", options->quality);
-        psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_STACK", 0,
-                         "Total time", psTimerClear("PPSTACK_TOTAL"));
-
-        const char *statsMDC = psMetadataConfigFormat(options->stats);
-        if (!statsMDC || strlen(statsMDC) == 0) {
-            psError(PS_ERR_IO, false, "Unable to get statistics MDC file.");
-            return false;
-        }
-        if (fprintf(options->statsFile, "%s", statsMDC) != strlen(statsMDC)) {
-            psError(PS_ERR_IO, false, "Unable to write statistics MDC file.");
-            return false;
-        }
-        psFree(statsMDC);
-        if (fclose(options->statsFile) == EOF) {
-            psError(PS_ERR_IO, false, "Unable to close statistics MDC file.");
-            return false;
-        }
-        options->statsFile = NULL;
-        pmConfigRunFilenameAddWrite(config, "STATS", psMetadataLookupStr(NULL, config->arguments, "STATS"));
-    }
-
     return true;
 }

trunk/ppStack/src/ppStackLoop.c

@@ -50 +50 @@
 
 
-bool ppStackLoop(pmConfig *config)
+bool ppStackLoop(pmConfig *config, ppStackOptions *options)
 {
     assert(config);
@@ -56 +56 @@
     psTimerStart("PPSTACK_TOTAL");
     psTimerStart("PPSTACK_STEPS");
-
-    ppStackOptions *options = ppStackOptionsAlloc(); // Options for stacking
 
     // Setup
@@ -222 +220 @@
         return false;
     }
-    psLogMsg("ppStack", PS_LOG_INFO, "Stage 9: Final output: %f sec", psTimerClear("PPSTACK_STEPS"));
     ppStackMemDump("finish");
 

trunk/ppStack/src/ppStackLoop.h

@@ -11 +11 @@
 // Loop over the inputs, doing the combination
 bool ppStackLoop(
-    pmConfig *config                    // Configuration
+    pmConfig *config,                    // Configuration
+    ppStackOptions *options             // Options for stacking
     );