Commit 801ef4a1 authored by Shane Snyder's avatar Shane Snyder Committed by Sudheer Chunduri
Browse files

Fix compiler warnings in APXC/APMPI

parent deb0d361
......@@ -340,7 +340,6 @@ static void capture(struct darshan_apmpi_perf_record *rec,
static void apmpi_runtime_initialize()
{
size_t apmpi_buf_size;
char rec_name[128];
darshan_module_funcs mod_funcs = {
#ifdef HAVE_MPI
......@@ -455,7 +454,6 @@ static void apmpi_shared_record_variance(MPI_Comm mod_comm)
{
MPI_Datatype var_dt;
MPI_Op var_op;
int i;
struct darshan_variance_dt *var_send_buf = NULL;
struct darshan_variance_dt *var_recv_buf = NULL;
......@@ -530,7 +528,7 @@ static void apmpi_mpi_redux(
struct darshan_apmpi_perf_record *red_recv_buf = NULL;
struct darshan_apmpi_perf_record *apmpi_rec_buf = (struct darshan_apmpi_perf_record *)apmpi_buf;
#endif
MPI_Datatype red_type;
//MPI_Datatype red_type;
//MPI_Op red_op;
APMPI_LOCK();
......@@ -597,8 +595,6 @@ static void apmpi_shutdown(
void **apmpi_buf,
int *apmpi_buf_sz)
{
int apmpi_rec_count;
APMPI_LOCK();
assert(apmpi_runtime);
*apmpi_buf_sz = 0;
......@@ -780,7 +776,7 @@ int DARSHAN_DECL(MPI_Recv)(void *buf, int count, MPI_Datatype datatype, int sour
{
MAP_OR_FAIL(PMPI_Recv);
TIME(__real_PMPI_Recv(buf, count, datatype, source, tag, comm, status));
int count_received, src;
int count_received; //, src;
if (status != MPI_STATUS_IGNORE) {
PMPI_Get_count(status, datatype, &count_received);
if (count_received == MPI_UNDEFINED) count_received = count;
......
......@@ -414,8 +414,6 @@ static void apxc_shutdown(
void **apxc_buf,
int *apxc_buf_sz)
{
int apxc_rec_count;
APXC_LOCK();
assert(apxc_runtime);
*apxc_buf_sz = 0;
......
......@@ -192,13 +192,13 @@ static void darshan_log_print_apxc_rec(void *rec, char *file_name,
if (first_rec)
{
hdr_rec = rec;
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec->base_rec.rank, hdr_rec->base_rec.id,
"APXC_GROUPS", hdr_rec->ngroups, "", "", "");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec->base_rec.rank, hdr_rec->base_rec.id,
"APXC_CHASSIS", hdr_rec->nchassis, "", "", "");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec->base_rec.rank, hdr_rec->base_rec.id,
"APXC_BLADES", hdr_rec->nblades, "", "", "");
DARSHAN_S_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
......@@ -222,16 +222,16 @@ static void darshan_log_print_apxc_rec(void *rec, char *file_name,
{
prf_rec = rec;
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec->base_rec.rank, prf_rec->base_rec.id,
"APXC_GROUP", prf_rec->group, "", "", "");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec->base_rec.rank, prf_rec->base_rec.id,
"APXC_CHASSIS", prf_rec->chassis, "", "", "");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec->base_rec.rank, prf_rec->base_rec.id,
"APXC_BLADE", prf_rec->blade, "", "", "");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec->base_rec.rank, prf_rec->base_rec.id,
"APXC_NODE", prf_rec->node, "", "", "");
......@@ -293,15 +293,15 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
if (!hdr_rec2)
{
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"APXC_GROUPS", hdr_rec1->ngroups, "", "", "");
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"APXC_CHASSIS", hdr_rec1->nchassis, "", "", "");
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"APXC_BLADES", hdr_rec1->nblades, "", "", "");
printf("- ");
......@@ -327,15 +327,15 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
else if (!hdr_rec1)
{
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"APXC_GROUPS", hdr_rec2->ngroups, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"APXC_CHASSIS", hdr_rec2->nchassis, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"APXC_BLADES", hdr_rec2->nblades, "", "", "");
printf("+ ");
......@@ -363,34 +363,34 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
if (hdr_rec1->ngroups != hdr_rec2->ngroups)
{
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"APXC_GROUPS", hdr_rec1->ngroups, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"APXC_GROUPS", hdr_rec2->ngroups, "", "", "");
}
if (hdr_rec1->nchassis != hdr_rec2->nchassis)
{
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"APXC_CHASSIS", hdr_rec1->nchassis, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"APXC_CHASSIS", hdr_rec2->nchassis, "", "", "");
}
if (hdr_rec1->nblades != hdr_rec2->nblades)
{
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec1->base_rec.rank, hdr_rec1->base_rec.id,
"APXC_BLADES", hdr_rec1->nblades, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
hdr_rec2->base_rec.rank, hdr_rec2->base_rec.id,
"APXC_BLADES", hdr_rec2->nblades, "", "", "");
}
......@@ -461,38 +461,38 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
if (!prf_rec2)
{
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec1->base_rec.rank, prf_rec1->base_rec.id,
"APXC_GROUP", prf_rec1->group, "", "", "");
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec1->base_rec.rank, prf_rec1->base_rec.id,
"APXC_CHASSIS", prf_rec1->chassis, "", "", "");
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec1->base_rec.rank, prf_rec1->base_rec.id,
"APXC_BLADE", prf_rec1->blade, "", "", "");
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec1->base_rec.rank, prf_rec1->base_rec.id,
"APXC_NODE", prf_rec1->node, "", "", "");
}
else if (!prf_rec1)
{
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec2->base_rec.rank, prf_rec2->base_rec.id,
"APXC_GROUP", prf_rec2->group, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec2->base_rec.rank, prf_rec2->base_rec.id,
"APXC_CHASSIS", prf_rec2->chassis, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec2->base_rec.rank, prf_rec2->base_rec.id,
"APXC_BLADE", prf_rec2->blade, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec2->base_rec.rank, prf_rec2->base_rec.id,
"APXC_NODE", prf_rec2->node, "", "", "");
}
......@@ -500,44 +500,44 @@ static void darshan_log_print_apxc_rec_diff(void *file_rec1, char *file_name1,
if (prf_rec1->group != prf_rec2->group)
{
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec1->base_rec.rank, prf_rec1->base_rec.id,
"APXC_GROUP", prf_rec1->group, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec2->base_rec.rank, prf_rec2->base_rec.id,
"APXC_GROUP", prf_rec2->group, "", "", "");
}
if (prf_rec1->chassis != prf_rec2->chassis)
{
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec1->base_rec.rank, prf_rec1->base_rec.id,
"APXC_CHASSIS", prf_rec1->chassis, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec2->base_rec.rank, prf_rec2->base_rec.id,
"APXC_CHASSIS", prf_rec2->chassis, "", "", "");
}
if (prf_rec1->blade != prf_rec2->blade)
{
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec1->base_rec.rank, prf_rec1->base_rec.id,
"APXC_BLADE", prf_rec1->blade, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec2->base_rec.rank, prf_rec2->base_rec.id,
"APXC_BLADE", prf_rec2->blade, "", "", "");
}
if (prf_rec1->node != prf_rec2->node)
{
printf("- ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec1->base_rec.rank, prf_rec1->base_rec.id,
"APXC_NODE", prf_rec1->node, "", "", "");
printf("+ ");
DARSHAN_I_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
DARSHAN_D_COUNTER_PRINT(darshan_module_names[DARSHAN_APXC_MOD],
prf_rec2->base_rec.rank, prf_rec2->base_rec.id,
"APXC_NODE", prf_rec2->node, "", "", "");
}
......
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