Skip to content
Snippets Groups Projects
Commit ca83f602 authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

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!331Double-code issue
Pipeline #8081 passed with stage
in 3 seconds
...@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment