Changeset 30595

Timestamp:

Feb 13, 2011, 10:45:16 AM (15 years ago)

Author:

eugene

Message:

psKernelAlloc now reports file & line; fix bug in psKernelTruncate; limit leak dump to 500 leaks; cleanup log formats (indent by depth, split lines with function name); add test samples for psImageCovariance

Location:

trunk/psLib

Files:

• src/imageops (modified) (1 prop)
• src/imageops/psImageConvolve.c (modified) (6 diffs)
• src/imageops/psImageConvolve.h (modified) (2 diffs)
• src/imageops/psImageCovariance.c (modified) (1 diff)
• src/sys/psLogMsg.c (modified) (3 diffs)
• src/sys/psMemory.c (modified) (1 diff)
• test/imageops/Makefile.am (modified) (1 diff)
• test/imageops/samples (copied) (copied from branches/eam_branches/ipp-20101205/psLib/test/imageops/samples )
• test/imageops/samples/conv.sample1.001.fits (copied) (copied from branches/eam_branches/ipp-20101205/psLib/test/imageops/samples/conv.sample1.001.fits )
• test/imageops/samples/conv.sample1.002.fits (copied) (copied from branches/eam_branches/ipp-20101205/psLib/test/imageops/samples/conv.sample1.002.fits )
• test/imageops/samples/incovar.sample1.001.fits (copied) (copied from branches/eam_branches/ipp-20101205/psLib/test/imageops/samples/incovar.sample1.001.fits )
• test/imageops/samples/incovar.sample1.002.fits (copied) (copied from branches/eam_branches/ipp-20101205/psLib/test/imageops/samples/incovar.sample1.002.fits )
• test/imageops/tap_psImageCovariance.c (copied) (copied from branches/eam_branches/ipp-20101205/psLib/test/imageops/tap_psImageCovariance.c )
• test/math (modified) (1 prop)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -67 +67 @@
 }
 
-psKernel *psKernelAlloc(int xMin, int xMax, int yMin, int yMax)
+psKernel *p_psKernelAlloc(const char *file,
+                          unsigned int lineno,
+                          const char *func,
+                          int xMin, int xMax, int yMin, int yMax)
 {
     // Check the inputs to make sure max > min; if not, switch.
@@ -91 +94 @@
     int numCols = xMax - xMin + 1;      // Number of columns for kernel image
 
-    psKernel *kernel = psAlloc(sizeof(psKernel)); // The kernel, to be returned
+    psKernel *kernel = p_psAlloc(file, lineno, func, sizeof(psKernel)); // The kernel, to be returned
     psMemSetDeallocator(kernel,(psFreeFunc)kernelFree);
 
@@ -272 +275 @@
     float threshold = sumKernel * (1.0 - frac); // Threshold for truncation
 
+    int truncateRadius = maxSize;       // Truncation radius
+    bool truncate = false;
+
     // Find truncation size
-    int truncate = 0;                     // Truncation radius
-    for (int radius = 1; truncate == 0 && radius < maxSize; radius++) {
+    for (int radius = 1; !truncate && (radius < maxSize); radius++) {
         int uMin = PS_MAX(-radius, xMin);
         int uMax = PS_MIN(radius, xMax);
@@ -290 +295 @@
             }
         }
+        // This is the truncation radius
         if (sum > threshold) {
-            // This is the truncation radius
-            truncate = radius;
-        }
-    }
-    if (truncate == maxSize) {
-        // No truncation possible
+            truncate = true;
+            truncateRadius = radius;
+        }
+    }
+
+    // Do nothing if no truncation is possible
+    if (!truncate) {
         return true;
     }
@@ -302 +309 @@
     // Truncate the kernel
     {
-        int uMin = PS_MAX(-truncate, xMin);
-        int uMax = PS_MIN(truncate, xMax);
-        int vMin = PS_MAX(-truncate, yMin);
-        int vMax = PS_MIN(truncate, yMax);
-        int r2 = PS_SQR(truncate);
+        int uMin = PS_MAX(-truncateRadius, xMin);
+        int uMax = PS_MIN(truncateRadius, xMax);
+        int vMin = PS_MAX(-truncateRadius, yMin);
+        int vMax = PS_MIN(truncateRadius, yMax);
+        int r2 = PS_SQR(truncateRadius);
         for (int v = vMin; v <= vMax; v++) {
             int v2 = PS_SQR(v);
@@ -317 +324 @@
         }
     }
