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

Merge branch 'hotfix-4871' into 'master'

hotfix-4871

See merge request !329
parents d62ce57f 749a7927
No related branches found
No related tags found
2 merge requests!330features-4787,!329hotfix-4871
Pipeline #8055 passed with stage
in 4 seconds
...@@ -905,19 +905,19 @@ static void * s_proc_thread_function(void * a_arg) ...@@ -905,19 +905,19 @@ static void * s_proc_thread_function(void * a_arg)
} }
#ifdef DAP_EVENTS_CAPS_POLL #ifdef DAP_EVENTS_CAPS_POLL
/***********************************************************/ /***********************************************************/
/* If the compress_array flag was turned on, we need */ /* If the compress_array flag was turned on, we need */
/* to squeeze together the array and decrement the number */ /* to squeeze together the array and decrement the number */
/* of file descriptors. We do not need to move back the */ /* of file descriptors. */
/* events and revents fields because the events will always*/ /***********************************************************/
/* be POLLIN in this case, and revents is output. */ if ( l_poll_compress){
/***********************************************************/
if ( l_poll_compress){
l_poll_compress = false; l_poll_compress = false;
for (size_t i = 0; i < l_thread->poll_count ; i++) { for (size_t i = 0; i < l_thread->poll_count ; i++) {
if ( l_thread->poll[i].fd == -1){ if ( l_thread->poll[i].fd == -1){
for(size_t j = i; j +1 < l_thread->poll_count; j++){ for(size_t j = i; j +1 < l_thread->poll_count; j++){
l_thread->poll[j].fd = l_thread->poll[j+1].fd; l_thread->poll[j].fd = l_thread->poll[j+1].fd;
l_thread->poll[j].events = l_thread->poll[j+1].events;
l_thread->poll[j].revents = l_thread->poll[j+1].revents;
l_thread->esockets[j] = l_thread->esockets[j+1]; l_thread->esockets[j] = l_thread->esockets[j+1];
if(l_thread->esockets[j]) if(l_thread->esockets[j])
l_thread->esockets[j]->poll_index = j; l_thread->esockets[j]->poll_index = j;
...@@ -926,7 +926,7 @@ static void * s_proc_thread_function(void * a_arg) ...@@ -926,7 +926,7 @@ static void * s_proc_thread_function(void * a_arg)
l_thread->poll_count--; l_thread->poll_count--;
} }
} }
} }
#endif #endif
} }
log_it(L_ATT, "Stop processing thread #%u", l_thread->cpu_id); log_it(L_ATT, "Stop processing thread #%u", l_thread->cpu_id);
......
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