Changeset 8417 for trunk/ppMerge/src/ppMergeCombine.c

Timestamp:

Aug 17, 2006, 4:54:10 PM (20 years ago)

Author:

Paul Price

Message:

Was having trouble with memory blowout. Added (compile-time) option
to read cells all at once, but this didn't fix anything (and hence
option now disabled). Turns out problem is in psRealloc, which was
being triggered by the vast number of psTrace calls:
pmReadoutCombine->psStats->psTrace->psStringAppend->psRealloc. Problem
was mitigated in psLib, but I have kept some of the diagnostic functions
around (#if-ed out) in case they are needed later.

File:

• trunk/ppMerge/src/ppMergeCombine.c (modified) (8 diffs)

trunk/ppMerge/src/ppMergeCombine.c

@@ -9 +9 @@
 #include "ppMergeCombine.h"
 
+#if 0
+static psMemId memId = 0;
+
+static FILE *dumpFile = NULL;
+
+static psMemId mbAlloc(psMemBlock *mb)
+{
+    if (!dumpFile) {
+        dumpFile = fopen("memBlocks.dat", "w");
+    }
+    fprintf(dumpFile, "Alloc: %12lu\t%12zd\t%s:%d\n", mb->id, mb->userMemorySize,
+            mb->file, mb->lineno);
+    return 1;
+}
+
+static void dumpDone(void)
+{
+    fclose(dumpFile);
+    exit(EXIT_FAILURE);
+}
+
+
+static void memDump(void)
+{
+    psMemBlock **leaks = NULL;
+    int numLeaks = psMemCheckLeaks(memId, &leaks, NULL, true);
+    FILE *memFile = fopen("mem.dat", "w");
+    fprintf(memFile, "# MemBlock Size Source\n");
+    for (int i = 0; i < numLeaks; i++) {
+        psMemBlock *mb = leaks[i];
+        fprintf(memFile, "%12lu\t%12zd\t%s:%d\n", mb->id, mb->userMemorySize,
+                mb->file, mb->lineno);
+    }
+    fclose(memFile);
+    psFree(leaks);
+}
+
 static void memCheck(void)
 {
+    return;
     if (psTraceGetLevel(__func__) > 9) {
         psMemBlock **leaks = NULL;
@@ -32 +70 @@
     return;
 }
-
+#endif
 
 // Combine the inputs
@@ -42 +80 @@
     )
 {
-
     psArray *filenames = psMetadataLookupPtr(NULL, config->arguments, "INPUT"); // The input file names
     assert(filenames);                  // It should be here --- it's put here in ppMergeConfig
@@ -86 +123 @@
             }
 
+#if 1
+            // Read bit by bit
+
             int numRead;  // Number of inputs read
             int numScan = 0;
@@ -124 +164 @@
                 numScan++;
 
-                memCheck();
-
             } while (numRead > 0);
+
+#else
+            // Read whole cells at a time
+
+            printf("Chip %d, cell %d\n", i, j);
+            int numRead = 0;  // Number of inputs read
+            for (int k = 0; k < filenames->n; k++) {
+                if (! filenames->data[k] || strlen(filenames->data[k]) == 0) {
+                    continue;
+                }
+                psFits *fits = data->files->data[k]; // FITS file handle
+                if (!fits) {
+                    psError(PS_ERR_IO, false, "Unable to open input file %s --- ignored.\n",
+                            filenames->data[k]);
+                    continue;
+                }
+                pmFPA *fpaIn = data->in->data[k]; // Input FPA
+                pmChip *chipIn = fpaIn->chips->data[i]; // Input chip
+                pmCell *cellIn = chipIn->cells->data[j]; // Input cell
+                if (!cellIn->file_exists || !cellIn->data_exists) {
+                    continue;
+                }
+                if (!pmCellRead(cellIn, fits, config->database) || cellIn->readouts->n == 0) {
+                    continue;
+                }
+                stack->data[k] = cellIn->readouts->data[0];
+                numRead++;
+            }
+            if (numRead > 0) {
+                pmReadoutCombine(readout, stack, cellZeros, cellScales, options->combine);
+                psTrace(__func__, 5, "Chip %d, cell %d\n", i, j);
+            }
+
+            memCheck();
+#endif
+
             psFree(readout);            // Drop reference
             psFree(stack);
@@ -144 +218 @@
                 pmCellFreeData(cell);
             }
-
-            memCheck();
         }
 
@@ -161 +233 @@
             pmChipFreeData(chip);
         }
-
-        memCheck();
     }
 
@@ -178 +248 @@
     pmFPAFreeData(data->out);
 
-    memCheck();
-
     return true;
-}
+
+}