Skip to content

Commit

Permalink
lots of small whitespace changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@shanedsnyder
shanedsnyder committed Oct 17, 2023
1 parent dbe54a8 commit e0cd83f
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 85 deletions.
72 changes: 33 additions & 39 deletions darshan-runtime/lib/darshan-hdf5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ static int my_rank = -1;
darshan_record_id __rec_id; \
struct hdf5_file_record_ref *__rec_ref; \
char *__newpath; \
extern struct darshanConnector dC; \
__newpath = darshan_clean_file_path(__path); \
if(!__newpath) __newpath = (char *)__path; \
__rec_id = darshan_core_gen_record_id(__newpath); \
Expand All @@ -190,6 +189,7 @@ static int my_rank = -1;
darshan_add_record_ref(&(hdf5_file_runtime->hid_hash), &__ret, sizeof(hid_t), __rec_ref); \
if(__newpath != __path) free(__newpath); \
/* LDMS to publish realtime read tracing information to daemon*/ \
extern struct darshanConnector dC; \
if(!dC.ldms_lib)\
if(!dC.hdf5_enable_ldms)\
darshan_ldms_connector_send(__rec_ref->file_rec->base_rec.id, __rec_ref->file_rec->base_rec.rank,__rec_ref->file_rec->counters[H5F_OPENS], "open", -1, -1, -1, -1, __rec_ref->file_rec->counters[H5F_FLUSHES], __tm1, __tm2, __rec_ref->file_rec->fcounters[H5F_F_META_TIME], "H5F", "MET");\
Expand Down Expand Up @@ -417,14 +417,12 @@ herr_t DARSHAN_DECL(H5Fclose)(hid_t file_id)
&file_id, sizeof(hid_t));

#ifdef HAVE_LDMS
/* LDMS to publish runtime h5d tracing information to daemon*/
extern struct darshanConnector dC;
if(!dC.hdf5_enable_ldms)
darshan_ldms_connector_send(rec_ref->file_rec->base_rec.id, rec_ref->file_rec->base_rec.rank, -1, "close", -1, -1, -1, -1, rec_ref->file_rec->counters[H5F_FLUSHES],rec_ref->file_rec->fcounters[H5F_F_CLOSE_START_TIMESTAMP], rec_ref->file_rec->fcounters[H5F_F_CLOSE_END_TIMESTAMP], rec_ref->file_rec->fcounters[H5F_F_META_TIME], "H5F", "MOD");
/* LDMS to publish runtime h5d tracing information to daemon*/
extern struct darshanConnector dC;
if(!dC.hdf5_enable_ldms)
darshan_ldms_connector_send(rec_ref->file_rec->base_rec.id, rec_ref->file_rec->base_rec.rank, -1, "close", -1, -1, -1, -1, rec_ref->file_rec->counters[H5F_FLUSHES],rec_ref->file_rec->fcounters[H5F_F_CLOSE_START_TIMESTAMP], rec_ref->file_rec->fcounters[H5F_F_CLOSE_END_TIMESTAMP], rec_ref->file_rec->fcounters[H5F_F_META_TIME], "H5F", "MOD");
#endif

}

H5F_POST_RECORD();
}

