back out commit for fixing races -- not needed

darshan-runtime/lib/darshan-bgq.c

@@ -223,8 +223,6 @@ static void bgq_get_output_data(
     int result;
     uint64_t *ion_ids;
 
-    BGQ_LOCK();
-
     if (my_rank == 0)
     {
         DARSHAN_MPI_CALL(PMPI_Comm_size)(mod_comm, &nprocs);
@@ -272,21 +270,18 @@ static void bgq_get_output_data(
         *size   = 0;
     }
 
-    BGQ_UNLOCK();
     return;
 }
 
 /* Shutdown the BGQ module by freeing up all data structures. */
 static void bgq_shutdown()
 {
-    BGQ_LOCK();
     if (bgq_runtime)
     {
         free(bgq_runtime);
         bgq_runtime = NULL;
     }
 
-    BGQ_UNLOCK();
     return;
 }
 

darshan-runtime/lib/darshan-hdf5.c

@@ -484,8 +484,6 @@ static void hdf5_get_output_data(
 
     assert(hdf5_runtime);
 
-    HDF5_LOCK();
-
     /* if there are globally shared files, do a shared file reduction */
     /* NOTE: the shared file reduction is also skipped if the 
      * DARSHAN_DISABLE_SHARED_REDUCTION environment variable is set.
@@ -519,7 +517,6 @@ static void hdf5_get_output_data(
             red_recv_buf = malloc(shared_rec_count * sizeof(struct darshan_hdf5_file));
             if(!red_recv_buf)
             {
-                HDF5_UNLOCK();
                 return;
             }
         }
@@ -558,7 +555,6 @@ static void hdf5_get_output_data(
     *hdf5_buf = (void *)(hdf5_runtime->file_record_array);
     *hdf5_buf_sz = hdf5_runtime->file_array_ndx * sizeof(struct darshan_hdf5_file);
 
-    HDF5_UNLOCK();
     return;
 }
 
@@ -568,7 +564,6 @@ static void hdf5_shutdown()
 
     assert(hdf5_runtime);
 
-    HDF5_LOCK();
     HASH_ITER(hlink, hdf5_runtime->hid_hash, ref, tmp)
     {
         HASH_DELETE(hlink, hdf5_runtime->hid_hash, ref);
@@ -582,7 +577,6 @@ static void hdf5_shutdown()
     free(hdf5_runtime);
     hdf5_runtime = NULL;
 
-    HDF5_UNLOCK();
     return;
 }
 

darshan-runtime/lib/darshan-mpiio.c

@@ -1320,8 +1320,6 @@ static void mpiio_get_output_data(
 
     assert(mpiio_runtime);
 
-    MPIIO_LOCK();
-
     /* go through and set the 4 most common access sizes for MPI-IO */
     for(i = 0; i < mpiio_runtime->file_array_ndx; i++)
     {
@@ -1391,7 +1389,6 @@ static void mpiio_get_output_data(
             red_recv_buf = malloc(shared_rec_count * sizeof(struct darshan_mpiio_file));
             if(!red_recv_buf)
             {
-                MPIIO_UNLOCK();
                 return;
             }
         }
@@ -1434,7 +1431,6 @@ static void mpiio_get_output_data(
     *mpiio_buf = (void *)(mpiio_runtime->file_record_array);
     *mpiio_buf_sz = mpiio_runtime->file_array_ndx * sizeof(struct darshan_mpiio_file);
 
-    MPIIO_UNLOCK();
     return;
 }
 
@@ -1444,7 +1440,6 @@ static void mpiio_shutdown()
 
     assert(mpiio_runtime);
 
-    MPIIO_LOCK();
     HASH_ITER(hlink, mpiio_runtime->fh_hash, ref, tmp)
     {
         HASH_DELETE(hlink, mpiio_runtime->fh_hash, ref);
@@ -1458,7 +1453,6 @@ static void mpiio_shutdown()
     free(mpiio_runtime);
     mpiio_runtime = NULL;
 
-    MPIIO_UNLOCK();
     return;
 }
 

darshan-runtime/lib/darshan-null.c

@@ -349,8 +349,6 @@ static void null_get_output_data(
 {
     assert(null_runtime);
 
-    NULL_LOCK();
-
     /* NOTE: this function can be used to run collective operations prior to
      * shutting down the module, as implied by the MPI communicator passed in
      * as the first agrument. Typically, module developers will want to run a
@@ -368,7 +366,6 @@ static void null_get_output_data(
     *null_buf = (void *)(null_runtime->record_array);
     *null_buf_sz = null_runtime->rec_array_ndx * sizeof(struct darshan_null_record);
 
-    NULL_UNLOCK();
     return;
 }
 
@@ -377,7 +374,6 @@ static void null_shutdown()
 {
     assert(null_runtime);
 
-    NULL_LOCK();
     HASH_CLEAR(hlink, null_runtime->record_hash); /* these hash entries are freed all at once below */
 
     free(null_runtime->runtime_record_array);
@@ -385,7 +381,6 @@ static void null_shutdown()
     free(null_runtime);
     null_runtime = NULL;
 
-    NULL_UNLOCK();
     return;
 }
 

darshan-runtime/lib/darshan-pnetcdf.c

@@ -496,8 +496,6 @@ static void pnetcdf_get_output_data(
 
     assert(pnetcdf_runtime);
 
-    PNETCDF_LOCK();
-
     /* if there are globally shared files, do a shared file reduction */
     /* NOTE: the shared file reduction is also skipped if the 
      * DARSHAN_DISABLE_SHARED_REDUCTION environment variable is set.
@@ -531,7 +529,6 @@ static void pnetcdf_get_output_data(
             red_recv_buf = malloc(shared_rec_count * sizeof(struct darshan_pnetcdf_file));
             if(!red_recv_buf)
             {
-                PNETCDF_UNLOCK();
                 return;
             }
         }
@@ -570,7 +567,6 @@ static void pnetcdf_get_output_data(
     *pnetcdf_buf = (void *)(pnetcdf_runtime->file_record_array);
     *pnetcdf_buf_sz = pnetcdf_runtime->file_array_ndx * sizeof(struct darshan_pnetcdf_file);
 
-    PNETCDF_UNLOCK();
     return;
 }
 
@@ -580,7 +576,6 @@ static void pnetcdf_shutdown()
 
     assert(pnetcdf_runtime);
 
-    PNETCDF_LOCK();
     HASH_ITER(hlink, pnetcdf_runtime->ncid_hash, ref, tmp)
     {
         HASH_DELETE(hlink, pnetcdf_runtime->ncid_hash, ref);
@@ -594,7 +589,6 @@ static void pnetcdf_shutdown()
     free(pnetcdf_runtime);
     pnetcdf_runtime = NULL;
 
-    PNETCDF_UNLOCK();
     return;
 }
 

darshan-runtime/lib/darshan-posix.c

@@ -2051,8 +2051,6 @@ static void posix_get_output_data(
 
     assert(posix_runtime);
 
-    POSIX_LOCK();
-
     /* go through file access data for each record and set the 4 most common
      * stride/access size counters.
      */
@@ -2129,7 +2127,6 @@ static void posix_get_output_data(
             if(!red_recv_buf)
             {
                 return;
-                POSIX_UNLOCK();
             }
         }
 
@@ -2171,7 +2168,6 @@ static void posix_get_output_data(
     *posix_buf = (void *)(posix_runtime->file_record_array);
     *posix_buf_sz = posix_runtime->file_array_ndx * sizeof(struct darshan_posix_file);
 
-    POSIX_UNLOCK();
     return;
 }
 
@@ -2181,7 +2177,6 @@ static void posix_shutdown()
 
     assert(posix_runtime);
 
-    POSIX_LOCK();
     HASH_ITER(hlink, posix_runtime->fd_hash, ref, tmp)
     {
         HASH_DELETE(hlink, posix_runtime->fd_hash, ref);
@@ -2195,7 +2190,6 @@ static void posix_shutdown()
     free(posix_runtime);
     posix_runtime = NULL;
     
-    POSIX_UNLOCK();
     return;
 }