diff --git a/dap_events.c b/dap_events.c index 61a649506ede9892c1fc82a3db8a0e0f938b637e..5e13b238f285ab16a0230e3b53328abb4a385796 100755 --- a/dap_events.c +++ b/dap_events.c @@ -295,7 +295,7 @@ static void* thread_worker_function(void *arg) } else #endif if ( ( cur = dap_events_socket_find(events[n].data.fd, w->events) ) != NULL ) { - log_it(L_DEBUG, "Epoll event n=%d/%d fd=%d events=%d cur=%d", n, selected_sockets, events[n].data.fd, events[n].events, cur); + //log_it(L_DEBUG, "Epoll event n=%d/%d fd=%d events=%d cur=%d", n, selected_sockets, events[n].data.fd, events[n].events, cur); if( events[n].events & EPOLLERR ) { log_it(L_ERROR,"Socket error: %s",strerror(errno)); cur->signal_close=true; @@ -315,7 +315,7 @@ static void* thread_worker_function(void *arg) if(bytes_read > 0) { cur->buf_in_size += bytes_read; - log_it(L_DEBUG, "Received %d bytes", bytes_read); + //log_it(L_DEBUG, "Received %d bytes", bytes_read); cur->callbacks->read_callback(cur, NULL); // Call callback to process read event. At the end of callback buf_in_size should be zero if everything was read well } else if(bytes_read < 0) { @@ -366,7 +366,7 @@ static void* thread_worker_function(void *arg) //log_it(L_DEBUG, "Output: %u from %u bytes are sent ", total_sent,cur->buf_out_size); } - log_it(L_DEBUG,"Output: sent %u bytes",total_sent); + //log_it(L_DEBUG,"Output: sent %u bytes",total_sent); cur->buf_out_size = 0; } } diff --git a/dap_events_socket.c b/dap_events_socket.c index fbaa25f372c5fcf74b2a302c5c8804cd561adcd8..81b539fe276f403a0d8a231c5db45f280cdc202e 100755 --- a/dap_events_socket.c +++ b/dap_events_socket.c @@ -193,7 +193,7 @@ void dap_events_socket_set_writable(dap_events_socket_t * sc,bool is_ready) ev.events |= EPOLLOUT; ev.data.fd=sc->socket; if (epoll_ctl(sc->dap_worker->epoll_fd, EPOLL_CTL_MOD, sc->socket, &ev) == -1) { - log_it(L_ERROR,"Can't update write client socket state in the epoll_fd"); + log_it(L_ERROR,"Can't update write client socket state in the epoll_fd=%d socket=0x%x",sc->dap_worker->epoll_fd, sc->socket); }else dap_events_thread_wake_up(&sc->events->proc_thread); } diff --git a/libdap b/libdap index bf491dd3385b3a1db24800aeb1f6e7fac536e430..89195543d9af78c67aed8289ff0faa52ca030232 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit bf491dd3385b3a1db24800aeb1f6e7fac536e430 +Subproject commit 89195543d9af78c67aed8289ff0faa52ca030232 diff --git a/test/libdap-test b/test/libdap-test index d2257789e0c796a5a3b637e14dcbaf8a8c7880cc..b76175acc517f085c319c8e66c62bd143f96bf94 160000 --- a/test/libdap-test +++ b/test/libdap-test @@ -1 +1 @@ -Subproject commit d2257789e0c796a5a3b637e14dcbaf8a8c7880cc +Subproject commit b76175acc517f085c319c8e66c62bd143f96bf94