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
0bbb0f62
Commit
0bbb0f62
authored
Dec 14, 2016
by
Noah Wolfe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing slimfly packet_arrive forward and reverse
parent
adc8fe15
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
21 deletions
+30
-21
src/networks/model-net/slimfly.c
src/networks/model-net/slimfly.c
+30
-21
No files found.
src/networks/model-net/slimfly.c
View file @
0bbb0f62
...
...
@@ -1593,6 +1593,9 @@ void slim_packet_arrive_rc(terminal_state * s, tw_bf * bf, slim_terminal_message
if
(
bf
->
c7
)
{
if
(
bf
->
c8
)
tw_rand_reverse_unif
(
lp
->
rng
);
s
->
finished_msgs
--
;
total_msg_sz
-=
msg
->
total_size
;
N_finished_msgs
--
;
...
...
@@ -1651,6 +1654,26 @@ void slim_packet_arrive(terminal_state * s, tw_bf * bf, slim_terminal_message *
// NIC aggregation - should this be a separate function?
// Trigger an event on receiving server
struct
sfly_hash_key
key
;
key
.
message_id
=
msg
->
message_id
;
key
.
sender_id
=
msg
->
sender_lp
;
struct
qhash_head
*
hash_link
=
NULL
;
struct
sfly_qhash_entry
*
tmp
=
NULL
;
hash_link
=
qhash_search
(
s
->
rank_tbl
,
&
key
);
if
(
hash_link
)
tmp
=
qhash_entry
(
hash_link
,
struct
sfly_qhash_entry
,
hash_link
);
uint64_t
total_chunks
=
msg
->
total_size
/
s
->
params
->
chunk_size
;
if
(
msg
->
total_size
%
s
->
params
->
chunk_size
)
total_chunks
++
;
if
(
!
total_chunks
)
total_chunks
=
1
;
tw_stime
ts
=
g_tw_lookahead
+
s
->
params
->
credit_delay
+
tw_rand_unif
(
lp
->
rng
);
if
(
msg
->
packet_ID
==
TRACK
)
...
...
@@ -1679,14 +1702,6 @@ void slim_packet_arrive(terminal_state * s, tw_bf * bf, slim_terminal_message *
assert
(
lp
->
gid
!=
msg
->
src_terminal_id
);
uint64_t
num_chunks
=
msg
->
packet_size
/
s
->
params
->
chunk_size
;
uint64_t
total_chunks
=
msg
->
total_size
/
s
->
params
->
chunk_size
;
if
(
msg
->
total_size
%
s
->
params
->
chunk_size
)
total_chunks
++
;
if
(
!
total_chunks
)
total_chunks
=
1
;
if
(
msg
->
packet_size
%
s
->
params
->
chunk_size
)
num_chunks
++
;
...
...
@@ -1726,17 +1741,10 @@ void slim_packet_arrive(terminal_state * s, tw_bf * bf, slim_terminal_message *
/* Now retreieve the number of chunks completed from the hash and update
* them */
void
*
m_data_src
=
model_net_method_get_edata
(
SLIMFLY
,
msg
);
struct
qhash_head
*
hash_link
=
NULL
;
struct
sfly_qhash_entry
*
tmp
=
NULL
;
struct
sfly_hash_key
key
;
key
.
message_id
=
msg
->
message_id
;
key
.
sender_id
=
msg
->
sender_lp
;
hash_link
=
qhash_search
(
s
->
rank_tbl
,
&
key
);
tmp
=
qhash_entry
(
hash_link
,
struct
sfly_qhash_entry
,
hash_link
);
/* If an entry does not exist then create one */
if
(
!
hash_link
)
if
(
!
tmp
)
{
bf
->
c5
=
1
;
struct
sfly_qhash_entry
*
d_entry
=
malloc
(
sizeof
(
struct
sfly_qhash_entry
));
...
...
@@ -1747,14 +1755,13 @@ void slim_packet_arrive(terminal_state * s, tw_bf * bf, slim_terminal_message *
qhash_add
(
s
->
rank_tbl
,
&
key
,
&
(
d_entry
->
hash_link
));
s
->
rank_tbl_pop
++
;
hash_link
=
qhash_search
(
s
->
rank_tbl
,
&
key
);
tmp
=
qhash_entry
(
hash_link
,
struct
sfly_qhash_entry
,
hash_link
)
;
hash_link
=
&
(
d_entry
->
hash_link
);
tmp
=
d_entry
;
}
assert
(
tmp
);
tmp
->
num_chunks
++
;
/* if its the last chunk of the packet then handle the remote event data */
if
(
msg
->
chunk_id
==
num_chunks
-
1
)
{
...
...
@@ -1789,8 +1796,10 @@ void slim_packet_arrive(terminal_state * s, tw_bf * bf, slim_terminal_message *
s
->
total_msg_size
+=
msg
->
total_size
;
s
->
finished_msgs
++
;
//assert(tmp->remote_event_data && tmp->remote_event_size);
slim_send_remote_event
(
s
,
msg
,
lp
,
bf
,
tmp
->
remote_event_data
,
tmp
->
remote_event_size
);
if
(
tmp
->
remote_event_data
&&
tmp
->
remote_event_size
>
0
)
{
bf
->
c8
=
1
;
slim_send_remote_event
(
s
,
msg
,
lp
,
bf
,
tmp
->
remote_event_data
,
tmp
->
remote_event_size
);
}
/* Remove the hash entry */
qhash_del
(
hash_link
);
msg
->
saved_hash
=
tmp
;
...
...
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