add destructor for struct work

Author: bertschinger

include/bf.h

@@ -373,6 +373,7 @@ struct work {
 size_t struct_work_size(struct work *w);
 struct work *new_work_with_name(const char *prefix, const size_t prefix_len,
                                 const char *basename, const size_t basename_len);
+void free_work(struct work *w);
 
 /* extra data used by entries that does not depend on data from other directories */
 struct entry_data {

src/bf.c

@@ -630,9 +630,11 @@ void dir_inc(struct dir_rc *dir) {
  * Decrement the reference count for a dir_rc, and free it if that was the last reference.
  */
 void dir_dec(struct dir_rc *dir) {
-    if (__atomic_sub_fetch(&dir->rc, 1, __ATOMIC_ACQ_REL) == 0) {
-        closedir(dir->dir);
-        free(dir);
+    if (dir) {
+        if (__atomic_sub_fetch(&dir->rc, 1, __ATOMIC_ACQ_REL) == 0) {
+            closedir(dir->dir);
+            free(dir);
+        }
     }
 }
 
@@ -675,3 +677,8 @@ struct work *new_work_with_name(const char *prefix, const size_t prefix_len,
 
     return w;
 }
+
+void free_work(struct work *w) {
+    dir_dec(w->parent_dir);
+    free(w);
+}

src/descend.c

@@ -199,7 +199,7 @@ int descend(QPTPool_t *ctx, const size_t id, void *args,
                 }
                 else {
                     /* skip enqueuing and just free */
-                    free(child);
+                    free_work(child);
                 }
                 continue;
             }
@@ -215,7 +215,7 @@ int descend(QPTPool_t *ctx, const size_t id, void *args,
             }
             else {
                 /* other types are not stored */
-                free(child);
+                free_work(child);
                 continue;
             }
 
@@ -239,7 +239,7 @@ int descend(QPTPool_t *ctx, const size_t id, void *args,
                 }
             }
 
-            free(child);
+            free_work(child);
         }
     }
 

src/gufi_dir2index.c

@@ -323,7 +323,7 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
     }
 
     free(nda.topath);
-    free(nda.work);
+    free_work(nda.work);
 
     return rc;
 }

src/gufi_dir2trace.c

@@ -178,7 +178,7 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
   cleanup:
     closedir(dir);
 
-    free(work);
+    free_work(work);
 
     pa->total_files[id] += ctrs.nondirs_processed;
 

src/gufi_index2dir.c

@@ -357,7 +357,7 @@ static int processdir(struct QPTPool * ctx, const size_t id, void * data, void *
 
     closedir(dir);
 
-    free(work);
+    free_work(work);
 
     return rc;
 }

src/gufi_treesummary.c

@@ -211,7 +211,7 @@ static int processdir(QPTPool_t *ctx, const size_t id, void *data, void *args) {
     closedir(dir);
 
   out_free:
-    free(passmywork);
+    free_work(passmywork);
 
     return 0;
 }

src/parallel_cpr.c

@@ -394,7 +394,7 @@ int main(int argc, char * argv[]) {
                 cpr_link(work, &ed, &in);
             }
 
-            free(work);
+            free_work(work);
         }
         else if (S_ISREG(st.st_mode)) {
             struct work_data *wd = calloc(1, sizeof(*wd) + work->name_len + 1);
@@ -410,7 +410,7 @@ int main(int argc, char * argv[]) {
 
             QPTPool_enqueue(pool, 0, cpr_file, wd);
 
-            free(work);
+            free_work(work);
         }
         else {
             free(work);