Define varaible __darshan_disabled only in those files that make use of it

Author: wkliao

darshan-runtime/lib/darshan-core-init-finalize.c

@@ -20,6 +20,8 @@
 #include "darshan.h"
 #include "darshan-dynamic.h"
 
+static int __darshan_disabled;
+
 #ifdef HAVE_MPI
 DARSHAN_FORWARD_DECL(PMPI_Finalize, int, ());
 DARSHAN_FORWARD_DECL(PMPI_Init, int, (int *argc, char ***argv));

darshan-runtime/lib/darshan-core.c

@@ -52,6 +52,8 @@
 #include <lustre/lustre_user.h>
 #endif
 
+static int __darshan_disabled;
+
 extern char* __progname;
 extern char* __progname_full;
 struct darshan_core_runtime *__darshan_core = NULL;

darshan-runtime/lib/darshan-daos.c

@@ -34,6 +34,8 @@
 #include <daos_obj.h>
 #include <daos_array.h>
 
+static int __darshan_disabled;
+
 /* container access routines intercepted for maintaining pool/container UUIDs */
 DARSHAN_FORWARD_DECL(daos_cont_open, int, (daos_handle_t poh, const char *cont, unsigned int flags, daos_handle_t *coh, daos_cont_info_t *info, daos_event_t *ev));
 DARSHAN_FORWARD_DECL(daos_cont_global2local, int, (daos_handle_t poh, d_iov_t glob, daos_handle_t *coh));

darshan-runtime/lib/darshan-dfs.c

@@ -35,6 +35,8 @@
 #include <daos_array.h>
 #include <daos_fs.h>
 
+static int __darshan_disabled;
+
 DARSHAN_FORWARD_DECL(dfs_mount, int, (daos_handle_t poh, daos_handle_t coh, int flags, dfs_t **dfs));
 DARSHAN_FORWARD_DECL(dfs_global2local, int, (daos_handle_t poh, daos_handle_t coh, int flags, d_iov_t glob, dfs_t **dfs));
 DARSHAN_FORWARD_DECL(dfs_umount, int, (dfs_t *dfs));

darshan-runtime/lib/darshan-hdf5.c

@@ -30,6 +30,8 @@
 
 #include <hdf5.h>
 
+static int __darshan_disabled;
+
 /* H5F prototypes */
 DARSHAN_FORWARD_DECL(H5Fcreate, hid_t, (const char *filename, unsigned flags, hid_t create_plist, hid_t access_plist));
 DARSHAN_FORWARD_DECL(H5Fopen, hid_t, (const char *filename, unsigned flags, hid_t access_plist));

darshan-runtime/lib/darshan-mdhim.c

@@ -24,6 +24,8 @@
 #include "darshan.h"
 #include "darshan-dynamic.h"
 
+static int __darshan_disabled;
+
 #define RECORD_STRING "total-mdhim-obj-stats"
 
 /* The DARSHAN_FORWARD_DECL macro (defined in darshan.h) is used to provide forward

darshan-runtime/lib/darshan-mpiio.c

@@ -31,6 +31,8 @@
 #include "darshan-heatmap.h"
 #include "darshan-ldms.h"
 
+static int __darshan_disabled;
+
 DARSHAN_FORWARD_DECL(PMPI_File_close, int, (MPI_File *fh));
 DARSHAN_FORWARD_DECL(PMPI_File_iread, int, (MPI_File fh, void  *buf, int  count, MPI_Datatype  datatype, __D_MPI_REQUEST  *request));
 DARSHAN_FORWARD_DECL(PMPI_File_iread_all, int, (MPI_File fh, void *buf, int count, MPI_Datatype datatype, __D_MPI_REQUEST *request));

darshan-runtime/lib/darshan-null.c

@@ -21,6 +21,8 @@
 #include "darshan.h"
 #include "darshan-dynamic.h"
 
+static int __darshan_disabled;
+
 /* module-specific macro to retrieve current time stamp.  It first checks to
  * see if Darshan has been disabled at run time; in that case the module can
  * skip potentially costly timer calls.

darshan-runtime/lib/darshan-pnetcdf.c

@@ -29,6 +29,8 @@
 
 #include <pnetcdf.h>
 
+static int __darshan_disabled;
+
 /* structure that can track i/o stats for a given PnetCDF file record at runtime */
 struct pnetcdf_file_record_ref
 {

darshan-runtime/lib/darshan-posix.c

@@ -37,6 +37,8 @@
 #include "darshan-heatmap.h"
 #include "darshan-ldms.h"
 
+static int __darshan_disabled;
+
 #ifndef HAVE_OFF64_T
 typedef int64_t off64_t;
 #endif