Commit 12a89090 authored by Caitlin Ross's avatar Caitlin Ross

fixing minor bugs in instrumentation updates

parent f8b0015e
......@@ -1211,6 +1211,9 @@ void ft_terminal_init( ft_terminal_state * s, tw_lp * lp )
s->total_time = 0.0;
s->total_msg_size = 0;
// for ROSS Instrumentation
ftree_terminal_init_model_vars();
#if FATTREE_DEBUG
printf("I am terminal %d (%llu), connected to switch %d in rail id %d\n", s->terminal_id,
LLU(lp->gid), s->switch_id, s->rail_id);
......@@ -1265,6 +1268,8 @@ void switch_init(switch_state * r, tw_lp * lp)
fattree_param *p = r->params;
if(mapping_rep_id >= p->num_switches[mapping_offset % p->num_levels]) {
r->unused = 1;
// for ROSS instrumentation, only necessary in fat tree because some switches are unused
lp->model_types = NULL;
return;
}
......
......@@ -490,6 +490,7 @@ void model_net_base_lp_init(
ns->sub_model_type = model_net_get_model_stat_type(ns->net_id);
if (ns->sub_model_type)
{
mn_model_types[ns->net_id].lp_name = ns->sub_model_type->lp_name;
mn_model_types[ns->net_id].model_vars = ns->sub_model_type->model_vars;
mn_model_types[ns->net_id].num_vars = ns->sub_model_type->num_vars;
}
......
......@@ -1008,6 +1008,9 @@ void slim_terminal_init( terminal_state * s,
s->in_send_loop = 0;
s->issueIdle = 0;
// for ROSS Instrumentation
sfly_terminal_init_model_vars();
return;
}
......
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