Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matthieu Dorier
codes
Commits
b3dd47d2
Commit
b3dd47d2
authored
Jan 16, 2015
by
Jonathan Jenkins
Browse files
fix linker error in certain cases with model-net
same var name used for the "sequencing" macros
parent
f8e08380
Changes
2
Show whitespace changes
Inline
Side-by-side
codes/local-storage-model.h
View file @
b3dd47d2
...
...
@@ -16,14 +16,14 @@
* delay, but that is hacky as well (and relies on knowing bounds on internal
* codes_local_latency bounds. Hence, expose explicit start-sequence and
* stop-sequence markers */
extern
int
in_sequence
;
extern
int
lsm_
in_sequence
;
extern
tw_stime
lsm_msg_offset
;
#define LSM_START_SEQ() do {\
in_sequence = 1; \
lsm_
in_sequence = 1; \
lsm_msg_offset = 0.0; \
} while (0)
#define LSM_END_SEQ() do {\
in_sequence = 0;\
lsm_
in_sequence = 0;\
} while (0)
/*
...
...
src/util/local-storage-model.c
View file @
b3dd47d2
...
...
@@ -17,8 +17,8 @@
#define CATEGORY_NAME_MAX 16
#define CATEGORY_MAX 12
int
in_sequence
=
0
;
tw_stime
m
n
_msg_offset
=
0
.
0
;
int
lsm_
in_sequence
=
0
;
tw_stime
ls
m_msg_offset
=
0
.
0
;
/*
* wrapped_event_t
...
...
@@ -307,7 +307,7 @@ tw_event* lsm_event_new(const char* category,
lsm_gid
=
lsm_find_local_device
(
sender
);
delta
=
codes_local_latency
(
sender
)
+
delay
;
if
(
in_sequence
)
{
if
(
lsm_
in_sequence
)
{
tw_stime
tmp
=
lsm_msg_offset
;
lsm_msg_offset
+=
delta
;
delta
+=
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