From 14ba410250c71fba2a38ab811229419239e6fd5f Mon Sep 17 00:00:00 2001 From: Bryan Berns Date: Tue, 3 Apr 2018 23:17:44 -0400 Subject: [PATCH] Removed Problematic Debug Statements - Removed debug statements that were interfering with APC wakeup due to the way that logging works in atomicio6(). - Filled in a missing parameter in a debug statement. --- contrib/win32/win32compat/signal.c | 3 +-- contrib/win32/win32compat/socketio.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/contrib/win32/win32compat/signal.c b/contrib/win32/win32compat/signal.c index 0e4dcad87..ddf2cb044 100644 --- a/contrib/win32/win32compat/signal.c +++ b/contrib/win32/win32compat/signal.c @@ -150,7 +150,7 @@ w32_sigprocmask(int how, const sigset_t *set, sigset_t *oldset) { /* this is only used by sshd to block SIGCHLD while doing waitpid() */ /* our implementation of waidpid() is never interrupted, so no need to implement this for now*/ - debug5("sigprocmask() how:%d"); + debug5("sigprocmask() how:%d", how); return 0; } @@ -277,7 +277,6 @@ wait_for_any_event(HANDLE* events, int num_events, DWORD milli_seconds) return -1; } - debug5("wait() on %d events and %d children", num_events, live_children); DWORD ret = wait_for_multiple_objects_enhanced(num_all_events, all_events, milli_seconds, TRUE); if ((ret >= WAIT_OBJECT_0_ENHANCED) && (ret <= WAIT_OBJECT_0_ENHANCED + num_all_events - 1)) { /* woken up by event signaled diff --git a/contrib/win32/win32compat/socketio.c b/contrib/win32/win32compat/socketio.c index 2211d6237..893a88413 100644 --- a/contrib/win32/win32compat/socketio.c +++ b/contrib/win32/win32compat/socketio.c @@ -579,7 +579,6 @@ socketio_send(struct w32_io* pio, const void *buf, size_t len, int flags) if (ret == 0) { /* send has completed and APC is scheduled, let it run */ - debug4("send - WSASend() returned 0, APC scheduled io:%p", pio); pio->write_details.pending = TRUE; pio->write_details.remaining = wsabuf.len; SleepEx(0, TRUE);