Expand Down Expand Up @@ -465,7 +463,6 @@ herr_t DARSHAN_DECL(H5Fclose)(hid_t file_id)
ssize_t __req_name_len = DARSHAN_HDF5_MAX_NAME_LEN-1, __ret_name_len; \
darshan_record_id __rec_id, __file_rec_id = 0; \
struct hdf5_dataset_record_ref *__rec_ref; \
extern struct darshanConnector dC;\
hsize_t __chunk_dims[H5D_MAX_NDIMS] = {0}; \
int __i, __n_chunk_dims = 0; \
/* get corresponding file name */\
Expand Down Expand Up @@ -516,6 +513,7 @@ herr_t DARSHAN_DECL(H5Fclose)(hid_t file_id)
__rec_ref->dataset_rec->file_rec_id = __file_rec_id; \
darshan_add_record_ref(&(hdf5_dataset_runtime->hid_hash), &__ret, sizeof(hid_t), __rec_ref); \
/* LDMS to publish runtime h5d tracing information to daemon*/ \
extern struct darshanConnector dC;\
if(!dC.ldms_lib)\
if(!dC.hdf5_enable_ldms)\
darshan_ldms_connector_send(__rec_ref->dataset_rec->base_rec.id, __rec_ref->dataset_rec->base_rec.rank,__rec_ref->dataset_rec->counters[H5D_OPENS], "open", -1, -1, -1, -1, __rec_ref->dataset_rec->counters[H5D_FLUSHES], __tm1, __tm2, __rec_ref->dataset_rec->fcounters[H5D_F_META_TIME], "H5D", "MET");\
Expand Down Expand Up @@ -765,17 +763,18 @@ herr_t DARSHAN_DECL(H5Dread)(hid_t dataset_id, hid_t mem_type_id, hid_t mem_spac
DARSHAN_TIMER_INC_NO_OVERLAP(
rec_ref->dataset_rec->fcounters[H5D_F_READ_TIME],
tm1, tm2, rec_ref->last_read_end);

#ifdef HAVE_LDMS
extern struct darshanConnector dC;
/* LDMS to publish runtime h5d tracing information to daemon*/
if(!dC.hdf5_enable_ldms){
dC.hdf5_data[0] = rec_ref->dataset_rec->counters[H5D_POINT_SELECTS];
dC.hdf5_data[1] = rec_ref->dataset_rec->counters[H5D_IRREGULAR_HYPERSLAB_SELECTS];
dC.hdf5_data[2] = rec_ref->dataset_rec->counters[H5D_REGULAR_HYPERSLAB_SELECTS];
dC.hdf5_data[3] = rec_ref->dataset_rec->counters[H5D_DATASPACE_NDIMS];
dC.hdf5_data[4] = rec_ref->dataset_rec->counters[H5D_DATASPACE_NPOINTS];

darshan_ldms_connector_send(rec_ref->dataset_rec->base_rec.id, rec_ref->dataset_rec->base_rec.rank, rec_ref->dataset_rec->counters[H5D_READS], "read", -1, rec_ref->dataset_rec->counters[H5D_MAX_READ_TIME_SIZE], -1, rec_ref->dataset_rec->counters[H5D_RW_SWITCHES], rec_ref->dataset_rec->counters[H5D_FLUSHES], rec_ref->dataset_rec->fcounters[H5D_F_READ_START_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_READ_END_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_READ_TIME], "H5D", "MOD");
extern struct darshanConnector dC;
/* LDMS to publish runtime h5d tracing information to daemon*/
if(!dC.hdf5_enable_ldms){
dC.hdf5_data[0] = rec_ref->dataset_rec->counters[H5D_POINT_SELECTS];
dC.hdf5_data[1] = rec_ref->dataset_rec->counters[H5D_IRREGULAR_HYPERSLAB_SELECTS];
dC.hdf5_data[2] = rec_ref->dataset_rec->counters[H5D_REGULAR_HYPERSLAB_SELECTS];
dC.hdf5_data[3] = rec_ref->dataset_rec->counters[H5D_DATASPACE_NDIMS];
dC.hdf5_data[4] = rec_ref->dataset_rec->counters[H5D_DATASPACE_NPOINTS];

darshan_ldms_connector_send(rec_ref->dataset_rec->base_rec.id, rec_ref->dataset_rec->base_rec.rank, rec_ref->dataset_rec->counters[H5D_READS], "read", -1, rec_ref->dataset_rec->counters[H5D_MAX_READ_TIME_SIZE], -1, rec_ref->dataset_rec->counters[H5D_RW_SWITCHES], rec_ref->dataset_rec->counters[H5D_FLUSHES], rec_ref->dataset_rec->fcounters[H5D_F_READ_START_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_READ_END_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_READ_TIME], "H5D", "MOD");
}
#endif
}
Expand Down Expand Up @@ -896,22 +895,19 @@ herr_t DARSHAN_DECL(H5Dwrite)(hid_t dataset_id, hid_t mem_type_id, hid_t mem_spa
tm1, tm2, rec_ref->last_write_end);

#ifdef HAVE_LDMS
/* LDMS to publish runtime h5d tracing information to daemon*/
extern struct darshanConnector dC;
if(!dC.hdf5_enable_ldms){
dC.hdf5_data[0] = rec_ref->dataset_rec->counters[H5D_POINT_SELECTS];
dC.hdf5_data[1] = rec_ref->dataset_rec->counters[H5D_IRREGULAR_HYPERSLAB_SELECTS];
dC.hdf5_data[2] = rec_ref->dataset_rec->counters[H5D_REGULAR_HYPERSLAB_SELECTS];
dC.hdf5_data[3] = rec_ref->dataset_rec->counters[H5D_DATASPACE_NDIMS];
dC.hdf5_data[4] = rec_ref->dataset_rec->counters[H5D_DATASPACE_NPOINTS];

darshan_ldms_connector_send(rec_ref->dataset_rec->base_rec.id, rec_ref->dataset_rec->base_rec.rank, rec_ref->dataset_rec->counters[H5D_WRITES], "write", -1, rec_ref->dataset_rec->counters[H5D_MAX_WRITE_TIME_SIZE], -1, rec_ref->dataset_rec->counters[H5D_RW_SWITCHES], rec_ref->dataset_rec->counters[H5D_FLUSHES], rec_ref->dataset_rec->fcounters[H5D_F_WRITE_START_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_WRITE_END_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_WRITE_TIME], "H5D", "MOD");

/* LDMS to publish runtime h5d tracing information to daemon*/
extern struct darshanConnector dC;
if(!dC.hdf5_enable_ldms){
dC.hdf5_data[0] = rec_ref->dataset_rec->counters[H5D_POINT_SELECTS];
dC.hdf5_data[1] = rec_ref->dataset_rec->counters[H5D_IRREGULAR_HYPERSLAB_SELECTS];
dC.hdf5_data[2] = rec_ref->dataset_rec->counters[H5D_REGULAR_HYPERSLAB_SELECTS];
dC.hdf5_data[3] = rec_ref->dataset_rec->counters[H5D_DATASPACE_NDIMS];
dC.hdf5_data[4] = rec_ref->dataset_rec->counters[H5D_DATASPACE_NPOINTS];

darshan_ldms_connector_send(rec_ref->dataset_rec->base_rec.id, rec_ref->dataset_rec->base_rec.rank, rec_ref->dataset_rec->counters[H5D_WRITES], "write", -1, rec_ref->dataset_rec->counters[H5D_MAX_WRITE_TIME_SIZE], -1, rec_ref->dataset_rec->counters[H5D_RW_SWITCHES], rec_ref->dataset_rec->counters[H5D_FLUSHES], rec_ref->dataset_rec->fcounters[H5D_F_WRITE_START_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_WRITE_END_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_WRITE_TIME], "H5D", "MOD");
}
#endif

}

H5D_POST_RECORD();
}