-    kernel->xMin = PS_MAX(-truncate, kernel->xMin);
-    kernel->xMax = PS_MIN(truncate, kernel->xMax);
-    kernel->yMin = PS_MAX(-truncate, kernel->yMin);
-    kernel->yMax = PS_MIN(truncate, kernel->yMax);
+    kernel->xMin = PS_MAX(-truncateRadius, kernel->xMin);
+    kernel->xMax = PS_MIN(truncateRadius, kernel->xMax);
+    kernel->yMin = PS_MAX(-truncateRadius, kernel->yMin);
+    kernel->yMax = PS_MIN(truncateRadius, kernel->yMax);
 
     return true;

trunk/psLib/src/imageops/psImageConvolve.h

@@ -84 +84 @@
 /// @return psKernel*          A new kernel object
 ///
+#ifdef DOXYGEN
 psKernel *psKernelAlloc(
     int xMin,                          ///< Most negative x index
@@ -89 +90 @@
     int yMin,                          ///< Most negative y index
     int yMax                           ///< Most positive y index
+);
+#else // ifdef DOXYGEN
+psKernel *p_psKernelAlloc(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    int xMin,                          ///< Most negative x index
+    int xMax,                          ///< Most positive x index
+    int yMin,                          ///< Most negative y index
+    int yMax                           ///< Most positive y index
 ) PS_ATTR_MALLOC;
+#define psKernelAlloc(xMin, xMax, yMin, yMax)                           \
+    p_psKernelAlloc(__FILE__, __LINE__, __func__, (xMin), (xMax), (yMin), (yMax))
+#endif // ifdef DOXYGEN
 
 /// Allocate a convolution kernel from a provided image

trunk/psLib/src/imageops/psImageCovariance.c

@@ -30 +30 @@
     return covar;
 }
+
+/** 
+
+ * changes from 28666
+ ** add scale to imageCovarianceCalculate (& multiply at return)
+ ** add scale to imageCovarianceCalculateThread
+
+ ** accumulate scale (sum kernel^2) in psImageCovarianceCalculate and pass to imageCovarianceCalculate
+ ** accumulate scale (sum kernel^2) in psImageCovarianceCalculateFactor and pass to imageCovarianceCalculate
+
+ **/
 
 /// Calculation of covariance matrix element when convolving

trunk/psLib/src/sys/psLogMsg.c

@@ -291 +291 @@
         head_ptr += strlen(head_ptr);
     }
-    // Hostname should be 20 characters.
+
+    // Hostname should be 10 characters.
     if (logHost) {
         if (head_ptr > head) {
             *head_ptr++ = '|';
         }
-        maxLength -= snprintf(head_ptr, maxLength, "%-20s", hostname);
+        maxLength -= snprintf(head_ptr, maxLength, " %s ", hostname);
         head_ptr += strlen(head_ptr);
     }
@@ -310 +311 @@
             *head_ptr++ = '|';
         }
-        maxLength -= snprintf(head_ptr, maxLength, "%s", name);
+        maxLength -= snprintf(head_ptr, maxLength, "%s|\n", name);
 
         head_ptr += strlen(head_ptr);
-    }
-
-    if (head_ptr > head) {
-        *head_ptr++ = '\n';
-    } else if (!logMsg) {                  // no output desired
+    } else {
+      if (head_ptr > head) {
+        *head_ptr++ = '|';
+      }
+    }
+
+    // rather than putting in a return for the message, let's only put in the return if we asked for the function name
+    if ((head_ptr == head) && !logMsg) { // no output desired
         return;
     }
@@ -332 +336 @@
         char *line = strtok_r(msg, "\n", &msgPtr);
         while (line) {
-            if(write(logFD, "    ", 4)) {;} // ignore return value
+            if(write(logFD, "          ", PS_MIN(2*level, 10))) {;} // ignore return value
             if(write(logFD, line, strlen(line))) {;} // ignore return value
             if(write(logFD, "\n", 1)) {;} // ignore return value

trunk/psLib/src/sys/psMemory.c

@@ -626 +626 @@
             nleak++;
 
-            if (fd != NULL) {
+            // only print a max of 500 leaks (make this an argument)
+            if ((nleak < 500) && (fd != NULL)) {
                 if (nleak == 1) {
                     fprintf(fd, "# func at (file:line)  ID: X  Ref: X\n");

trunk/psLib/test/imageops/Makefile.am

@@ -26 +26 @@
         tap_psImageMapFit \
         tap_psImageMapFit2 \
-        tap_psImageMaskOps
+        tap_psImageMaskOps \
+        tap_psImageCovariance
 
 #       tap_psImageShiftKernel