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
f5fc13b5
Commit
f5fc13b5
authored
3 years ago
by
Dmitriy Gerasimov
Browse files
Options
Downloads
Patches
Plain Diff
[*] Fixed UUID search for NULL worker. Need to find, where it happens.
parent
e9c8d709
No related branches found
Branches containing commit
No related tags found
2 merge requests
!330
features-4787
,
!326
Release 2.9
Pipeline
#7924
passed with stage
in 3 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
dap-sdk/net/stream/ch/dap_stream_ch.c
+4
-1
4 additions, 1 deletion
dap-sdk/net/stream/ch/dap_stream_ch.c
modules/net/dap_chain_net.c
+1
-0
1 addition, 0 deletions
modules/net/dap_chain_net.c
with
6 additions
and
2 deletions
CMakeLists.txt
+
1
−
1
View file @
f5fc13b5
...
@@ -2,7 +2,7 @@ project(cellframe-sdk C)
...
@@ -2,7 +2,7 @@ project(cellframe-sdk C)
cmake_minimum_required
(
VERSION 3.0
)
cmake_minimum_required
(
VERSION 3.0
)
set
(
CMAKE_C_STANDARD 11
)
set
(
CMAKE_C_STANDARD 11
)
set
(
CELLFRAME_SDK_NATIVE_VERSION
"2.9-2
4
"
)
set
(
CELLFRAME_SDK_NATIVE_VERSION
"2.9-2
5
"
)
add_definitions
(
"-DCELLFRAME_SDK_VERSION=
\"
${
CELLFRAME_SDK_NATIVE_VERSION
}
\"
"
)
add_definitions
(
"-DCELLFRAME_SDK_VERSION=
\"
${
CELLFRAME_SDK_NATIVE_VERSION
}
\"
"
)
set
(
DAPSDK_MODULES
""
)
set
(
DAPSDK_MODULES
""
)
message
(
"Cellframe modules:
${
CELLFRAME_MODULES
}
"
)
message
(
"Cellframe modules:
${
CELLFRAME_MODULES
}
"
)
...
...
This diff is collapsed.
Click to expand it.
dap-sdk/net/stream/ch/dap_stream_ch.c
+
4
−
1
View file @
f5fc13b5
...
@@ -149,7 +149,10 @@ void dap_stream_ch_delete(dap_stream_ch_t *a_ch)
...
@@ -149,7 +149,10 @@ void dap_stream_ch_delete(dap_stream_ch_t *a_ch)
*/
*/
dap_stream_ch_t
*
dap_stream_ch_find_by_uuid_unsafe
(
dap_stream_worker_t
*
a_worker
,
dap_stream_ch_uuid_t
a_ch_uuid
)
dap_stream_ch_t
*
dap_stream_ch_find_by_uuid_unsafe
(
dap_stream_worker_t
*
a_worker
,
dap_stream_ch_uuid_t
a_ch_uuid
)
{
{
if
(
a_worker
->
channels
){
if
(
a_worker
==
NULL
){
log_it
(
L_WARNING
,
"Attempt to search for uuid 0x%016llu in NULL worker"
,
a_ch_uuid
);
return
NULL
;
}
else
if
(
a_worker
->
channels
){
dap_stream_ch_t
*
l_ch
=
NULL
;
dap_stream_ch_t
*
l_ch
=
NULL
;
pthread_rwlock_rdlock
(
&
a_worker
->
channels_rwlock
);
pthread_rwlock_rdlock
(
&
a_worker
->
channels_rwlock
);
HASH_FIND
(
hh_worker
,
a_worker
->
channels
,
&
a_ch_uuid
,
sizeof
(
a_ch_uuid
),
l_ch
);
HASH_FIND
(
hh_worker
,
a_worker
->
channels
,
&
a_ch_uuid
,
sizeof
(
a_ch_uuid
),
l_ch
);
...
...
This diff is collapsed.
Click to expand it.
modules/net/dap_chain_net.c
+
1
−
0
View file @
f5fc13b5
...
@@ -483,6 +483,7 @@ static void s_node_link_callback_connected(dap_chain_node_client_t * a_node_clie
...
@@ -483,6 +483,7 @@ static void s_node_link_callback_connected(dap_chain_node_client_t * a_node_clie
a_node_client
->
ch_chain_net
=
dap_client_get_stream_ch_unsafe
(
a_node_client
->
client
,
dap_stream_ch_chain_get_id
()
);
a_node_client
->
ch_chain_net
=
dap_client_get_stream_ch_unsafe
(
a_node_client
->
client
,
dap_stream_ch_chain_get_id
()
);
if
(
a_node_client
->
ch_chain_net
)
if
(
a_node_client
->
ch_chain_net
)
a_node_client
->
ch_chain_net_uuid
=
a_node_client
->
ch_chain_net
->
uuid
;
a_node_client
->
ch_chain_net_uuid
=
a_node_client
->
ch_chain_net
->
uuid
;
dap_stream_ch_chain_pkt_write_unsafe
(
a_node_client
->
ch_chain
,
dap_stream_ch_chain_pkt_write_unsafe
(
a_node_client
->
ch_chain
,
DAP_STREAM_CH_CHAIN_PKT_TYPE_UPDATE_GLOBAL_DB_REQ
,
l_net
->
pub
.
id
.
uint64
,
DAP_STREAM_CH_CHAIN_PKT_TYPE_UPDATE_GLOBAL_DB_REQ
,
l_net
->
pub
.
id
.
uint64
,
l_chain_id
.
uint64
,
l_net
->
pub
.
cell_id
.
uint64
,
&
l_sync_gdb
,
sizeof
(
l_sync_gdb
));
l_chain_id
.
uint64
,
l_net
->
pub
.
cell_id
.
uint64
,
&
l_sync_gdb
,
sizeof
(
l_sync_gdb
));
...
...
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