Expand Down Expand Up @@ -976,11 +972,12 @@ herr_t DARSHAN_DECL(H5Dclose)(hid_t dataset_id)
DARSHAN_TIMER_INC_NO_OVERLAP(rec_ref->dataset_rec->fcounters[H5D_F_META_TIME],
tm1, tm2, rec_ref->last_meta_end);
darshan_delete_record_ref(&(hdf5_dataset_runtime->hid_hash), &dataset_id, sizeof(hid_t));

#ifdef HAVE_LDMS
/* LDMS to publish runtime h5d tracing information to daemon*/
extern struct darshanConnector dC;
if(!dC.hdf5_enable_ldms)
darshan_ldms_connector_send(rec_ref->dataset_rec->base_rec.id, rec_ref->dataset_rec->base_rec.rank, -1, "close", -1, -1, -1, -1, rec_ref->dataset_rec->counters[H5D_FLUSHES], rec_ref->dataset_rec->fcounters[H5D_F_CLOSE_START_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_CLOSE_END_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_META_TIME], "H5D", "MOD");
/* LDMS to publish runtime h5d tracing information to daemon*/
extern struct darshanConnector dC;
if(!dC.hdf5_enable_ldms)
darshan_ldms_connector_send(rec_ref->dataset_rec->base_rec.id, rec_ref->dataset_rec->base_rec.rank, -1, "close", -1, -1, -1, -1, rec_ref->dataset_rec->counters[H5D_FLUSHES], rec_ref->dataset_rec->fcounters[H5D_F_CLOSE_START_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_CLOSE_END_TIMESTAMP], rec_ref->dataset_rec->fcounters[H5D_F_META_TIME], "H5D", "MOD");
#endif

}
Expand Down Expand Up @@ -1595,9 +1592,8 @@ static void hdf5_dataset_record_reduction_op(void* inrec_v, void* inoutrec_v,
tmp_dataset.counters[H5D_DATASPACE_NPOINTS] = inrec->counters[H5D_DATASPACE_NPOINTS];
tmp_dataset.counters[H5D_DATATYPE_SIZE] = inrec->counters[H5D_DATATYPE_SIZE];

for(j=H5D_CHUNK_SIZE_D1; j<=H5D_CHUNK_SIZE_D5; j++){
for(j=H5D_CHUNK_SIZE_D1; j<=H5D_CHUNK_SIZE_D5; j++)
tmp_dataset.counters[j] = inrec->counters[j];
}

if(inoutrec->counters[H5D_USE_MPIIO_COLLECTIVE] == 1 ||
inrec->counters[H5D_USE_MPIIO_COLLECTIVE] == 1)
Expand Down Expand Up @@ -1708,7 +1704,6 @@ static void hdf5_dataset_record_reduction_op(void* inrec_v, void* inoutrec_v,
inoutrec->fcounters[H5D_F_SLOWEST_RANK_TIME];
}


/* update pointers */
*inoutrec = tmp_dataset;
inoutrec++;
Expand Down Expand Up @@ -1948,7 +1943,6 @@ static void hdf5_dataset_mpi_redux(
rec_ref->dataset_rec->base_rec.rank = -1;
}


/* sort the array of records so we get all of the shared records
* (marked by rank -1) in a contiguous portion at end of the array
*/
Expand Down
40 changes: 11 additions & 29 deletions darshan-runtime/lib/darshan-mpiio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static int my_rank = -1;
#define MPIIO_UNLOCK() pthread_mutex_unlock(&mpiio_runtime_mutex)

#define MPIIO_WTIME() \
__darshan_disabled ? 0 : darshan_core_wtime(); \
__darshan_disabled ? 0 : darshan_core_wtime();

/* note that if the break condition is triggered in this macro, then it
* will exit the do/while loop holding a lock that will be released in
Expand All @@ -219,7 +219,6 @@ static int my_rank = -1;
struct mpiio_file_record_ref *rec_ref; \
char *newpath; \
int comm_size; \
extern struct darshanConnector dC;\
if(__ret != MPI_SUCCESS) break; \
newpath = darshan_clean_file_path(__path); \
if(!newpath) newpath = (char *)__path; \
Expand All @@ -245,11 +244,12 @@ static int my_rank = -1;
DARSHAN_TIMER_INC_NO_OVERLAP(rec_ref->file_rec->fcounters[MPIIO_F_META_TIME], \
__tm1, __tm2, rec_ref->last_meta_end); \
darshan_add_record_ref(&(mpiio_runtime->fh_hash), &__fh, sizeof(MPI_File), rec_ref); \
if(newpath != __path) free(newpath);\
if(newpath != __path) free(newpath); \
/* LDMS to publish realtime read tracing information to daemon*/ \
extern struct darshanConnector dC;\
if(!dC.ldms_lib)\
if(!dC.mpiio_enable_ldms)\
darshan_ldms_connector_send(rec_ref->file_rec->base_rec.id, rec_ref->file_rec->base_rec.rank, rec_ref->file_rec->counters[MPIIO_COLL_OPENS] + rec_ref->file_rec->counters[MPIIO_INDEP_OPENS], "open", -1, -1, -1, -1, -1, __tm1, __tm2, rec_ref->file_rec->fcounters[MPIIO_F_META_TIME], "MPIIO", "MET");\
darshan_ldms_connector_send(rec_ref->file_rec->base_rec.id, rec_ref->file_rec->base_rec.rank, rec_ref->file_rec->counters[MPIIO_COLL_OPENS] + rec_ref->file_rec->counters[MPIIO_INDEP_OPENS], "open", -1, -1, -1, -1, -1, __tm1, __tm2, rec_ref->file_rec->fcounters[MPIIO_F_META_TIME], "MPIIO", "MET");\
} while(0)

