Commit f6d6be43 authored by Shane Snyder's avatar Shane Snyder

port dxt module to no-mpi changes

parent 640275d2
...@@ -129,11 +129,9 @@ static void dxt_mpiio_cleanup_runtime( ...@@ -129,11 +129,9 @@ static void dxt_mpiio_cleanup_runtime(
void); void);
static void dxt_posix_shutdown( static void dxt_posix_shutdown(
MPI_Comm mod_comm, darshan_record_id *shared_recs, void **dxt_buf, int *dxt_buf_sz);
int shared_rec_count, void **dxt_buf, int *dxt_buf_sz);
static void dxt_mpiio_shutdown( static void dxt_mpiio_shutdown(
MPI_Comm mod_comm, darshan_record_id *shared_recs, void **dxt_buf, int *dxt_buf_sz);
int shared_rec_count, void **dxt_buf, int *dxt_buf_sz);
static struct dxt_posix_runtime *dxt_posix_runtime = NULL; static struct dxt_posix_runtime *dxt_posix_runtime = NULL;
static struct dxt_mpiio_runtime *dxt_mpiio_runtime = NULL; static struct dxt_mpiio_runtime *dxt_mpiio_runtime = NULL;
...@@ -380,6 +378,12 @@ static void dxt_posix_runtime_initialize() ...@@ -380,6 +378,12 @@ static void dxt_posix_runtime_initialize()
* over realloc'ing module memory as needed. * over realloc'ing module memory as needed.
*/ */
int dxt_psx_buf_size = 0; int dxt_psx_buf_size = 0;
darshan_module_funcs mod_funcs = {
#ifdef HAVE_MPI
.mod_redux_func = NULL,
#endif
.mod_shutdown_func = &dxt_posix_shutdown
};
int ret; int ret;
double tmpfloat; double tmpfloat;
char *envstr; char *envstr;
...@@ -387,7 +391,7 @@ static void dxt_posix_runtime_initialize() ...@@ -387,7 +391,7 @@ static void dxt_posix_runtime_initialize()
/* register the DXT module with darshan core */ /* register the DXT module with darshan core */
darshan_core_register_module( darshan_core_register_module(
DXT_POSIX_MOD, DXT_POSIX_MOD,
&dxt_posix_shutdown, mod_funcs,
&dxt_psx_buf_size, &dxt_psx_buf_size,
&dxt_my_rank, &dxt_my_rank,
NULL); NULL);
...@@ -433,6 +437,12 @@ void dxt_mpiio_runtime_initialize() ...@@ -433,6 +437,12 @@ void dxt_mpiio_runtime_initialize()
* over realloc'ing module memory as needed. * over realloc'ing module memory as needed.
*/ */
int dxt_mpiio_buf_size = 0; int dxt_mpiio_buf_size = 0;
darshan_module_funcs mod_funcs = {
#ifdef HAVE_MPI
.mod_redux_func = NULL,
#endif
.mod_shutdown_func = &dxt_mpiio_shutdown
};
int ret; int ret;
double tmpfloat; double tmpfloat;
char *envstr; char *envstr;
...@@ -440,7 +450,7 @@ void dxt_mpiio_runtime_initialize() ...@@ -440,7 +450,7 @@ void dxt_mpiio_runtime_initialize()
/* register the DXT module with darshan core */ /* register the DXT module with darshan core */
darshan_core_register_module( darshan_core_register_module(
DXT_MPIIO_MOD, DXT_MPIIO_MOD,
&dxt_mpiio_shutdown, mod_funcs,
&dxt_mpiio_buf_size, &dxt_mpiio_buf_size,
&dxt_my_rank, &dxt_my_rank,
NULL); NULL);
...@@ -715,9 +725,6 @@ static void dxt_serialize_posix_records(void *rec_ref_p) ...@@ -715,9 +725,6 @@ static void dxt_serialize_posix_records(void *rec_ref_p)
} }
static void dxt_posix_shutdown( static void dxt_posix_shutdown(
MPI_Comm mod_comm,
darshan_record_id *shared_recs,
int shared_rec_count,
void **dxt_posix_buf, void **dxt_posix_buf,
int *dxt_posix_buf_sz) int *dxt_posix_buf_sz)
{ {
...@@ -825,9 +832,6 @@ static void dxt_serialize_mpiio_records(void *rec_ref_p) ...@@ -825,9 +832,6 @@ static void dxt_serialize_mpiio_records(void *rec_ref_p)
} }
static void dxt_mpiio_shutdown( static void dxt_mpiio_shutdown(
MPI_Comm mod_comm,
darshan_record_id *shared_recs,
int shared_rec_count,
void **dxt_mpiio_buf, void **dxt_mpiio_buf,
int *dxt_mpiio_buf_sz) int *dxt_mpiio_buf_sz)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment