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
Robotlab
firefly
Commits
a7e426fb
Commit
a7e426fb
authored
Apr 02, 2014
by
Tommy Olofsson
Browse files
More debugging. ACKs seem to be ignored. Also some intermittent memory allocation problem.
parent
de944133
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/Toolchain-vxworks.cmake
View file @
a7e426fb
...
...
@@ -6,7 +6,7 @@ set(VXWORKS_COMPILING TRUE)
# Specify the cross compiler:
set
(
CMAKE_C_COMPILER i586-wrs-vxworks-gcc
)
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLABCOMM_COMPAT=\\\"labcomm_compat_vxworks.h\\\"")
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLABCOMM_COMPAT=\\\"labcomm_compat_vxworks.h\\\"
-DLABCOMM_NO_STDIO
")
# Add additional includes
include_directories
(
...
...
src/protocol/firefly_protocol.c
View file @
a7e426fb
...
...
@@ -302,6 +302,7 @@ void handle_channel_response(firefly_protocol_channel_response *chan_res,
conn
=
context
;
printf
(
"%s"
,
__func__
);
fecrr
=
FIREFLY_MALLOC
(
sizeof
(
*
fecrr
));
if
(
fecrr
==
NULL
)
{
firefly_error
(
FIREFLY_ERROR_ALLOC
,
1
,
...
...
@@ -327,6 +328,8 @@ static void firefly_channel_send_channel_ack(
int
dest_chan_id
)
{
firefly_protocol_channel_ack
ack
;
printf
(
"%s"
,
__func__
);
if
(
chan
!=
NULL
)
{
ack
.
ack
=
true
;
ack
.
source_chan_id
=
chan
->
local_id
;
...
...
src/utils/firefly_event_queue_vx.c
View file @
a7e426fb
...
...
@@ -135,7 +135,9 @@ void *firefly_event_vx_thread_main(void *args)
/* TODO: Retval can indicate badly contructed event, or
* failed execution. Should this be handled?
*/
printf
(
"exec ev: %p
\n
"
,
ev
->
execute
);
firefly_event_execute
(
ev
);
printf
(
"done exec ev
\n
"
);
semTake
(
ctx
->
lock
,
WAIT_FOREVER
);
firefly_event_return
(
eq
,
&
ev
);
semGive
(
ctx
->
lock
);
...
...
src/utils/firefly_resend_vx.c
View file @
a7e426fb
...
...
@@ -236,6 +236,8 @@ int firefly_resend_wait(struct resend_queue *rq,
result
=
-
1
;
}
else
{
*
data
=
malloc
(
res
->
size
);
if
(
!*
data
)
printf
(
"malloc failed %s:%s
\n
"
,
__FILE__
,
__LINE__
);
memcpy
(
*
data
,
res
->
data
,
res
->
size
);
*
size
=
res
->
size
;
*
id
=
res
->
id
;
...
...
Write
Preview
Supports
Markdown
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