Commit 8d3a2c8a authored by Philip Carns's avatar Philip Carns

Merge remote-tracking branch 'origin/master' into dev-stdio

parents 841429de f88ebef6
...@@ -115,7 +115,8 @@ hid_t DARSHAN_DECL(H5Fcreate)(const char *filename, unsigned flags, ...@@ -115,7 +115,8 @@ hid_t DARSHAN_DECL(H5Fcreate)(const char *filename, unsigned flags,
file = hdf5_file_by_name_sethid(filename, ret); file = hdf5_file_by_name_sethid(filename, ret);
if(file) if(file)
{ {
if(file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] == 0) if(file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] == 0 ||
file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] > tm1)
file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] = tm1; file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] = tm1;
file->file_record->counters[HDF5_OPENS] += 1; file->file_record->counters[HDF5_OPENS] += 1;
} }
...@@ -154,7 +155,8 @@ hid_t DARSHAN_DECL(H5Fopen)(const char *filename, unsigned flags, ...@@ -154,7 +155,8 @@ hid_t DARSHAN_DECL(H5Fopen)(const char *filename, unsigned flags,
file = hdf5_file_by_name_sethid(filename, ret); file = hdf5_file_by_name_sethid(filename, ret);
if(file) if(file)
{ {
if(file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] == 0) if(file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] == 0 ||
file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] > tm1)
file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] = tm1; file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] = tm1;
file->file_record->counters[HDF5_OPENS] += 1; file->file_record->counters[HDF5_OPENS] += 1;
} }
......
...@@ -151,7 +151,8 @@ static void mpiio_shutdown(void); ...@@ -151,7 +151,8 @@ static void mpiio_shutdown(void);
file->file_record->counters[MPIIO_COLL_OPENS] += 1; \ file->file_record->counters[MPIIO_COLL_OPENS] += 1; \
if(__info != MPI_INFO_NULL) \ if(__info != MPI_INFO_NULL) \
file->file_record->counters[MPIIO_HINTS] += 1; \ file->file_record->counters[MPIIO_HINTS] += 1; \
if(file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] == 0) \ if(file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] == 0 || \
file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] > __tm1) \
file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] = __tm1; \ file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] = __tm1; \
DARSHAN_TIMER_INC_NO_OVERLAP(file->file_record->fcounters[MPIIO_F_META_TIME], __tm1, __tm2, file->last_meta_end); \ DARSHAN_TIMER_INC_NO_OVERLAP(file->file_record->fcounters[MPIIO_F_META_TIME], __tm1, __tm2, file->last_meta_end); \
} while(0) } while(0)
......
...@@ -112,7 +112,8 @@ int DARSHAN_DECL(ncmpi_create)(MPI_Comm comm, const char *path, ...@@ -112,7 +112,8 @@ int DARSHAN_DECL(ncmpi_create)(MPI_Comm comm, const char *path,
file = pnetcdf_file_by_name_setncid(path, (*ncidp)); file = pnetcdf_file_by_name_setncid(path, (*ncidp));
if(file) if(file)
{ {
if(file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] == 0) if(file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] == 0 ||
file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] > tm1)
file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] = tm1; file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] = tm1;
DARSHAN_MPI_CALL(PMPI_Comm_size)(comm, &comm_size); DARSHAN_MPI_CALL(PMPI_Comm_size)(comm, &comm_size);
if(comm_size == 1) if(comm_size == 1)
...@@ -160,7 +161,8 @@ int DARSHAN_DECL(ncmpi_open)(MPI_Comm comm, const char *path, ...@@ -160,7 +161,8 @@ int DARSHAN_DECL(ncmpi_open)(MPI_Comm comm, const char *path,
file = pnetcdf_file_by_name_setncid(path, (*ncidp)); file = pnetcdf_file_by_name_setncid(path, (*ncidp));
if(file) if(file)
{ {
if(file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] == 0) if(file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] == 0 ||
file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] > tm1)
file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] = tm1; file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] = tm1;
DARSHAN_MPI_CALL(PMPI_Comm_size)(comm, &comm_size); DARSHAN_MPI_CALL(PMPI_Comm_size)(comm, &comm_size);
if(comm_size == 1) if(comm_size == 1)
......
...@@ -224,7 +224,8 @@ static void posix_shutdown(void); ...@@ -224,7 +224,8 @@ static void posix_shutdown(void);
file->file_record->counters[POSIX_FOPENS] += 1; \ file->file_record->counters[POSIX_FOPENS] += 1; \
else \ else \
file->file_record->counters[POSIX_OPENS] += 1; \ file->file_record->counters[POSIX_OPENS] += 1; \
if(file->file_record->fcounters[POSIX_F_OPEN_TIMESTAMP] == 0) \ if(file->file_record->fcounters[POSIX_F_OPEN_TIMESTAMP] == 0 || \
file->file_record->fcounters[POSIX_F_OPEN_TIMESTAMP] > __tm1) \
file->file_record->fcounters[POSIX_F_OPEN_TIMESTAMP] = __tm1; \ file->file_record->fcounters[POSIX_F_OPEN_TIMESTAMP] = __tm1; \
DARSHAN_TIMER_INC_NO_OVERLAP(file->file_record->fcounters[POSIX_F_META_TIME], __tm1, __tm2, file->last_meta_end); \ DARSHAN_TIMER_INC_NO_OVERLAP(file->file_record->fcounters[POSIX_F_META_TIME], __tm1, __tm2, file->last_meta_end); \
} while(0) } while(0)
......
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