Skip to content

Commit f24520a

Browse files
committed
net: log close failures in EdgeTriggerEvents and WakeupPipe
1 parent b8c3b48 commit f24520a

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/util/edge.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ EdgeTriggeredEvents::~EdgeTriggeredEvents()
5252
{
5353
if (m_valid) {
5454
#if defined(USE_KQUEUE) || defined(USE_EPOLL)
55-
close(m_fd);
55+
if (close(m_fd) != 0) {
56+
LogPrintf("Destroying EdgeTriggeredEvents instance, close() failed for m_fd = %d with error %s\n", m_fd,
57+
NetworkErrorString(WSAGetLastError()));
58+
}
5659
#else
5760
assert(false);
5861
#endif /* defined(USE_KQUEUE) || defined(USE_EPOLL) */

src/util/wpipe.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <logging.h>
88
#include <util/edge.h>
9+
#include <util/sock.h>
910

1011
WakeupPipe::WakeupPipe(EdgeTriggeredEvents* edge_trig_events)
1112
: m_edge_trig_events{edge_trig_events}
@@ -39,8 +40,12 @@ WakeupPipe::~WakeupPipe()
3940
if (m_edge_trig_events && !m_edge_trig_events->UnregisterPipe(m_pipe[0])) {
4041
LogPrintf("Destroying WakeupPipe instance, EdgeTriggeredEvents::UnregisterPipe() failed\n");
4142
}
42-
close(m_pipe[0]);
43-
close(m_pipe[1]);
43+
for (size_t idx = 0; idx < m_pipe.size(); idx++) {
44+
if (close(m_pipe[idx]) != 0) {
45+
LogPrintf("Destroying WakeupPipe instance, close() failed for m_pipe[%d] = %d with error %s\n",
46+
idx, m_pipe[idx], NetworkErrorString(WSAGetLastError()));
47+
}
48+
}
4449
#else
4550
assert(false);
4651
#endif /* USE_WAKEUP_PIPE */

0 commit comments

Comments
 (0)