Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cellframe-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
20
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
cellframe-sdk
Commits
8f86ccfd
Commit
8f86ccfd
authored
3 years ago
by
Roman Khlopkov
🔜
Browse files
Options
Downloads
Plain Diff
Merge branch 'features-5238-r5.1' into 'release-3.1'
features -5238 See merge request
!564
parents
7bd4e654
d0ff0459
No related branches found
No related tags found
2 merge requests
!640
Release 3.1
,
!564
features -5238
Pipeline
#13201
passed with stage
in 5 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/channel/chain/dap_stream_ch_chain.c
+3
-3
3 additions, 3 deletions
modules/channel/chain/dap_stream_ch_chain.c
with
3 additions
and
3 deletions
modules/channel/chain/dap_stream_ch_chain.c
+
3
−
3
View file @
8f86ccfd
...
@@ -363,7 +363,7 @@ static void s_sync_out_gdb_last_worker_callback(dap_worker_t *a_worker, void *a_
...
@@ -363,7 +363,7 @@ static void s_sync_out_gdb_last_worker_callback(dap_worker_t *a_worker, void *a_
if
(
s_debug_more
)
if
(
s_debug_more
)
log_it
(
L_INFO
,
"Out: DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNCED_GLOBAL_DB"
);
log_it
(
L_INFO
,
"Out: DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNCED_GLOBAL_DB"
);
dap_stream_ch_chain_pkt_write_unsafe
(
DAP_STREAM_CH
(
l_ch_chain
),
DAP_STREAM_CH_CHAIN_PKT_TYPE_
FIRST
_GLOBAL_DB
,
dap_stream_ch_chain_pkt_write_unsafe
(
DAP_STREAM_CH
(
l_ch_chain
),
DAP_STREAM_CH_CHAIN_PKT_TYPE_
SYNCED
_GLOBAL_DB
,
l_ch_chain
->
request_hdr
.
net_id
.
uint64
,
l_ch_chain
->
request_hdr
.
chain_id
.
uint64
,
l_ch_chain
->
request_hdr
.
net_id
.
uint64
,
l_ch_chain
->
request_hdr
.
chain_id
.
uint64
,
l_ch_chain
->
request_hdr
.
cell_id
.
uint64
,
NULL
,
0
);
l_ch_chain
->
request_hdr
.
cell_id
.
uint64
,
NULL
,
0
);
l_ch_chain
->
state
=
CHAIN_STATE_IDLE
;
l_ch_chain
->
state
=
CHAIN_STATE_IDLE
;
...
@@ -940,7 +940,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
...
@@ -940,7 +940,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
}
}
log_it
(
L_INFO
,
"In: UPDATE_GLOBAL_DB_REQ pkt: net 0x%016"
DAP_UINT64_FORMAT_x
" chain 0x%016"
DAP_UINT64_FORMAT_x
" cell 0x%016"
DAP_UINT64_FORMAT_x
,
log_it
(
L_INFO
,
"In: UPDATE_GLOBAL_DB_REQ pkt: net 0x%016"
DAP_UINT64_FORMAT_x
" chain 0x%016"
DAP_UINT64_FORMAT_x
" cell 0x%016"
DAP_UINT64_FORMAT_x
,
l_chain_pkt
->
hdr
.
net_id
.
uint64
,
l_chain_pkt
->
hdr
.
chain_id
.
uint64
,
l_chain_pkt
->
hdr
.
cell_id
.
uint64
);
l_chain_pkt
->
hdr
.
net_id
.
uint64
,
l_chain_pkt
->
hdr
.
chain_id
.
uint64
,
l_chain_pkt
->
hdr
.
cell_id
.
uint64
);
if
(
l_chain_pkt_data_size
==
sizeof
(
dap_stream_ch_chain_sync_request_t
))
if
(
l_chain_pkt_data_size
==
(
size_t
)
sizeof
(
dap_stream_ch_chain_sync_request_t
))
memcpy
(
&
l_ch_chain
->
request
,
l_chain_pkt
->
data
,
sizeof
(
dap_stream_ch_chain_sync_request_t
));
memcpy
(
&
l_ch_chain
->
request
,
l_chain_pkt
->
data
,
sizeof
(
dap_stream_ch_chain_sync_request_t
));
dap_chain_node_client_t
*
l_client
=
(
dap_chain_node_client_t
*
)
l_ch_chain
->
callback_notify_arg
;
dap_chain_node_client_t
*
l_client
=
(
dap_chain_node_client_t
*
)
l_ch_chain
->
callback_notify_arg
;
if
(
l_client
&&
l_client
->
resync_gdb
)
if
(
l_client
&&
l_client
->
resync_gdb
)
...
@@ -1302,7 +1302,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
...
@@ -1302,7 +1302,7 @@ void s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
}
break
;
}
break
;
// first packet of data with source node address
// first packet of data with source node address
case
DAP_STREAM_CH_CHAIN_PKT_TYPE_FIRST_CHAIN
:
{
case
DAP_STREAM_CH_CHAIN_PKT_TYPE_FIRST_CHAIN
:
{
if
(
l_chain_pkt_data_size
==
sizeof
(
dap_chain_node_addr_t
)){
if
(
l_chain_pkt_data_size
==
(
size_t
)
sizeof
(
dap_chain_node_addr_t
)){
memcpy
(
&
l_ch_chain
->
request_hdr
,
&
l_chain_pkt
->
hdr
,
sizeof
(
dap_stream_ch_chain_pkt_hdr_t
));
memcpy
(
&
l_ch_chain
->
request_hdr
,
&
l_chain_pkt
->
hdr
,
sizeof
(
dap_stream_ch_chain_pkt_hdr_t
));
memcpy
(
&
l_ch_chain
->
request
.
node_addr
,
l_chain_pkt
->
data
,
sizeof
(
dap_chain_node_addr_t
));
memcpy
(
&
l_ch_chain
->
request
.
node_addr
,
l_chain_pkt
->
data
,
sizeof
(
dap_chain_node_addr_t
));
log_it
(
L_INFO
,
"From "
NODE_ADDR_FP_STR
": FIRST_CHAIN data_size=%zu net 0x%016"
DAP_UINT64_FORMAT_x
" chain 0x%016"
DAP_UINT64_FORMAT_x
" cell 0x%016"
DAP_UINT64_FORMAT_x
,
log_it
(
L_INFO
,
"From "
NODE_ADDR_FP_STR
": FIRST_CHAIN data_size=%zu net 0x%016"
DAP_UINT64_FORMAT_x
" chain 0x%016"
DAP_UINT64_FORMAT_x
" cell 0x%016"
DAP_UINT64_FORMAT_x
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment