From 118ad27b1e7ba3504f785856ca3e211b13f478a4 Mon Sep 17 00:00:00 2001 From: John Jenkins Date: Fri, 8 Jan 2016 18:12:57 -0600 Subject: [PATCH] stray warnings --- src/networks/model-net/dragonfly.c | 3 +++ src/networks/model-net/loggp.c | 3 ++- src/networks/model-net/model-net-lp.c | 2 +- src/networks/model-net/model-net-sched-impl.c | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/networks/model-net/dragonfly.c b/src/networks/model-net/dragonfly.c index 34678c7..4af95e9 100644 --- a/src/networks/model-net/dragonfly.c +++ b/src/networks/model-net/dragonfly.c @@ -2206,6 +2206,8 @@ static int do_adaptive_routing( router_state * s, tw_lpid nonmin_next_stop = get_next_stop(s, msg, NON_MINIMAL, dest_router_id, intm_id); nonmin_out_port = get_output_port(s, msg, nonmin_next_stop); +#if 0 + NOTE: VCs are set but not used... disabling for now int nomin_vc = 0; if(nonmin_out_port < s->params->num_routers) { nomin_vc = msg->my_l_hop; @@ -2220,6 +2222,7 @@ static int do_adaptive_routing( router_state * s, s->params->num_global_channels)) { min_vc = msg->my_g_hop; } +#endif int min_port_count = s->vc_occupancy[minimal_out_port][0] + s->vc_occupancy[minimal_out_port][1] + s->vc_occupancy[minimal_out_port][2] + s->queued_count[minimal_out_port]; diff --git a/src/networks/model-net/loggp.c b/src/networks/model-net/loggp.c index 825550c..31bd5e3 100644 --- a/src/networks/model-net/loggp.c +++ b/src/networks/model-net/loggp.c @@ -4,6 +4,7 @@ * */ +#include #include #include #include @@ -757,7 +758,7 @@ void loggp_set_params(const char * config_file, loggp_param * params){ line_nr++; if(buffer[0] == '#') continue; - ret = sscanf(buffer, "%llu %d %lf %lf %lf %lf %lf %lf %lf %lf %lf", + ret = sscanf(buffer, "%"PRIu64" %d %lf %lf %lf %lf %lf %lf %lf %lf %lf", ¶ms->table[params->table_size].size, ¶ms->table[params->table_size].n, ¶ms->table[params->table_size].PRTT_10s, diff --git a/src/networks/model-net/model-net-lp.c b/src/networks/model-net/model-net-lp.c index 3ed6386..3e4e238 100644 --- a/src/networks/model-net/model-net-lp.c +++ b/src/networks/model-net/model-net-lp.c @@ -228,7 +228,7 @@ static void base_read_config(const char * anno, model_net_base_params *p){ p->sched_params.u.prio.sub_stype != MN_SCHED_FCFS_FULL))){ packet_size = 512; fprintf(stderr, "WARNING, no packet size specified, setting packet " - "size to %llu\n", packet_size); + "size to %llu\n", LLU(packet_size)); } diff --git a/src/networks/model-net/model-net-sched-impl.c b/src/networks/model-net/model-net-sched-impl.c index 19951f3..68b616e 100644 --- a/src/networks/model-net/model-net-sched-impl.c +++ b/src/networks/model-net/model-net-sched-impl.c @@ -266,7 +266,7 @@ int fcfs_next( else{ dprintf("%llu (mn): issuing packet of size %llu (of %llu) " "from %llu to %llu at %1.5e (last:%d)\n", - LLU(lp->gid), LLU(psize), q->rem, LLU(q->req.src_lp), + LLU(lp->gid), LLU(psize), LLU(q->rem), LLU(q->req.src_lp), LLU(q->req.final_dest_lp), tw_now(lp), is_last_packet); *poffset = s->method->model_net_method_packet_event(&q->req, q->req.msg_size - q->rem, psize, 0.0, &q->sched_params, -- 2.26.2