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
099dbdb7
Commit
099dbdb7
authored
3 years ago
by
dmitriy.gerasimov
Browse files
Options
Downloads
Plain Diff
Merge branch 'bugs-4815' into 'release-2.9'
bugs-4815 See merge request
!313
parents
7a1c46b4
f065261b
No related branches found
No related tags found
3 merge requests
!330
features-4787
,
!326
Release 2.9
,
!313
bugs-4815
Pipeline
#7725
passed with stage
in 8 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
dap-sdk/net/client/dap_client.c
+0
-2
0 additions, 2 deletions
dap-sdk/net/client/dap_client.c
dap-sdk/net/client/dap_client_pvt.c
+6
-2
6 additions, 2 deletions
dap-sdk/net/client/dap_client_pvt.c
with
7 additions
and
5 deletions
CMakeLists.txt
+
1
−
1
View file @
099dbdb7
...
@@ -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-
8
"
)
set
(
CELLFRAME_SDK_NATIVE_VERSION
"2.9-
9
"
)
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/client/dap_client.c
+
0
−
2
View file @
099dbdb7
...
@@ -244,8 +244,6 @@ static void s_go_stage_on_client_worker_unsafe(dap_worker_t * a_worker,void * a_
...
@@ -244,8 +244,6 @@ static void s_go_stage_on_client_worker_unsafe(dap_worker_t * a_worker,void * a_
return
;
return
;
}
}
dap_client_stage_t
l_cur_stage
=
l_client_pvt
->
stage
;
dap_client_stage_t
l_cur_stage
=
l_client_pvt
->
stage
;
dap_client_stage_status_t
l_cur_stage_status
=
l_client_pvt
->
stage_status
;
dap_client_stage_status_t
l_cur_stage_status
=
l_client_pvt
->
stage_status
;
if
(
l_stage_target
==
l_cur_stage
){
if
(
l_stage_target
==
l_cur_stage
){
...
...
This diff is collapsed.
Click to expand it.
dap-sdk/net/client/dap_client_pvt.c
+
6
−
2
View file @
099dbdb7
...
@@ -875,14 +875,18 @@ static void s_request_response(void * a_response, size_t a_response_size, void *
...
@@ -875,14 +875,18 @@ static void s_request_response(void * a_response, size_t a_response_size, void *
log_it
(
L_ERROR
,
"Client internal is NULL for s_request_response"
);
log_it
(
L_ERROR
,
"Client internal is NULL for s_request_response"
);
else
else
log_it
(
L_ERROR
,
"Client is NULL for s_request_response"
);
log_it
(
L_ERROR
,
"Client is NULL for s_request_response"
);
dap_client_pvt_hh_unlock
();
return
;
return
;
}
}
l_client_pvt
->
refs_count
--
;
l_client_pvt
->
refs_count
--
;
if
(
l_client_pvt
->
is_to_delete
){
if
(
l_client_pvt
->
is_to_delete
){
if
(
l_client_pvt
->
refs_count
==
0
)
// Was requested to delete until we was working with request
if
(
l_client_pvt
->
refs_count
==
0
)
{
// Was requested to delete until we was working with request
dap_client_pvt_hh_unlock
();
dap_client_delete_unsafe
(
l_client_pvt
->
client
);
// Init delete
dap_client_delete_unsafe
(
l_client_pvt
->
client
);
// Init delete
return
;
}
dap_client_pvt_hh_unlock
();
return
;
return
;
}
}
...
...
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