[Darshan-commits] [Git][darshan/darshan][dev-modular] bug fix to unregister modules when shutting down

[Shane Snyder]

Shane Snyder pushed to branch dev-modular at darshan / darshan


Commits:
f0278cc1 by Shane Snyder at 2016-01-28T13:06:42-06:00
bug fix to unregister modules when shutting down

- - - - -


7 changed files:

- darshan-runtime/lib/darshan-bgq.c
- darshan-runtime/lib/darshan-core.c
- darshan-runtime/lib/darshan-hdf5.c
- darshan-runtime/lib/darshan-mpiio.c
- darshan-runtime/lib/darshan-null.c
- darshan-runtime/lib/darshan-pnetcdf.c
- darshan-runtime/lib/darshan-posix.c


Changes:

=====================================
darshan-runtime/lib/darshan-bgq.c
=====================================
--- a/darshan-runtime/lib/darshan-bgq.c
+++ b/darshan-runtime/lib/darshan-bgq.c
@@ -276,6 +276,8 @@ static void bgq_get_output_data(
 /* Shutdown the BGQ module by freeing up all data structures. */
 static void bgq_shutdown()
 {
+    darshan_core_unregister_module(DARSHAN_BGQ_MOD);
+
     if (bgq_runtime)
     {
         free(bgq_runtime);


=====================================
darshan-runtime/lib/darshan-core.c
=====================================
--- a/darshan-runtime/lib/darshan-core.c
+++ b/darshan-runtime/lib/darshan-core.c
@@ -1656,7 +1656,6 @@ void darshan_core_register_module(
     return;
 }
 
-/* TODO: test */
 void darshan_core_unregister_module(
     darshan_module_id mod_id)
 {
@@ -1667,15 +1666,17 @@ void darshan_core_unregister_module(
 
     DARSHAN_CORE_LOCK();
 
-    /* iterate all records and disassociate this module from them */
-    HASH_ITER(hlink, darshan_core->rec_hash, ref, tmp)
+    if(darshan_core->mod_array[mod_id])
     {
-        darshan_core_unregister_record(ref->rec.id, mod_id);
-    }
-
-    free(darshan_core->mod_array[mod_id]);
-    darshan_core->mod_array[mod_id] = NULL;
+        /* iterate all records and disassociate this module from them */
+        HASH_ITER(hlink, darshan_core->rec_hash, ref, tmp)
+        {
+            darshan_core_unregister_record(ref->rec.id, mod_id);
+        }
 
+        free(darshan_core->mod_array[mod_id]);
+        darshan_core->mod_array[mod_id] = NULL;
+    }
     DARSHAN_CORE_UNLOCK();
 
     return;


=====================================
darshan-runtime/lib/darshan-hdf5.c
=====================================
--- a/darshan-runtime/lib/darshan-hdf5.c
+++ b/darshan-runtime/lib/darshan-hdf5.c
@@ -564,6 +564,8 @@ static void hdf5_shutdown()
 
     assert(hdf5_runtime);
 
+    darshan_core_unregister_module(DARSHAN_HDF5_MOD);
+
     HASH_ITER(hlink, hdf5_runtime->hid_hash, ref, tmp)
     {
         HASH_DELETE(hlink, hdf5_runtime->hid_hash, ref);


=====================================
darshan-runtime/lib/darshan-mpiio.c
=====================================
--- a/darshan-runtime/lib/darshan-mpiio.c
+++ b/darshan-runtime/lib/darshan-mpiio.c
@@ -1514,6 +1514,8 @@ static void mpiio_shutdown()
 
     assert(mpiio_runtime);
 
+    darshan_core_unregister_module(DARSHAN_MPIIO_MOD);
+
     HASH_ITER(hlink, mpiio_runtime->fh_hash, ref, tmp)
     {
         HASH_DELETE(hlink, mpiio_runtime->fh_hash, ref);


=====================================
darshan-runtime/lib/darshan-null.c
=====================================
--- a/darshan-runtime/lib/darshan-null.c
+++ b/darshan-runtime/lib/darshan-null.c
@@ -374,6 +374,8 @@ static void null_shutdown()
 {
     assert(null_runtime);
 
+    darshan_core_unregister_module(DARSHAN_NULL_MOD);
+
     HASH_CLEAR(hlink, null_runtime->record_hash); /* these hash entries are freed all at once below */
 
     free(null_runtime->runtime_record_array);


=====================================
darshan-runtime/lib/darshan-pnetcdf.c
=====================================
--- a/darshan-runtime/lib/darshan-pnetcdf.c
+++ b/darshan-runtime/lib/darshan-pnetcdf.c
@@ -576,6 +576,8 @@ static void pnetcdf_shutdown()
 
     assert(pnetcdf_runtime);
 
+    darshan_core_unregister_module(DARSHAN_PNETCDF_MOD);
+
     HASH_ITER(hlink, pnetcdf_runtime->ncid_hash, ref, tmp)
     {
         HASH_DELETE(hlink, pnetcdf_runtime->ncid_hash, ref);


=====================================
darshan-runtime/lib/darshan-posix.c
=====================================
--- a/darshan-runtime/lib/darshan-posix.c
+++ b/darshan-runtime/lib/darshan-posix.c
@@ -2249,6 +2249,8 @@ static void posix_shutdown()
 
     assert(posix_runtime);
 
+    darshan_core_unregister_module(DARSHAN_POSIX_MOD);
+
     HASH_ITER(hlink, posix_runtime->fd_hash, ref, tmp)
     {
         HASH_DELETE(hlink, posix_runtime->fd_hash, ref);



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/f0278cc11ae5ba716f2c464f1cbe525b60520e97
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20160128/96811eb8/attachment.html>