Commit 118ad27b authored by Jonathan Jenkins's avatar Jonathan Jenkins

stray warnings

parent f73cdd04
...@@ -2206,6 +2206,8 @@ static int do_adaptive_routing( router_state * s, ...@@ -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); 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); 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; int nomin_vc = 0;
if(nonmin_out_port < s->params->num_routers) { if(nonmin_out_port < s->params->num_routers) {
nomin_vc = msg->my_l_hop; nomin_vc = msg->my_l_hop;
...@@ -2220,6 +2222,7 @@ static int do_adaptive_routing( router_state * s, ...@@ -2220,6 +2222,7 @@ static int do_adaptive_routing( router_state * s,
s->params->num_global_channels)) { s->params->num_global_channels)) {
min_vc = msg->my_g_hop; min_vc = msg->my_g_hop;
} }
#endif
int min_port_count = s->vc_occupancy[minimal_out_port][0] + 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->vc_occupancy[minimal_out_port][1] + s->vc_occupancy[minimal_out_port][2]
+ s->queued_count[minimal_out_port]; + s->queued_count[minimal_out_port];
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
* *
*/ */
#include <inttypes.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <ross.h> #include <ross.h>
...@@ -757,7 +758,7 @@ void loggp_set_params(const char * config_file, loggp_param * params){ ...@@ -757,7 +758,7 @@ void loggp_set_params(const char * config_file, loggp_param * params){
line_nr++; line_nr++;
if(buffer[0] == '#') if(buffer[0] == '#')
continue; 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",
&params->table[params->table_size].size, &params->table[params->table_size].size,
&params->table[params->table_size].n, &params->table[params->table_size].n,
&params->table[params->table_size].PRTT_10s, &params->table[params->table_size].PRTT_10s,
......
...@@ -228,7 +228,7 @@ static void base_read_config(const char * anno, model_net_base_params *p){ ...@@ -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))){ p->sched_params.u.prio.sub_stype != MN_SCHED_FCFS_FULL))){
packet_size = 512; packet_size = 512;
fprintf(stderr, "WARNING, no packet size specified, setting packet " fprintf(stderr, "WARNING, no packet size specified, setting packet "
"size to %llu\n", packet_size); "size to %llu\n", LLU(packet_size));
} }
......
...@@ -266,7 +266,7 @@ int fcfs_next( ...@@ -266,7 +266,7 @@ int fcfs_next(
else{ else{
dprintf("%llu (mn): issuing packet of size %llu (of %llu) " dprintf("%llu (mn): issuing packet of size %llu (of %llu) "
"from %llu to %llu at %1.5e (last:%d)\n", "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); LLU(q->req.final_dest_lp), tw_now(lp), is_last_packet);
*poffset = s->method->model_net_method_packet_event(&q->req, *poffset = s->method->model_net_method_packet_event(&q->req,
q->req.msg_size - q->rem, psize, 0.0, &q->sched_params, q->req.msg_size - q->rem, psize, 0.0, &q->sched_params,
......
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