Skip to content

Commit 331dc95

Browse files
Shane SnyderShane Snyder
authored andcommitted
drop DFS_USE_DTX counter
1 parent ff0d0ac commit 331dc95

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

darshan-runtime/lib/darshan-dfs.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ static int my_rank = -1;
228228
#define DFS_RECORD_FILE_OBJREF_OPEN(__rec_ref, __counter, __obj_p, __tm1, __tm2) do { \
229229
if(!__rec_ref) break; \
230230
__rec_ref->file_rec->counters[__counter] += 1; \
231-
if(getenv("DFS_USE_DTX")) __rec_ref->file_rec->counters[DFS_USE_DTX] = 1; \
232231
if(__rec_ref->file_rec->fcounters[DFS_F_OPEN_START_TIMESTAMP] == 0 || \
233232
__rec_ref->file_rec->fcounters[DFS_F_OPEN_START_TIMESTAMP] > __tm1) \
234233
__rec_ref->file_rec->fcounters[DFS_F_OPEN_START_TIMESTAMP] = __tm1; \
@@ -1022,7 +1021,6 @@ static void dfs_record_reduction_op(
10221021
}
10231022

10241023
tmp_file.counters[DFS_CHUNK_SIZE] = infile->counters[DFS_CHUNK_SIZE];
1025-
tmp_file.counters[DFS_USE_DTX] = infile->counters[DFS_USE_DTX];
10261024

10271025
/* min non-zero (if available) value */
10281026
for(j=DFS_F_OPEN_START_TIMESTAMP; j<=DFS_F_CLOSE_START_TIMESTAMP; j++)

darshan-util/darshan-dfs-logutils.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ static void darshan_log_print_dfs_description(int ver)
246246
printf("# DFS_ACCESS*_ACCESS: the four most common access sizes.\n");
247247
printf("# DFS_ACCESS*_COUNT: count of the four most common access sizes.\n");
248248
printf("# DFS_CHUNK_SIZE: DFS file chunk size.\n");
249-
printf("# DFS_USE_DTX: whether DFS distributed transactions are used.\n");
250249
printf("# DFS_*_RANK: rank of the processes that were the fastest and slowest at I/O (for shared files).\n");
251250
printf("# DFS_*_RANK_BYTES: bytes transferred by the fastest and slowest ranks (for shared files).\n");
252251
printf("# DFS_F_*_START_TIMESTAMP: timestamp of first open/read/write/close.\n");
@@ -445,7 +444,6 @@ static void darshan_log_agg_dfs_files(void *rec, void *agg_rec, int init_flag)
445444
agg_dfs_rec->counters[i] = -1;
446445
break;
447446
case DFS_CHUNK_SIZE:
448-
case DFS_USE_DTX:
449447
/* just set to the input value */
450448
agg_dfs_rec->counters[i] = dfs_rec->counters[i];
451449
break;

darshan-util/pydarshan/darshan/tests/test_report.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,9 @@ def test_dfs_daos_posix_match():
108108
# or we need to handle the data differently between POSIX
109109
# and DAOS DFS
110110
if column_name in ["id", "DFS_LOOKUPS", "DFS_NB_READS", "DFS_NB_WRITES",
111-
"DFS_GET_SIZES", "DFS_PUNCHES", "DFS_MOVES",
112-
"DFS_EXCHANGES",
113-
"DFS_STATS",
114-
"DFS_CHUNK_SIZE", "DFS_USE_DTX", "DFS_FASTEST_RANK",
115-
"DFS_SLOWEST_RANK"]:
111+
"DFS_GET_SIZES", "DFS_PUNCHES", "DFS_STATS",
112+
"DFS_CHUNK_SIZE",
113+
"DFS_FASTEST_RANK", "DFS_SLOWEST_RANK"]:
116114
continue
117115
elif "time" in column_name.lower():
118116
# you can't reasonably expect the timestamps to be the

include/darshan-dfs-log-format.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@
8282
X(DFS_ACCESS4_COUNT) \
8383
/* dfs file chunk size */\
8484
X(DFS_CHUNK_SIZE) \
85-
/* whether dfs distributed transactions are used */\
86-
X(DFS_USE_DTX) \
8785
/* rank and number of bytes moved for fastest/slowest ranks */\
8886
X(DFS_FASTEST_RANK) \
8987
X(DFS_FASTEST_RANK_BYTES) \

0 commit comments

Comments
 (0)