Changeset 33415 for branches/meh_branches/ppstack_test/ppTranslate/src/ppMops.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ppTranslate/src/ppMops.c (modified) (4 diffs)

branches/meh_branches/ppstack_test/ppTranslate/src/ppMops.c

@@ -3 +3 @@
 
 #include "ppMops.h"
+
+void test()
+{
+    psMetadata *md = psMetadataAlloc();
+
+    psVector *vec = psVectorAlloc(42, PS_TYPE_S32);
+
+    psMetadataAddVector(md, PS_LIST_TAIL, "TEST", 0, NULL, vec);
+
+    psFree(vec);
+    psFree(md);
+
+    psLibFinalize();
+
+    fprintf (stderr, "found %d leaks at %s\n", 
+        psMemCheckLeaks2 (0,
+                NULL, stdout, false, 500), "ppMops");
+
+    exit(0);
+}
 
 /*
@@ -39 +59 @@
     psLibInit(NULL);
 
+    // test();
+
     ppMopsArguments *args = ppMopsArgumentsParse(argc, argv); // Parsed arguments
     if (!args) {
@@ -45 +67 @@
     }
 
+
     psArray *detections = ppMopsRead(args); // Detections from each input
     if (!detections) {
@@ -51 +74 @@
     }
 
-    ppMopsDetections *merged = ppMopsMerge(detections); // Merged detections
-    psFree(detections);
-    if (!merged) {
+    if (!ppMopsPurgeDuplicates(detections)) {
         psErrorStackPrint(stderr, "Unable to merge detections");
         exit(PS_EXIT_SYS_ERROR);
     }
 
-    if (!ppMopsWrite(merged, args)) {
+    if (!ppMopsWrite(detections, args)) {
         psErrorStackPrint(stderr, "Unable to write detections");
         exit(PS_EXIT_SYS_ERROR);
     }
 
-    psFree(merged);
+    for (int i = 0; i < detections->n; i++) {
+        psFree(detections->data[i]);
+    }
+    psFree(detections);
     psFree(args);
 
     psLibFinalize();
+
+    fprintf (stderr, "found %d leaks at %s\n", 
+        psMemCheckLeaks2 (0,
+                NULL, stdout, false, 500), "ppMops");
 
     return PS_EXIT_SUCCESS;