Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
FORMUS3IC_LAS3
/
embb
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2a8b92ad
authored
Dec 30, 2014
by
Marcus Winter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mtapi_network_c: assert state after every operation for debugging
parent
3f458c34
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
64 additions
and
9 deletions
+64
-9
mtapi_network_c/src/embb_mtapi_network.c
+64
-9
No files found.
mtapi_network_c/src/embb_mtapi_network.c
View file @
2a8b92ad
...
...
@@ -43,6 +43,8 @@
#include <embb_mtapi_group_t.h>
#include <mtapi_status_t.h>
#include <assert.h>
int
embb_mtapi_network_initialize
()
{
#ifdef _WIN32
WORD
ver_request
;
...
...
@@ -138,22 +140,29 @@ static void embb_mtapi_network_task_complete(
// operation is "return result"
err
=
embb_mtapi_network_buffer_push_back_int8
(
&
send_buf
,
EMBB_MTAPI_NETWORK_RETURN_RESULT
);
assert
(
err
==
1
);
// remote task id
err
=
embb_mtapi_network_buffer_push_back_int32
(
&
send_buf
,
network_task
->
remote_task_id
);
assert
(
err
==
4
);
err
=
embb_mtapi_network_buffer_push_back_int32
(
&
send_buf
,
network_task
->
remote_task_tag
);
assert
(
err
==
4
);
// status
err
=
embb_mtapi_network_buffer_push_back_int32
(
&
send_buf
,
local_task
->
error_code
);
assert
(
err
==
4
);
// result size
err
=
embb_mtapi_network_buffer_push_back_int32
(
&
send_buf
,
local_task
->
result_size
);
assert
(
err
==
4
);
err
=
embb_mtapi_network_buffer_push_back_rawdata
(
&
send_buf
,
local_task
->
result_size
,
local_task
->
result_buffer
);
assert
(
err
==
local_task
->
result_size
);
err
=
embb_mtapi_network_socket_sendbuffer
(
&
network_task
->
socket
,
&
send_buf
);
assert
(
err
==
send_buf
.
size
);
// sending done, free the buffer
embb_mtapi_network_buffer_finalize
(
&
send_buf
);
...
...
@@ -200,10 +209,14 @@ static int embb_mtapi_network_thread(void * args) {
int8_t
operation
;
embb_mtapi_network_socket_t
*
socket
=
&
plugin
->
sockets
[
err
];
embb_mtapi_network_buffer_clear
(
&
buffer
);
err
=
embb_mtapi_network_socket_recvbuffer_sized
(
socket
,
&
buffer
,
1
);
embb_mtapi_network_buffer_pop_front_int8
(
assert
(
err
==
1
);
err
=
embb_mtapi_network_buffer_pop_front_int8
(
&
buffer
,
&
operation
);
assert
(
err
==
1
);
embb_mtapi_network_buffer_clear
(
&
buffer
);
...
...
@@ -222,29 +235,41 @@ static int embb_mtapi_network_thread(void * args) {
err
=
embb_mtapi_network_socket_recvbuffer_sized
(
socket
,
&
buffer
,
24
);
assert
(
err
==
24
);
// domain id
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
domain_id
);
err
=
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
domain_id
);
assert
(
err
==
4
);
// job id
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
job_id
);
err
=
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
job_id
);
assert
(
err
==
4
);
// remote task handle
embb_mtapi_network_buffer_pop_front_int32
(
e
rr
=
e
mbb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
network_task
->
remote_task_id
);
embb_mtapi_network_buffer_pop_front_int32
(
assert
(
err
==
4
);
err
=
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
network_task
->
remote_task_tag
);
assert
(
err
==
4
);
// result size
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
results_size
);
err
=
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
results_size
);
assert
(
err
==
4
);
results
=
embb_alloc
(
results_size
);
assert
(
results
!=
NULL
);
// arguments size
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
arguments_size
);
assert
(
err
==
4
);
arguments
=
embb_alloc
(
arguments_size
);
assert
(
arguments
!=
NULL
);
embb_mtapi_network_buffer_clear
(
&
buffer
);
// arguments
err
=
embb_mtapi_network_socket_recvbuffer_sized
(
socket
,
&
buffer
,
arguments_size
);
embb_mtapi_network_buffer_pop_front_rawdata
(
assert
(
err
==
arguments_size
);
err
=
embb_mtapi_network_buffer_pop_front_rawdata
(
&
buffer
,
arguments_size
,
arguments
);
assert
(
err
==
arguments_size
);
embb_mtapi_network_buffer_clear
(
&
buffer
);
...
...
@@ -252,16 +277,20 @@ static int embb_mtapi_network_thread(void * args) {
mtapi_taskattr_init
(
&
task_attr
,
&
local_status
);
mtapi_taskattr_set
(
&
task_attr
,
MTAPI_TASK_USER_DATA
,
(
void
*
)
network_task
,
0
,
&
local_status
);
assert
(
local_status
==
MTAPI_SUCCESS
);
memcpy
(
&
func_void
,
&
func
,
sizeof
(
void
*
));
mtapi_taskattr_set
(
&
task_attr
,
MTAPI_TASK_COMPLETE_FUNCTION
,
func_void
,
0
,
&
local_status
);
assert
(
local_status
==
MTAPI_SUCCESS
);
job_hndl
=
mtapi_job_get
(
job_id
,
domain_id
,
&
local_status
);
assert
(
local_status
==
MTAPI_SUCCESS
);
task_hndl
=
mtapi_task_start
(
MTAPI_TASK_ID_NONE
,
job_hndl
,
arguments
,
arguments_size
,
results
,
results_size
,
&
task_attr
,
MTAPI_GROUP_NONE
,
&
local_status
);
assert
(
local_status
==
MTAPI_SUCCESS
);
// send back result of task creation
//embb_mtapi_network_buffer_push_back_int32(
...
...
@@ -275,26 +304,34 @@ static int embb_mtapi_network_thread(void * args) {
int
task_id
;
int
task_tag
;
embb_mtapi_network_buffer_clear
(
&
buffer
);
if
(
embb_mtapi_node_is_initialized
())
{
embb_mtapi_node_t
*
node
=
embb_mtapi_node_get_instance
();
mtapi_task_hndl_t
task
;
err
=
embb_mtapi_network_socket_recvbuffer_sized
(
socket
,
&
buffer
,
16
);
assert
(
err
==
16
);
// local task id
err
=
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
task_id
);
assert
(
err
==
4
);
err
=
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
task_tag
);
assert
(
err
==
4
);
// task status
err
=
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
task_status
);
assert
(
err
==
4
);
// result size
err
=
embb_mtapi_network_buffer_pop_front_int32
(
&
buffer
,
&
results_size
);
assert
(
err
==
4
);
embb_mtapi_network_buffer_clear
(
&
buffer
);
err
=
embb_mtapi_network_socket_recvbuffer_sized
(
socket
,
&
buffer
,
results_size
);
assert
(
err
==
results_size
);
task
.
id
=
task_id
;
task
.
tag
=
task_tag
;
...
...
@@ -316,6 +353,7 @@ static int embb_mtapi_network_thread(void * args) {
err
=
embb_mtapi_network_buffer_pop_front_rawdata
(
&
buffer
,
results_size
,
local_task
->
result_buffer
);
assert
(
err
==
results_size
);
local_task
->
error_code
=
task_status
;
local_task
->
state
=
MTAPI_TASK_COMPLETED
;
...
...
@@ -352,7 +390,9 @@ void mtapi_network_plugin_initialize(
int
err
;
err
=
embb_mtapi_network_initialize
();
if
(
err
)
{
embb_atomic_store_int
(
&
plugin
->
run
,
1
);
plugin
->
buffer_size
=
buffer_size
;
plugin
->
socket_count
=
1
;
// 1 listening socket and max_connections connections
...
...
@@ -360,16 +400,21 @@ void mtapi_network_plugin_initialize(
plugin
->
sockets
=
(
embb_mtapi_network_socket_t
*
)
embb_alloc
(
sizeof
(
embb_mtapi_network_socket_t
)
*
(
1
+
max_connections
*
2
));
if
(
NULL
!=
plugin
->
sockets
)
{
err
=
embb_mtapi_network_socket_initialize
(
&
plugin
->
sockets
[
0
]);
if
(
err
)
{
err
=
embb_mtapi_network_socket_bind_and_listen
(
&
plugin
->
sockets
[
0
],
host
,
port
,
max_connections
);
plugin
->
buffer_size
=
buffer_size
;
if
(
err
)
{
err
=
embb_thread_create
(
&
plugin
->
thread
,
NULL
,
embb_mtapi_network_thread
,
NULL
);
if
(
EMBB_SUCCESS
==
err
)
{
local_status
=
MTAPI_SUCCESS
;
}
}
}
}
}
mtapi_status_set
(
status
,
local_status
);
}
...
...
@@ -419,28 +464,37 @@ static void network_task_start(
// operation is "start task"
err
=
embb_mtapi_network_buffer_push_back_int8
(
send_buf
,
EMBB_MTAPI_NETWORK_START_TASK
);
assert
(
err
==
1
);
err
=
embb_mtapi_network_buffer_push_back_int32
(
send_buf
,
network_action
->
domain_id
);
assert
(
err
==
4
);
err
=
embb_mtapi_network_buffer_push_back_int32
(
send_buf
,
network_action
->
job_id
);
assert
(
err
==
4
);
err
=
embb_mtapi_network_buffer_push_back_int32
(
send_buf
,
local_task
->
handle
.
id
);
assert
(
err
==
4
);
err
=
embb_mtapi_network_buffer_push_back_int32
(
send_buf
,
local_task
->
handle
.
tag
);
assert
(
err
==
4
);
err
=
embb_mtapi_network_buffer_push_back_int32
(
send_buf
,
local_task
->
result_size
);
assert
(
err
==
4
);
err
=
embb_mtapi_network_buffer_push_back_int32
(
send_buf
,
local_task
->
arguments_size
);
assert
(
err
==
4
);
err
=
embb_mtapi_network_buffer_push_back_rawdata
(
send_buf
,
local_task
->
arguments_size
,
local_task
->
arguments
);
assert
(
err
==
local_task
->
arguments_size
);
err
=
embb_mtapi_network_socket_sendbuffer
(
&
network_action
->
socket
,
send_buf
);
assert
(
err
==
send_buf
->
size
);
embb_atomic_fetch_and_add_int
(
&
local_action
->
num_tasks
,
1
);
local_task
->
state
=
MTAPI_TASK_RUNNING
;
...
...
@@ -509,6 +563,7 @@ mtapi_action_hndl_t mtapi_network_action_create(
mtapi_action_hndl_t
action_hndl
=
{
0
,
0
};
int
err
;
// TODO: check action for allocation failure
action
->
domain_id
=
domain_id
;
action
->
job_id
=
remote_job_id
;
...
...
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