Commit 5022b2e6 authored by Elsa Gonsiorowski (Eris)'s avatar Elsa Gonsiorowski (Eris)
Browse files

merge with commit_f changes. Several whitespace changes due to my editor

parent 78745f23
...@@ -107,6 +107,7 @@ tw_lptype svr_lp = { ...@@ -107,6 +107,7 @@ tw_lptype svr_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) svr_event, (event_f) svr_event,
(revent_f) svr_rev_event, (revent_f) svr_rev_event,
(commit_f) NULL,
(final_f) svr_finalize, (final_f) svr_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(svr_state), sizeof(svr_state),
......
...@@ -223,6 +223,7 @@ static tw_lptype node_lp = { ...@@ -223,6 +223,7 @@ static tw_lptype node_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) node_event_handler, (event_f) node_event_handler,
(revent_f) NULL, (revent_f) NULL,
(commit_f) NULL,
(final_f) node_finalize, (final_f) node_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(node_state), sizeof(node_state),
...@@ -354,6 +355,7 @@ static tw_lptype forwarder_lp = { ...@@ -354,6 +355,7 @@ static tw_lptype forwarder_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) forwarder_event_handler, (event_f) forwarder_event_handler,
(revent_f) NULL, (revent_f) NULL,
(commit_f) NULL,
(final_f) forwarder_finalize, (final_f) forwarder_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(forwarder_state), sizeof(forwarder_state),
......
...@@ -1494,6 +1494,7 @@ tw_lptype nw_lp = { ...@@ -1494,6 +1494,7 @@ tw_lptype nw_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) nw_test_event_handler, (event_f) nw_test_event_handler,
(revent_f) nw_test_event_handler_rc, (revent_f) nw_test_event_handler_rc,
(commit_f) NULL,
(final_f) nw_test_finalize, (final_f) nw_test_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(nw_state) sizeof(nw_state)
......
...@@ -99,6 +99,7 @@ tw_lptype svr_lp = { ...@@ -99,6 +99,7 @@ tw_lptype svr_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) svr_event, (event_f) svr_event,
(revent_f) svr_rev_event, (revent_f) svr_rev_event,
(commit_f) NULL,
(final_f) svr_finalize, (final_f) svr_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(svr_state), sizeof(svr_state),
......
...@@ -1455,8 +1455,21 @@ void packet_arrive(terminal_state * s, tw_bf * bf, terminal_message * msg, ...@@ -1455,8 +1455,21 @@ void packet_arrive(terminal_state * s, tw_bf * bf, terminal_message * msg,
struct dfly_hash_key key; struct dfly_hash_key key;
key.message_id = msg->message_id; key.message_id = msg->message_id;
key.sender_id = msg->sender_lp; key.sender_id = msg->sender_lp;
<<<<<<< HEAD
uint64_t total_chunks = msg->total_size / s->params->chunk_size; uint64_t total_chunks = msg->total_size / s->params->chunk_size;
=======
struct qhash_head *hash_link = NULL;
struct dfly_qhash_entry * tmp = NULL;
hash_link = qhash_search(s->rank_tbl, &key);
if(hash_link)
tmp = qhash_entry(hash_link, struct dfly_qhash_entry, hash_link);
int total_chunks = msg->total_size / s->params->chunk_size;
>>>>>>> commit_f
if(msg->total_size % s->params->chunk_size) if(msg->total_size % s->params->chunk_size)
total_chunks++; total_chunks++;
...@@ -1576,9 +1589,12 @@ void packet_arrive(terminal_state * s, tw_bf * bf, terminal_message * msg, ...@@ -1576,9 +1589,12 @@ void packet_arrive(terminal_state * s, tw_bf * bf, terminal_message * msg,
hash_link = &(d_entry->hash_link); hash_link = &(d_entry->hash_link);
} }
<<<<<<< HEAD
if(hash_link) if(hash_link)
tmp = qhash_entry(hash_link, struct dfly_qhash_entry, hash_link); tmp = qhash_entry(hash_link, struct dfly_qhash_entry, hash_link);
=======
>>>>>>> commit_f
assert(tmp); assert(tmp);
tmp->num_chunks++; tmp->num_chunks++;
...@@ -1624,8 +1640,13 @@ void packet_arrive(terminal_state * s, tw_bf * bf, terminal_message * msg, ...@@ -1624,8 +1640,13 @@ void packet_arrive(terminal_state * s, tw_bf * bf, terminal_message * msg,
total_msg_sz += msg->total_size; total_msg_sz += msg->total_size;
s->total_msg_size += msg->total_size; s->total_msg_size += msg->total_size;
s->finished_msgs++; s->finished_msgs++;
<<<<<<< HEAD
//assert(tmp->remote_event_data && tmp->remote_event_size > 0); //assert(tmp->remote_event_data && tmp->remote_event_size > 0);
=======
assert(tmp->remote_event_data && tmp->remote_event_size > 0);
>>>>>>> commit_f
send_remote_event(s, msg, lp, bf, tmp->remote_event_data, tmp->remote_event_size); send_remote_event(s, msg, lp, bf, tmp->remote_event_data, tmp->remote_event_size);
/* Remove the hash entry */ /* Remove the hash entry */
qhash_del(hash_link); qhash_del(hash_link);
...@@ -2364,7 +2385,11 @@ void dragonfly_router_final(router_state * s, ...@@ -2364,7 +2385,11 @@ void dragonfly_router_final(router_state * s,
written += sprintf(s->output_buf + written, "# Router ports in the order: %d local channels, %d global channels \n", written += sprintf(s->output_buf + written, "# Router ports in the order: %d local channels, %d global channels \n",
p->num_routers, p->num_global_channels); p->num_routers, p->num_global_channels);
} }
<<<<<<< HEAD
written += sprintf(s->output_buf + written, "\n %llu %d %d", written += sprintf(s->output_buf + written, "\n %llu %d %d",
=======
written += sprintf(s->output_buf + written, "%llu %d %d",
>>>>>>> commit_f
LLU(lp->gid), LLU(lp->gid),
s->router_id / p->num_routers, s->router_id / p->num_routers,
s->router_id % p->num_routers); s->router_id % p->num_routers);
...@@ -3185,6 +3210,7 @@ tw_lptype dragonfly_lps[] = ...@@ -3185,6 +3210,7 @@ tw_lptype dragonfly_lps[] =
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) terminal_event, (event_f) terminal_event,
(revent_f) terminal_rc_event_handler, (revent_f) terminal_rc_event_handler,
(commit_f) NULL,
(final_f) dragonfly_terminal_final, (final_f) dragonfly_terminal_final,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(terminal_state) sizeof(terminal_state)
...@@ -3194,6 +3220,7 @@ tw_lptype dragonfly_lps[] = ...@@ -3194,6 +3220,7 @@ tw_lptype dragonfly_lps[] =
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) router_event, (event_f) router_event,
(revent_f) router_rc_event_handler, (revent_f) router_rc_event_handler,
(commit_f) NULL,
(final_f) dragonfly_router_final, (final_f) dragonfly_router_final,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(router_state), sizeof(router_state),
......
...@@ -185,6 +185,7 @@ tw_lptype loggp_lp = { ...@@ -185,6 +185,7 @@ tw_lptype loggp_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) loggp_event, (event_f) loggp_event,
(revent_f) loggp_rev_event, (revent_f) loggp_rev_event,
(commit_f) NULL,
(final_f) loggp_finalize, (final_f) loggp_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(loggp_state), sizeof(loggp_state),
......
...@@ -107,6 +107,7 @@ tw_lptype model_net_base_lp = { ...@@ -107,6 +107,7 @@ tw_lptype model_net_base_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) model_net_base_event, (event_f) model_net_base_event,
(revent_f) model_net_base_event_rc, (revent_f) model_net_base_event_rc,
(commit_f) NULL,
(final_f) model_net_base_finalize, (final_f) model_net_base_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(model_net_base_state), sizeof(model_net_base_state),
......
...@@ -150,6 +150,7 @@ tw_lptype sn_lp = { ...@@ -150,6 +150,7 @@ tw_lptype sn_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) sn_event, (event_f) sn_event,
(revent_f) sn_rev_event, (revent_f) sn_rev_event,
(commit_f) NULL,
(final_f) sn_finalize, (final_f) sn_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(sn_state), sizeof(sn_state),
......
...@@ -180,6 +180,7 @@ tw_lptype sp_lp = { ...@@ -180,6 +180,7 @@ tw_lptype sp_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) sp_event, (event_f) sp_event,
(revent_f) sp_rev_event, (revent_f) sp_rev_event,
(commit_f) NULL,
(final_f) sp_finalize, (final_f) sp_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(sp_state), sizeof(sp_state),
......
...@@ -1975,6 +1975,7 @@ tw_lptype torus_lp = ...@@ -1975,6 +1975,7 @@ tw_lptype torus_lp =
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) event_handler, (event_f) event_handler,
(revent_f) node_rc_handler, (revent_f) node_rc_handler,
(commit_f) NULL,
(final_f) final, (final_f) final,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(nodes_state), sizeof(nodes_state),
......
...@@ -175,6 +175,7 @@ tw_lptype lsm_lp = ...@@ -175,6 +175,7 @@ tw_lptype lsm_lp =
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) lsm_event, (event_f) lsm_event,
(revent_f) lsm_rev_event, (revent_f) lsm_rev_event,
(commit_f) NULL,
(final_f) lsm_finalize, (final_f) lsm_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(lsm_state_t) sizeof(lsm_state_t)
......
...@@ -108,6 +108,7 @@ static tw_lptype resource_lp = { ...@@ -108,6 +108,7 @@ static tw_lptype resource_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) resource_event_handler, (event_f) resource_event_handler,
(revent_f) resource_rev_handler, (revent_f) resource_rev_handler,
(commit_f) NULL,
(final_f) resource_finalize, (final_f) resource_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(resource_state), sizeof(resource_state),
......
...@@ -85,6 +85,7 @@ tw_lptype template_lp = { ...@@ -85,6 +85,7 @@ tw_lptype template_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) template_event_handler, (event_f) template_event_handler,
(revent_f) template_rev_handler, (revent_f) template_rev_handler,
(commit_f) NULL,
(final_f) template_finalize, (final_f) template_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(template_state), sizeof(template_state),
......
...@@ -121,6 +121,7 @@ tw_lptype testsvr_lp = { ...@@ -121,6 +121,7 @@ tw_lptype testsvr_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) testsvr_event_handler, (event_f) testsvr_event_handler,
(revent_f) testsvr_rev_handler, (revent_f) testsvr_rev_handler,
(commit_f) NULL,
(final_f) testsvr_finalize, (final_f) testsvr_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(testsvr_state), sizeof(testsvr_state),
......
...@@ -84,6 +84,7 @@ tw_lptype svr_lp = { ...@@ -84,6 +84,7 @@ tw_lptype svr_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) svr_event, (event_f) svr_event,
(revent_f) svr_rev_event, (revent_f) svr_rev_event,
(commit_f) NULL,
(final_f) svr_finalize, (final_f) svr_finalize,
(map_f) svr_node_mapping, (map_f) svr_node_mapping,
sizeof(svr_state), sizeof(svr_state),
......
...@@ -67,6 +67,7 @@ tw_lptype svr_lp = { ...@@ -67,6 +67,7 @@ tw_lptype svr_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) svr_event, (event_f) svr_event,
(revent_f) svr_rev_event, (revent_f) svr_rev_event,
(commit_f) NULL,
(final_f) svr_finalize, (final_f) svr_finalize,
(map_f) svr_node_mapping, (map_f) svr_node_mapping,
sizeof(svr_state), sizeof(svr_state),
......
...@@ -90,6 +90,7 @@ tw_lptype a_lp = { ...@@ -90,6 +90,7 @@ tw_lptype a_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) NULL, (event_f) NULL,
(revent_f) NULL, (revent_f) NULL,
(commit_f) NULL,
(final_f) NULL, (final_f) NULL,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(state), sizeof(state),
...@@ -99,6 +100,7 @@ tw_lptype b_lp = { ...@@ -99,6 +100,7 @@ tw_lptype b_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) NULL, (event_f) NULL,
(revent_f) NULL, (revent_f) NULL,
(commit_f) NULL,
(final_f) NULL, (final_f) NULL,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(state), sizeof(state),
...@@ -108,6 +110,7 @@ tw_lptype c_lp = { ...@@ -108,6 +110,7 @@ tw_lptype c_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) NULL, (event_f) NULL,
(revent_f) NULL, (revent_f) NULL,
(commit_f) NULL,
(final_f) NULL, (final_f) NULL,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(state), sizeof(state),
......
...@@ -90,6 +90,7 @@ tw_lptype svr_lp = { ...@@ -90,6 +90,7 @@ tw_lptype svr_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) svr_event, (event_f) svr_event,
(revent_f) svr_rev_event, (revent_f) svr_rev_event,
(commit_f) NULL,
(final_f) svr_finalize, (final_f) svr_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(svr_state), sizeof(svr_state),
......
...@@ -76,6 +76,7 @@ tw_lptype svr_lp = { ...@@ -76,6 +76,7 @@ tw_lptype svr_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) svr_event, (event_f) svr_event,
(revent_f) svr_rev_event, (revent_f) svr_rev_event,
(commit_f) NULL,
(final_f) svr_finalize, (final_f) svr_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(svr_state), sizeof(svr_state),
......
...@@ -83,6 +83,7 @@ tw_lptype svr_lp = { ...@@ -83,6 +83,7 @@ tw_lptype svr_lp = {
(pre_run_f) NULL, (pre_run_f) NULL,
(event_f) svr_event, (event_f) svr_event,
(revent_f) svr_rev_event, (revent_f) svr_rev_event,
(commit_f) NULL,
(final_f) svr_finalize, (final_f) svr_finalize,
(map_f) codes_mapping, (map_f) codes_mapping,
sizeof(svr_state), sizeof(svr_state),
......
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