Commit a95ea110 authored by Sudheer Chunduri's avatar Sudheer Chunduri
Browse files

fixing record name isses in APXC

parent 7c34b6a4
......@@ -53,11 +53,10 @@
X(a ## _TOTAL_BYTES), \
X(a ## _MSG_SIZE_AGG_0_256), \
X(a ## _MSG_SIZE_AGG_256_1K), \
X(a ## _MSG_SIZE_AGG_1K_32K), \
X(a ## _MSG_SIZE_AGG_32K_256K), \
X(a ## _MSG_SIZE_AGG_1K_8K), \
X(a ## _MSG_SIZE_AGG_8K_256K), \
X(a ## _MSG_SIZE_AGG_256K_1M), \
X(a ## _MSG_SIZE_AGG_1M_4M), \
X(a ## _MSG_SIZE_AGG_4M_PLUS), \
X(a ## _MSG_SIZE_AGG_1M_PLUS), \
#define Y(a) \
X(a ## _TOTAL_TIME),
......
......@@ -55,16 +55,14 @@ typedef long long ap_bytes_t;
*(__bucket_base_p) += 1; \
else if(__value < 1025) \
*(__bucket_base_p + 1) += 1; \
else if(__value < 32769) \
else if(__value < 8193) \
*(__bucket_base_p + 2) += 1; \
else if(__value < 262145) \
*(__bucket_base_p + 3) += 1; \
else if(__value < 1048577) \
*(__bucket_base_p + 4) += 1; \
else if(__value < 4194305) \
*(__bucket_base_p + 5) += 1; \
else \
*(__bucket_base_p + 6) += 1; \
*(__bucket_base_p + 5) += 1; \
} while(0)
......@@ -235,8 +233,9 @@ void apmpi_runtime_initialize()
return;
}
memset(apmpi_runtime, 0, sizeof(*apmpi_runtime));
sprintf(rec_name, "darshan-apmpi-%d", my_rank);
apmpi_runtime->rec_id = darshan_core_gen_record_id(rec_name);
//sprintf(rec_name, "darshan-apmpi-%d", my_rank);
//apmpi_runtime->rec_id = darshan_core_gen_record_id(rec_name);
apmpi_runtime->rec_id = darshan_core_gen_record_id("APMPI"); //record name
apmpi_runtime->perf_record = darshan_core_register_record(
apmpi_runtime->rec_id,
......
......@@ -178,6 +178,8 @@ void apxc_runtime_initialize()
&apxc_buf_size,
&my_rank,
NULL);
printf("L 182 --- my_rank: %d apxc_buf_size:%d \n", my_rank, apxc_buf_size);
/* not enough memory to fit crayxc module record */
if(apxc_buf_size < sizeof(struct darshan_apxc_header_record) + sizeof(struct darshan_apxc_perf_record))
{
......@@ -204,7 +206,7 @@ void apxc_runtime_initialize()
apxc_runtime->header_record = darshan_core_register_record(
apxc_runtime->header_id,
//NULL,
"APXC",
"darshan-crayxc-header",
DARSHAN_APXC_MOD,
sizeof(struct darshan_apxc_header_record),
NULL);
......@@ -228,12 +230,14 @@ void apxc_runtime_initialize()
sprintf(rtr_rec_name, "darshan-crayxc-rtr-%d-%d-%d",
apxc_runtime->group, apxc_runtime->chassis, apxc_runtime->blade);
apxc_runtime->rtr_id = darshan_core_gen_record_id(rtr_rec_name);
//apxc_runtime->rtr_id = darshan_core_gen_record_id(rtr_rec_name);
apxc_runtime->rtr_id = darshan_core_gen_record_id("APXC");
printf("L 234 --- my_rank: %d apxc_runtime->rtr_id:%lu rtr_rec_name: %s g: %d c: %d b: %d n: %d \n", my_rank, apxc_runtime->rtr_id, rtr_rec_name, apxc_runtime->group, apxc_runtime->chassis, apxc_runtime->blade, apxc_runtime->node);
apxc_runtime->perf_record = darshan_core_register_record(
apxc_runtime->rtr_id,
//NULL,
"APXC",
"APXC", // we want the record for each rank to be treated as shared records so that mpi_redux can operate on
//rtr_rec_name,
DARSHAN_APXC_MOD,
sizeof(struct darshan_apxc_perf_record),
NULL);
......
......@@ -138,14 +138,14 @@ static int darshan_log_get_apxc_rec(darshan_fd fd, void** buf_p)
}
else if (ret < 0)
{
*buf_p = NULL;
if (buffer) free(buffer);
//*buf_p = NULL;
// if (buffer) free(buffer);
return(-1);
}
else
{
*buf_p = NULL;
if (buffer) free(buffer);
// *buf_p = NULL;
// if (buffer) free(buffer);
return(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