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
17
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
ca83f602
Commit
ca83f602
authored
3 years ago
by
dmitriy.gerasimov
Browse files
Options
Downloads
Plain Diff
Merge branch 'hotfix-4781-1' into 'master'
Double-code issue See merge request
!331
parents
106e0f43
390d1972
No related branches found
No related tags found
1 merge request
!331
Double-code issue
Pipeline
#8081
passed with stage
in 3 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dap-sdk/net/core/dap_proc_thread.c
+0
-19
0 additions, 19 deletions
dap-sdk/net/core/dap_proc_thread.c
with
0 additions
and
19 deletions
dap-sdk/net/core/dap_proc_thread.c
+
0
−
19
View file @
ca83f602
...
@@ -451,18 +451,6 @@ static void * s_proc_thread_function(void * a_arg)
...
@@ -451,18 +451,6 @@ static void * s_proc_thread_function(void * a_arg)
return
NULL
;
return
NULL
;
}
}
// Add exit event
l_thread
->
event_exit
->
ev
.
events
=
l_thread
->
event_exit
->
ev_base_flags
;
l_thread
->
event_exit
->
ev
.
data
.
ptr
=
l_thread
->
event_exit
;
if
(
epoll_ctl
(
l_thread
->
epoll_ctl
,
EPOLL_CTL_ADD
,
l_thread
->
event_exit
->
socket
,
&
l_thread
->
event_exit
->
ev
)
!=
0
){
#ifdef DAP_OS_WINDOWS
errno
=
WSAGetLastError
();
#endif
log_it
(
L_CRITICAL
,
"Can't add exit event on epoll ctl, err: %d"
,
errno
);
return
NULL
;
}
// Add exit event
// Add exit event
l_thread
->
event_exit
->
ev
.
events
=
l_thread
->
event_exit
->
ev_base_flags
;
l_thread
->
event_exit
->
ev
.
events
=
l_thread
->
event_exit
->
ev_base_flags
;
l_thread
->
event_exit
->
ev
.
data
.
ptr
=
l_thread
->
event_exit
;
l_thread
->
event_exit
->
ev
.
data
.
ptr
=
l_thread
->
event_exit
;
...
@@ -524,13 +512,6 @@ static void * s_proc_thread_function(void * a_arg)
...
@@ -524,13 +512,6 @@ static void * s_proc_thread_function(void * a_arg)
l_thread
->
esockets
[
l_thread
->
poll_count
]
=
l_thread
->
proc_event
;
l_thread
->
esockets
[
l_thread
->
poll_count
]
=
l_thread
->
proc_event
;
l_thread
->
poll_count
++
;
l_thread
->
poll_count
++
;
// Add exit event
l_thread
->
poll
[
l_thread
->
poll_count
].
fd
=
l_thread
->
event_exit
->
fd
;
l_thread
->
poll
[
l_thread
->
poll_count
].
events
=
l_thread
->
event_exit
->
poll_base_flags
;
l_thread
->
esockets
[
l_thread
->
poll_count
]
=
l_thread
->
event_exit
;
l_thread
->
poll_count
++
;
// Add exit event
// Add exit event
l_thread
->
poll
[
l_thread
->
poll_count
].
fd
=
l_thread
->
event_exit
->
fd
;
l_thread
->
poll
[
l_thread
->
poll_count
].
fd
=
l_thread
->
event_exit
->
fd
;
l_thread
->
poll
[
l_thread
->
poll_count
].
events
=
l_thread
->
event_exit
->
poll_base_flags
;
l_thread
->
poll
[
l_thread
->
poll_count
].
events
=
l_thread
->
event_exit
->
poll_base_flags
;
...
...
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