cleanup

Author: calccrypto

src/gufi_query/main.c

@@ -111,10 +111,13 @@ int main(int argc, char *argv[])
     int idx = parse_cmd_line(argc, argv, "hHT:S:E:an:jo:d:O:I:F:y:z:J:K:G:mB:wxk:M:" COMPRESS_OPT "Q:", 1, "GUFI_index ...", &in);
     if (in.helped)
         sub_help();
-    if (idx < 0)
+    if (idx < 0) {
+        input_fini(&in);
         return EXIT_FAILURE;
+    }
 
     if (validate_inputs(&in) != 0) {
+        input_fini(&in);
         return EXIT_FAILURE;
     }
 

src/gufi_query/processdir.c

@@ -195,7 +195,7 @@ int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
     thread_timestamp_end(lstat_db_call);
 
     if (rc != 0) {
-        goto out_free;
+        goto close_dir;
     }
 
     if (gqw->work.level >= in->min_level) {
@@ -429,6 +429,8 @@ int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
     }
     thread_timestamp_end(utime_call);
 
+  close_dir:
+    ;
     thread_timestamp_start(ts.tts, closedir_call);
     closedir(dir);
     thread_timestamp_end(closedir_call);

src/gufi_trace2index.c

@@ -131,10 +131,14 @@ static struct row *row_init(const int trace, const size_t first_delim, char *lin
     return row;
 }
 
-static void row_destroy(struct row *row) {
+static void row_destroy(struct row **ref) {
     /* Not checking arguments */
+
+    struct row *row = *ref;
     free(row->line);
     free(row);
+
+    *ref = NULL;
 }
 
 #ifdef DEBUG
@@ -233,7 +237,7 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
         const int err = errno;
         fprintf(stderr, "Dupdir failure: \"%s\": %s (%d)\n",
                 topath, strerror(err), err);
-        row_destroy(w);
+        row_destroy(&w);
         return 1;
     }
     timestamp_set_end(dupdir);
@@ -442,7 +446,7 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
     }
 
     timestamp_create_start(row_destroy);
-    row_destroy(w);
+    row_destroy(&w);
     timestamp_set_end(row_destroy);
 
     #ifdef DEBUG
@@ -558,13 +562,10 @@ static int scout_function(QPTPool_t *ctx, const size_t id, void *data, void *arg
          * bad line
          */
         if (!first_delim) {
-            free(line);
-            line = NULL;
-            size = 0;
-            len = 0;
+            row_destroy(&work);
             fprintf(stderr, "Scout encountered bad line ending at %s offset %jd\n",
                     sa->tracename, (intmax_t) offset);
-            return 1;
+            break;
         }
 
         /* push directories onto queues */
@@ -596,10 +597,12 @@ static int scout_function(QPTPool_t *ctx, const size_t id, void *data, void *arg
 
     free(line);
 
-    /* handle the last work item */
-    dir_count++;
-    empty += !work->entries;
-    QPTPool_enqueue(ctx, id, processdir, work);
+    if (work) {
+        /* handle the last work item */
+        dir_count++;
+        empty += !work->entries;
+        QPTPool_enqueue(ctx, id, processdir, work);
+    }
 
     clock_gettime(CLOCK_MONOTONIC, &scouting.end);
 

test/regression/gufi_trace2index.expected

@@ -118,8 +118,12 @@ Total Files:         0
 
 # file delimiter not found
 $ gufi_trace2index -d "|" -n "2" "badtrace" "prefix"
-Scout encountered bad line ending at badtrace offset 24
+Scout encountered bad line ending at badtrace offset 62
 Creating GUFI Index prefix with 2 threads
+Dirs:                0 (0 empty)
+Files:               0
+Total:               0
+
 Total Dirs:          0
 Total Files:         0
 

test/regression/gufi_trace2index.sh.in

@@ -139,7 +139,7 @@ echo
 # generate trace with good directory line and bad file line
 # only need the first delimiter to trigger error
 (
-    echo "${SRCDIR}${DELIM}d${DELIM}"
+    head -n 1 "${TRACE}" | sed 's/[0-9]\+/0/g'
     echo "${SRCDIR}/1KB${BADDELIM}f${BADDELIM}"
 ) > "${BADTRACE}"
 

test/regression/parallel_rmr.expected

@@ -15,7 +15,7 @@ empty_directory
 leaf_directory
 unusual#? directory ,
 
-$ parallel_rmr "prefix/directory" "prefix/empty_directory" "prefix/leaf_directory"
+$ parallel_rmr -n 2 "prefix/directory" "prefix/empty_directory" "prefix/leaf_directory"
 
 $ ls -1 prefix
 db.db

test/regression/parallel_rmr.sh.in

@@ -69,7 +69,7 @@ OUTPUT="parallel_rmr.out"
 (
 run_no_sort "${PARALLEL_RMR} -h"
 run_sort    "ls -1 ${INDEXROOT}"
-run_no_sort "${PARALLEL_RMR} \"${INDEXROOT}/directory\" \"${INDEXROOT}/empty_directory\" \"${INDEXROOT}/leaf_directory\""
+run_no_sort "${PARALLEL_RMR} -n ${THREADS} \"${INDEXROOT}/directory\" \"${INDEXROOT}/empty_directory\" \"${INDEXROOT}/leaf_directory\""
 run_sort    "ls -1 ${INDEXROOT}"
 ) | tee "${OUTPUT}"