/* XXX: this check is needed to work around an OpenMPI bug that is triggered by
Expand All @@ -269,7 +269,6 @@ static int get_byte_offset = 0;
int64_t size_ll; \
struct darshan_common_val_counter *cvc; \
double __elapsed = __tm2-__tm1; \
extern struct darshanConnector dC;\
if(__ret != MPI_SUCCESS) break; \
rec_ref = darshan_lookup_record_ref(mpiio_runtime->fh_hash, &(__fh), sizeof(MPI_File)); \
if(!rec_ref) break; \
Expand Down Expand Up @@ -305,6 +304,7 @@ static int get_byte_offset = 0;
DARSHAN_TIMER_INC_NO_OVERLAP(rec_ref->file_rec->fcounters[MPIIO_F_READ_TIME], \
__tm1, __tm2, rec_ref->last_read_end); \
/* LDMS to publish realtime read tracing information to daemon*/ \
extern struct darshanConnector dC;\
if(!dC.ldms_lib)\
if(!dC.mpiio_enable_ldms)\
darshan_ldms_connector_send(rec_ref->file_rec->base_rec.id, rec_ref->file_rec->base_rec.rank, rec_ref->file_rec->counters[__counter], "read", displacement, size, -1, rec_ref->file_rec->counters[MPIIO_RW_SWITCHES], -1, __tm1, __tm2, rec_ref->file_rec->fcounters[MPIIO_F_READ_TIME], "MPIIO", "MOD");\
Expand All @@ -317,7 +317,6 @@ static int get_byte_offset = 0;
int64_t size_ll; \
struct darshan_common_val_counter *cvc; \
double __elapsed = __tm2-__tm1; \
extern struct darshanConnector dC; \
if(__ret != MPI_SUCCESS) break; \
rec_ref = darshan_lookup_record_ref(mpiio_runtime->fh_hash, &(__fh), sizeof(MPI_File)); \
if(!rec_ref) break; \
Expand Down Expand Up @@ -353,6 +352,7 @@ static int get_byte_offset = 0;
DARSHAN_TIMER_INC_NO_OVERLAP(rec_ref->file_rec->fcounters[MPIIO_F_WRITE_TIME], \
__tm1, __tm2, rec_ref->last_write_end); \
/* LDMS to publish realtime read tracing information to daemon*/ \
extern struct darshanConnector dC; \
if(!dC.ldms_lib)\
if(!dC.mpiio_enable_ldms)\
darshan_ldms_connector_send(rec_ref->file_rec->base_rec.id, rec_ref->file_rec->base_rec.rank, rec_ref->file_rec->counters[__counter], "write", displacement, size, -1, rec_ref->file_rec->counters[MPIIO_RW_SWITCHES], -1, __tm1, __tm2, rec_ref->file_rec->fcounters[MPIIO_F_WRITE_TIME], "MPIIO", "MOD");\
Expand All @@ -372,6 +372,7 @@ int DARSHAN_DECL(MPI_File_open)(MPI_Comm comm, char *filename, int amode, MPI_In
MPI_File tmp_fh;
char* tmp;
double tm1, tm2;

MAP_OR_FAIL(PMPI_File_open);

tm1 = MPIIO_WTIME();
Expand Down Expand Up @@ -406,7 +407,6 @@ int DARSHAN_DECL(MPI_File_read)(MPI_File fh, void *buf, int count,
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_read);
Expand Down Expand Up @@ -435,7 +435,6 @@ int DARSHAN_DECL(MPI_File_write)(MPI_File fh, void *buf, int count,
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_write);
Expand Down Expand Up @@ -517,7 +516,6 @@ int DARSHAN_DECL(MPI_File_read_all)(MPI_File fh, void * buf, int count, MPI_Data
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_read_all);
Expand Down Expand Up @@ -545,7 +543,6 @@ int DARSHAN_DECL(MPI_File_write_all)(MPI_File fh, void * buf, int count, MPI_Dat
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_write_all);
Expand Down Expand Up @@ -631,7 +628,6 @@ int DARSHAN_DECL(MPI_File_read_shared)(MPI_File fh, void * buf, int count, MPI_D
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_read_shared);
Expand Down Expand Up @@ -659,7 +655,6 @@ int DARSHAN_DECL(MPI_File_write_shared)(MPI_File fh, void * buf, int count, MPI_
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_write_shared);
Expand Down Expand Up @@ -690,7 +685,6 @@ int DARSHAN_DECL(MPI_File_read_ordered)(MPI_File fh, void * buf, int count,
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_read_ordered);
Expand Down Expand Up @@ -721,7 +715,6 @@ int DARSHAN_DECL(MPI_File_write_ordered)(MPI_File fh, void * buf, int count,
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_write_ordered);
Expand Down Expand Up @@ -752,7 +745,6 @@ int DARSHAN_DECL(MPI_File_read_all_begin)(MPI_File fh, void * buf, int count, MP
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_read_all_begin);
Expand All @@ -779,7 +771,6 @@ int DARSHAN_DECL(MPI_File_write_all_begin)(MPI_File fh, void * buf, int count, M
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_write_all_begin);
Expand Down Expand Up @@ -862,7 +853,6 @@ int DARSHAN_DECL(MPI_File_read_ordered_begin)(MPI_File fh, void * buf, int count
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_read_ordered_begin);
Expand Down Expand Up @@ -890,7 +880,6 @@ int DARSHAN_DECL(MPI_File_write_ordered_begin)(MPI_File fh, void * buf, int coun
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_write_ordered_begin);
Expand Down Expand Up @@ -919,7 +908,6 @@ int DARSHAN_DECL(MPI_File_iread)(MPI_File fh, void * buf, int count, MPI_Datatyp
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_iread);
Expand Down Expand Up @@ -948,7 +936,6 @@ int DARSHAN_DECL(MPI_File_iwrite)(MPI_File fh, void * buf, int count,
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_iwrite);
Expand Down Expand Up @@ -1036,7 +1023,6 @@ int DARSHAN_DECL(MPI_File_iread_shared)(MPI_File fh, void * buf, int count,
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_iread_shared);
Expand Down Expand Up @@ -1067,7 +1053,6 @@ int DARSHAN_DECL(MPI_File_iwrite_shared)(MPI_File fh, void * buf, int count,
{
int ret;
double tm1, tm2;

MPI_Offset offset;

MAP_OR_FAIL(PMPI_File_iwrite_shared);
Expand Down Expand Up @@ -1202,10 +1187,10 @@ int DARSHAN_DECL(MPI_File_close)(MPI_File *fh)
&tmp_fh, sizeof(MPI_File));

#ifdef HAVE_LDMS
/* publish close information for mpiio */
extern struct darshanConnector dC;
if(!dC.mpiio_enable_ldms)
darshan_ldms_connector_send(rec_ref->file_rec->base_rec.id, rec_ref->file_rec->base_rec.rank, -1, "close", -1, -1, -1, -1, -1, tm1, tm2, rec_ref->file_rec->fcounters[MPIIO_F_META_TIME], "MPIIO", "MOD");
/* publish close information for mpiio */
extern struct darshanConnector dC;
if(!dC.mpiio_enable_ldms)
darshan_ldms_connector_send(rec_ref->file_rec->base_rec.id, rec_ref->file_rec->base_rec.rank, -1, "close", -1, -1, -1, -1, -1, tm1, tm2, rec_ref->file_rec->fcounters[MPIIO_F_META_TIME], "MPIIO", "MOD");
#endif

}
Expand Down Expand Up @@ -1389,7 +1374,6 @@ static void mpiio_record_reduction_op(void* infile_v, void* inoutfile_v,
&(tmp_file.counters[MPIIO_ACCESS1_ACCESS]),
&(tmp_file.counters[MPIIO_ACCESS1_COUNT]),
&inoutfile->counters[j], 1, inoutfile->counters[j+4], 1);

}

/* min non-zero (if available) value */
Expand Down Expand Up @@ -1492,14 +1476,12 @@ static void mpiio_record_reduction_op(void* infile_v, void* inoutfile_v,
inoutfile->fcounters[MPIIO_F_SLOWEST_RANK_TIME];
}


/* update pointers */
*inoutfile = tmp_file;
inoutfile++;
infile++;
}


return;
}

Expand Down
Loading

0 comments on commit e0cd83f

Please sign in to comment.