Commit 1c0e3d0a authored by Kevin Harms's avatar Kevin Harms
Browse files

change NUM_INDICES to be consistent with other modules

parent 30c7bc6b
......@@ -419,7 +419,7 @@
X(AR_RTR_PT_5_7_INQ_PRF_REQ_ROWBUS_STALL_CNT) \
X(AR_RTR_PT_5_7_INQ_PRF_RSP_ROWBUS_STALL_CNT) \
/* end of counters */\
X(APXC_PERF_NUM_INDICES)
X(APXC_NUM_INDICES)
#define APXC_MEMORY_MODES \
X(MM_UNKNOWN) \
......@@ -467,7 +467,7 @@ enum apxc_cluster_modes
struct darshan_apxc_perf_record
{
struct darshan_base_record base_rec;
int64_t counters[APXC_PERF_NUM_INDICES];
int64_t counters[APXC_NUM_INDICES];
};
struct darshan_apxc_header_record
......
......@@ -25,8 +25,8 @@
char *apxc_counter_names[] = {
APXC_PERF_COUNTERS
};
char *mmodes[] = { APXC_MEMORY_MODES };
char *cmodes[] = { APXC_CLUSTER_MODES };
char *apxc_mmodes[] = { APXC_MEMORY_MODES };
char *apxc_cmodes[] = { APXC_CLUSTER_MODES };
#undef X
static int darshan_log_get_apxc_rec(darshan_fd fd, void** buf_p);
......@@ -122,7 +122,7 @@ static int darshan_log_get_apxc_rec(darshan_fd fd, void** buf_p)
perf_rec = (struct darshan_apxc_perf_record*)buffer;
DARSHAN_BSWAP64(&(hdr_rec->base_rec.id));
DARSHAN_BSWAP64(&(hdr_rec->base_rec.rank));
for (i = 0; i < APXC_PERF_NUM_INDICES; i++)
for (i = 0; i < APXC_NUM_INDICES; i++)
{
DARSHAN_BSWAP64(&perf_rec->counters[i]);
}
......@@ -190,13 +190,13 @@ static void darshan_log_print_apxc_rec(void *rec, char *file_name,
"blades", hdr_rec->nblades, "", "", "");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec->base_rec.rank, hdr_rec->base_rec.id,
"memory_mode", mmodes[hdr_rec->memory_mode & ~(1<<31)], "", "", "");
"memory_mode", apxc_mmodes[hdr_rec->memory_mode & ~(1<<31)], "", "", "");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec->base_rec.rank, hdr_rec->base_rec.id,
"memory_mode_consistent", ((hdr_rec->memory_mode & (1<<31)) == 0), "", "", "");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec->base_rec.rank, hdr_rec->base_rec.id,
"cluster_mode", cmodes[hdr_rec->cluster_mode & ~(1<<31)], "", "", "");
"cluster_mode", apxc_cmodes[hdr_rec->cluster_mode & ~(1<<31)], "", "", "");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec->base_rec.rank, hdr_rec->base_rec.id,
"cluster_mode_consistent", ((hdr_rec->cluster_mode & (1<<31)) == 0), "", "", "");
......@@ -206,7 +206,7 @@ static void darshan_log_print_apxc_rec(void *rec, char *file_name,
{
perf_rec = rec;
for(i = 0; i < APXC_PERF_NUM_INDICES; i++)
for(i = 0; i < APXC_NUM_INDICES; i++)
{
DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
perf_rec->base_rec.rank, perf_rec->base_rec.id,
......@@ -272,7 +272,7 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
printf("- ");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"memory_mode", mmodes[hdr_rec1->memory_mode & ~(1<<31)], "", "", "");
"memory_mode", apxc_mmodes[hdr_rec1->memory_mode & ~(1<<31)], "", "", "");
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
......@@ -280,7 +280,7 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
printf("- ");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"cluster_mode", cmodes[hdr_rec1->cluster_mode & ~(1<<31)], "", "", "");
"cluster_mode", apxc_cmodes[hdr_rec1->cluster_mode & ~(1<<31)], "", "", "");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"cluster_mode_consistent", ((hdr_rec1->cluster_mode & (1<<31)) == 0), "", "", "");
......@@ -303,7 +303,7 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
printf("+ ");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"memory_mode", mmodes[hdr_rec2->memory_mode & ~(1<<31)], "", "", "");
"memory_mode", apxc_mmodes[hdr_rec2->memory_mode & ~(1<<31)], "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
......@@ -311,7 +311,7 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
printf("+ ");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"cluster_mode", cmodes[hdr_rec2->cluster_mode & ~(1<<31)], "", "", "");
"cluster_mode", apxc_cmodes[hdr_rec2->cluster_mode & ~(1<<31)], "", "", "");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"cluster_mode_consistent", ((hdr_rec2->cluster_mode & (1<<31)) == 0), "", "", "");
......@@ -358,11 +358,11 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
printf("- ");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"memory_mode", mmodes[hdr_rec1->memory_mode & ~(1<<31)], "", "", "");
"memory_mode", apxc_mmodes[hdr_rec1->memory_mode & ~(1<<31)], "", "", "");
printf("+ ");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"memory_mode", mmodes[hdr_rec2->memory_mode & ~(1<<31)], "", "", "");
"memory_mode", apxc_mmodes[hdr_rec2->memory_mode & ~(1<<31)], "", "", "");
}
if ((hdr_rec1->memory_mode & (1<<31)) !=
(hdr_rec2->memory_mode & (1<<31)))
......@@ -382,11 +382,11 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
printf("- ");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"cluster_mode", cmodes[hdr_rec1->cluster_mode & ~(1<<31)], "", "", "");
"cluster_mode", apxc_cmodes[hdr_rec1->cluster_mode & ~(1<<31)], "", "", "");
printf("+ ");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"cluster_mode", cmodes[hdr_rec2->cluster_mode & ~(1<<31)], "", "", "");
"cluster_mode", apxc_cmodes[hdr_rec2->cluster_mode & ~(1<<31)], "", "", "");
}
if ((hdr_rec1->cluster_mode & (1<<31)) !=
(hdr_rec2->cluster_mode & (1<<31)))
......@@ -406,7 +406,7 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
{
int i;
/* router tile record */
for(i = 0; i < APXC_PERF_NUM_INDICES; i++)
for(i = 0; i < APXC_NUM_INDICES; i++)
{
if (!prf_rec2)
{
......
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