Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
codes
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
38
Issues
38
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
codes
codes
Commits
0cd2daad
Commit
0cd2daad
authored
Sep 04, 2018
by
Misbah Mubarak
Committed by
Neil McGlohon
Sep 04, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding fixes to dragonfly-plus reverse handler
parent
27e8637a
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
58 additions
and
49 deletions
+58
-49
src/network-workloads/model-net-mpi-replay.c
src/network-workloads/model-net-mpi-replay.c
+1
-0
src/networks/model-net/dragonfly-custom.C
src/networks/model-net/dragonfly-custom.C
+6
-20
src/networks/model-net/dragonfly-plus.C
src/networks/model-net/dragonfly-plus.C
+51
-28
src/networks/model-net/model-net.c
src/networks/model-net/model-net.c
+0
-1
No files found.
src/network-workloads/model-net-mpi-replay.c
View file @
0cd2daad
...
...
@@ -2931,6 +2931,7 @@ int modelnet_mpi_replay(MPI_Comm comm, int* argc, char*** argv )
}
group_ratio
=
codes_mctx_set_group_ratio
(
NULL
,
true
);
if
(
enable_sampling
)
model_net_enable_sampling
(
sampling_interval
,
sampling_end_time
);
...
...
src/networks/model-net/dragonfly-custom.C
View file @
0cd2daad
...
...
@@ -1144,7 +1144,7 @@ void issue_bw_monitor_event(terminal_state * s, tw_bf * bf, terminal_custom_mess
int
num_term_rc_wins
=
s
->
num_term_rc_windows
;
/* dynamically reallocate array if index has reached max-size */
if
(
s
->
rc_index
=
=
s
->
num_term_rc_windows
)
if
(
s
->
rc_index
>
=
s
->
num_term_rc_windows
)
{
s
->
num_term_rc_windows
*=
2
;
int
*
tmp1
=
(
int
*
)
calloc
(
s
->
num_term_rc_windows
*
num_qos_levels
,
sizeof
(
int
));
...
...
@@ -1225,7 +1225,7 @@ void issue_rtr_bw_monitor_event(router_state * s, tw_bf * bf, terminal_custom_me
int
num_rtr_rc_windows
=
s
->
num_rtr_rc_windows
;
/* dynamically reallocate the array.. */
if
(
s
->
rc_index
=
=
s
->
num_rtr_rc_windows
)
if
(
s
->
rc_index
>
=
s
->
num_rtr_rc_windows
)
{
s
->
num_rtr_rc_windows
*=
2
;
int
*
tmp1
=
(
int
*
)
calloc
(
s
->
num_rtr_rc_windows
*
s
->
params
->
radix
*
num_qos_levels
,
sizeof
(
int
));
...
...
@@ -1269,7 +1269,7 @@ void issue_rtr_bw_monitor_event(router_state * s, tw_bf * bf, terminal_custom_me
int
bw_consumed
=
get_rtr_bandwidth_consumption
(
s
,
k
,
j
);
if
(
s
->
router_id
==
0
)
{
//
fprintf(dragonfly_rtr_bw_log, "\n %d %f %d %d %d %d %d %f", s->router_id, tw_now(lp), j, k, bw_consumed, s->qos_status[j][k], s->qos_data[j][k], s->busy_time_sample[j]);
fprintf
(
dragonfly_rtr_bw_log
,
"
\n
%d %f %d %d %d %d %d %f"
,
s
->
router_id
,
tw_now
(
lp
),
j
,
k
,
bw_consumed
,
s
->
qos_status
[
j
][
k
],
s
->
qos_data
[
j
][
k
],
s
->
busy_time_sample
[
j
]);
}
}
...
...
@@ -1699,22 +1699,6 @@ static void router_credit_send(router_state * s, terminal_custom_message * msg,
strcpy
(
buf_msg
->
category
,
msg
->
category
);
buf_msg
->
type
=
type
;
if
(
strcmp
(
msg
->
category
,
"medium"
)
==
0
)
{
if
(
is_terminal
==
0
)
{
if
(
buf_msg
->
output_chan
<
4
||
buf_msg
->
output_chan
>=
8
)
{
printf
(
"
\n
Router medium prio arrived packet-id %d rid %d sq %d"
,
msg
->
packet_ID
,
msg
->
origin_router_id
,
sq
);
tw_error
(
TW_LOC
,
"
\n
port %d output chan %d dest %d "
,
buf_msg
->
vc_index
,
buf_msg
->
output_chan
,
is_terminal
);
}
}
else
{
if
(
buf_msg
->
output_chan
<
1
)
printf
(
"
\n
Incorrect terminal vc %d "
,
buf_msg
->
output_chan
);
}
}
tw_event_send
(
buf_e
);
return
;
}
...
...
@@ -2257,7 +2241,9 @@ static void packet_send(terminal_state * s, tw_bf * bf, terminal_custom_message
rc_stack_push
(
lp
,
cur_entry
,
delete_terminal_custom_message_list
,
s
->
st
);
s
->
terminal_length
[
vcg
]
-=
s
->
params
->
chunk_size
;
cur_entry
=
s
->
terminal_msgs
[
next_vcg
];
cur_entry
=
NULL
;
if
(
next_vcg
>=
0
)
cur_entry
=
s
->
terminal_msgs
[
next_vcg
];
/* if there is another packet inline then schedule another send event */
if
(
cur_entry
!=
NULL
&&
...
...
src/networks/model-net/dragonfly-plus.C
View file @
0cd2daad
This diff is collapsed.
Click to expand it.
src/networks/model-net/model-net.c
View file @
0cd2daad
...
...
@@ -330,7 +330,6 @@ static model_net_event_return model_net_event_impl_base(
if
(
src_mn_lp
==
dest_mn_lp
&&
message_size
<
(
uint64_t
)
codes_node_eager_limit
)
{
printf
(
"
\n
Calling model-net noop event! %d %d %s"
,
src_mn_lp
,
dest_mn_lp
,
category
);
return
model_net_noop_event
(
final_dest_lp
,
is_pull
,
offset
,
message_size
,
remote_event_size
,
remote_event
,
self_event_size
,
self_event
,
sender
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment