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
18
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
e47dfae9
Commit
e47dfae9
authored
3 years ago
by
Roman Khlopkov
🔜
Browse files
Options
Downloads
Patches
Plain Diff
[*] A little stability fix
parent
5fc24209
No related branches found
No related tags found
1 merge request
!419
Feature 5220
Pipeline
#8394
passed with stage
in 6 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/channel/chain/dap_stream_ch_chain.c
+5
-10
5 additions, 10 deletions
modules/channel/chain/dap_stream_ch_chain.c
with
5 additions
and
10 deletions
modules/channel/chain/dap_stream_ch_chain.c
+
5
−
10
View file @
e47dfae9
...
@@ -265,7 +265,10 @@ static void s_sync_out_chains_last_worker_callback(dap_worker_t *a_worker, void
...
@@ -265,7 +265,10 @@ static void s_sync_out_chains_last_worker_callback(dap_worker_t *a_worker, void
l_sync_request
->
request_hdr
.
net_id
.
uint64
,
l_sync_request
->
request_hdr
.
chain_id
.
uint64
,
l_sync_request
->
request_hdr
.
net_id
.
uint64
,
l_sync_request
->
request_hdr
.
chain_id
.
uint64
,
l_sync_request
->
request_hdr
.
cell_id
.
uint64
,
&
l_request
,
sizeof
(
l_request
));
l_sync_request
->
request_hdr
.
cell_id
.
uint64
,
&
l_request
,
sizeof
(
l_request
));
if
(
l_ch_chain
->
request_atom_iter
)
if
(
l_ch_chain
->
request_atom_iter
)
{
l_ch_chain
->
request_atom_iter
->
chain
->
callback_atom_iter_delete
(
l_ch_chain
->
request_atom_iter
);
l_ch_chain
->
request_atom_iter
->
chain
->
callback_atom_iter_delete
(
l_ch_chain
->
request_atom_iter
);
l_ch_chain
->
request_atom_iter
=
NULL
;
}
l_ch_chain
->
state
=
CHAIN_STATE_IDLE
;
l_ch_chain
->
state
=
CHAIN_STATE_IDLE
;
if
(
l_ch_chain
->
callback_notify_packet_out
)
if
(
l_ch_chain
->
callback_notify_packet_out
)
...
@@ -595,10 +598,6 @@ static void s_gdb_sync_tsd_worker_callback(dap_worker_t *a_worker, void *a_arg)
...
@@ -595,10 +598,6 @@ static void s_gdb_sync_tsd_worker_callback(dap_worker_t *a_worker, void *a_arg)
memcpy
(
l_data_ptr
,
&
l_sync_request
->
request
.
id_end
,
sizeof
(
uint64_t
));
memcpy
(
l_data_ptr
,
&
l_sync_request
->
request
.
id_end
,
sizeof
(
uint64_t
));
l_data_ptr
+=
sizeof
(
uint64_t
);
l_data_ptr
+=
sizeof
(
uint64_t
);
memcpy
(
l_data_ptr
,
l_sync_request
->
gdb
.
sync_group
,
l_gr_len
);
memcpy
(
l_data_ptr
,
l_sync_request
->
gdb
.
sync_group
,
l_gr_len
);
log_it
(
L_INFO
,
"Allocated %d bytes, copied %d bytes, sent %d bytes"
,
l_data_size
+
sizeof
(
dap_tsd_t
),
(
long
int
)((
byte_t
*
)
l_data_ptr
-
l_tsd_rec
->
data
)
+
l_gr_len
,
l_tsd_rec
->
size
+
sizeof
(
dap_tsd_t
));
dap_stream_ch_chain_pkt_write_unsafe
(
l_ch
,
DAP_STREAM_CH_CHAIN_PKT_TYPE_UPDATE_GLOBAL_DB_TSD
,
dap_stream_ch_chain_pkt_write_unsafe
(
l_ch
,
DAP_STREAM_CH_CHAIN_PKT_TYPE_UPDATE_GLOBAL_DB_TSD
,
l_sync_request
->
request_hdr
.
net_id
.
uint64
,
l_sync_request
->
request_hdr
.
net_id
.
uint64
,
l_sync_request
->
request_hdr
.
chain_id
.
uint64
,
l_sync_request
->
request_hdr
.
chain_id
.
uint64
,
...
@@ -1298,14 +1297,10 @@ void dap_stream_ch_chain_go_idle ( dap_stream_ch_chain_t * a_ch_chain)
...
@@ -1298,14 +1297,10 @@ void dap_stream_ch_chain_go_idle ( dap_stream_ch_chain_t * a_ch_chain)
// Cleanup after request
// Cleanup after request
memset
(
&
a_ch_chain
->
request
,
0
,
sizeof
(
a_ch_chain
->
request
));
memset
(
&
a_ch_chain
->
request
,
0
,
sizeof
(
a_ch_chain
->
request
));
memset
(
&
a_ch_chain
->
request_hdr
,
0
,
sizeof
(
a_ch_chain
->
request_hdr
));
memset
(
&
a_ch_chain
->
request_hdr
,
0
,
sizeof
(
a_ch_chain
->
request_hdr
));
if
(
a_ch_chain
->
request_atom_iter
)
{
if
(
a_ch_chain
->
request_atom_iter
&&
a_ch_chain
->
request_atom_iter
->
chain
&&
if
(
a_ch_chain
->
request_atom_iter
->
chain
)
a_ch_chain
->
request_atom_iter
->
chain
->
callback_atom_iter_delete
)
{
if
(
a_ch_chain
->
request_atom_iter
->
chain
->
callback_atom_iter_delete
){
a_ch_chain
->
request_atom_iter
->
chain
->
callback_atom_iter_delete
(
a_ch_chain
->
request_atom_iter
);
a_ch_chain
->
request_atom_iter
->
chain
->
callback_atom_iter_delete
(
a_ch_chain
->
request_atom_iter
);
a_ch_chain
->
request_atom_iter
=
NULL
;
a_ch_chain
->
request_atom_iter
=
NULL
;
return
;
}
a_ch_chain
->
request_atom_iter
->
chain
->
callback_atom_iter_delete
(
a_ch_chain
->
request_atom_iter
);
}
}
// free log list
// free log list
dap_db_log_list_delete
(
a_ch_chain
->
request_db_log
);
dap_db_log_list_delete
(
a_ch_chain
->
request_db_log
);
...
...
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