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
07e39f08
Commit
07e39f08
authored
Jan 16, 2015
by
Jonathan Jenkins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix linker error in certain cases with codes-base
same var name used for the "sequencing" macros
parent
44561ddd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
codes/model-net.h
codes/model-net.h
+3
-3
src/models/networks/model-net/model-net.c
src/models/networks/model-net/model-net.c
+2
-2
No files found.
codes/model-net.h
View file @
07e39f08
...
...
@@ -26,14 +26,14 @@
* feasible for now (would basically have to redesign model-net), so expose
* explicit start-sequence and stop-sequence markers as a workaround
*/
extern
int
in_sequ
ence
;
extern
int
mn_in_seq
ence
;
extern
tw_stime
mn_msg_offset
;
#define MN_START_SEQ() do {\
in_sequ
ence = 1; \
mn_in_seq
ence = 1; \
mn_msg_offset = 0.0; \
} while (0)
#define MN_END_SEQ() do {\
in_sequ
ence = 0;\
mn_in_seq
ence = 0;\
} while (0)
...
...
src/models/networks/model-net/model-net.c
View file @
07e39f08
...
...
@@ -43,7 +43,7 @@ struct model_net_method* method_array[] = {
#undef X
// counter and offset for the MN_START_SEQ / MN_END_SEQ macros
int
in_sequ
ence
=
0
;
int
mn_in_seq
ence
=
0
;
tw_stime
mn_msg_offset
=
0
.
0
;
// message parameters for use via model_net_set_msg_param
...
...
@@ -248,7 +248,7 @@ static void model_net_event_impl_base(
tw_lpid
mn_lp
=
model_net_find_local_device
(
net_id
,
annotation
,
ignore_annotations
,
sender
->
gid
);
tw_stime
poffset
=
codes_local_latency
(
sender
);
if
(
in_sequ
ence
){
if
(
mn_in_seq
ence
){
tw_stime
tmp
=
mn_msg_offset
;
mn_msg_offset
+=
poffset
;
poffset
+=
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