Commit d4a1ac9a authored by Misbah Mubarak's avatar Misbah Mubarak
Browse files

Merge branch 'slimfly-tomacs' into 'master'

Slim fly updates and fixes

See merge request !17
parents 30c16180 5aa9a9e8
...@@ -52,7 +52,7 @@ struct slim_terminal_message ...@@ -52,7 +52,7 @@ struct slim_terminal_message
/* For routing */ /* For routing */
int intm_group_id; int intm_group_id;
int intm_router_id; int intm_router_id;
int chunk_id; uint64_t chunk_id;
uint64_t packet_size; uint64_t packet_size;
uint64_t message_id; uint64_t message_id;
uint64_t total_size; uint64_t total_size;
...@@ -73,8 +73,11 @@ struct slim_terminal_message ...@@ -73,8 +73,11 @@ struct slim_terminal_message
short path_type; short path_type;
tw_stime saved_available_time; tw_stime saved_available_time;
tw_stime saved_avg_time; tw_stime saved_avg_time;
tw_stime saved_credit_time; tw_stime saved_rcv_time;
tw_stime saved_collective_init_time; tw_stime saved_busy_time;
tw_stime saved_total_time;
// tw_stime saved_credit_time;
// tw_stime saved_collective_init_time;
tw_stime saved_hist_start_time; tw_stime saved_hist_start_time;
tw_stime msg_start_time; tw_stime msg_start_time;
......
...@@ -230,11 +230,11 @@ static void issue_event( ...@@ -230,11 +230,11 @@ static void issue_event(
} }
if(load != 0) if(load != 0)
{ {
MEAN_INTERVAL = bytes_to_ns(this_packet_size, load*this_global_bandwidth) + this_link_delay; MEAN_INTERVAL = bytes_to_ns(this_packet_size, load*this_global_bandwidth);
} }
/* skew each kickoff event slightly to help avoid event ties later on */ /* skew each kickoff event slightly to help avoid event ties later on */
kickoff_time = g_tw_lookahead + MEAN_INTERVAL + tw_rand_exponential(lp->rng, (double)MEAN_INTERVAL/100); kickoff_time = g_tw_lookahead + tw_rand_exponential(lp->rng, MEAN_INTERVAL);
e = tw_event_new(lp->gid, kickoff_time, lp); e = tw_event_new(lp->gid, kickoff_time, lp);
m = tw_event_data(e); m = tw_event_data(e);
...@@ -256,8 +256,13 @@ static void handle_kickoff_rev_event( ...@@ -256,8 +256,13 @@ static void handle_kickoff_rev_event(
svr_msg * m, svr_msg * m,
tw_lp * lp) tw_lp * lp)
{ {
if(b->c1)
tw_rand_reverse_unif(lp->rng);
ns->msg_sent_count--; ns->msg_sent_count--;
model_net_event_rc(net_id, lp, PAYLOAD_SZ); model_net_event_rc(net_id, lp, PAYLOAD_SZ);
tw_rand_reverse_unif(lp->rng);
} }
static void handle_kickoff_event( static void handle_kickoff_event(
svr_state * ns, svr_state * ns,
...@@ -284,6 +289,7 @@ static void handle_kickoff_event( ...@@ -284,6 +289,7 @@ static void handle_kickoff_event(
/* in case of uniform random traffic, send to a random destination. */ /* in case of uniform random traffic, send to a random destination. */
if(traffic == UNIFORM) if(traffic == UNIFORM)
{ {
b->c1 = 1;
local_dest = tw_rand_integer(lp->rng, 0, num_nodes - 1); local_dest = tw_rand_integer(lp->rng, 0, num_nodes - 1);
// printf("\n LP %ld sending to %d ", lp->gid, local_dest); // printf("\n LP %ld sending to %d ", lp->gid, local_dest);
} }
......
This diff is collapsed.
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