Skip to content

Commit aca5ec9

Browse files
committed
chore: remove scaffolding (SEM must be correct, no graceful fallback)
Graceful fallback was necessary when filling in the gaps functionality wise but now that everything is in place, we should revert back to the old behavior of crashing when supplied an invalid or inapplicable SocketEventsMode preference as this means we didn't filter out an invalid input from the user-end or didn't set our defaults correctly, which is a logic error.
1 parent 08a42c1 commit aca5ec9

File tree

1 file changed

+3
-25
lines changed

1 file changed

+3
-25
lines changed

src/util/sock.cpp

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -180,49 +180,27 @@ bool Sock::WaitMany(std::chrono::milliseconds timeout, EventsPerSock& events_per
180180

181181
bool Sock::WaitManyInternal(std::chrono::milliseconds timeout, EventsPerSock& events_per_sock, SocketEventsParams event_params)
182182
{
183-
std::string debug_str;
184-
185183
switch (event_params.m_event_mode)
186184
{
187-
case SocketEventsMode::Poll:
188185
#ifdef USE_POLL
186+
case SocketEventsMode::Poll:
189187
return WaitManyPoll(timeout, events_per_sock, event_params.m_wrap_func);
190-
#else
191-
debug_str += "Sock::Wait -- Support for poll not compiled in, falling back on ";
192-
break;
193188
#endif /* USE_POLL */
194189
case SocketEventsMode::Select:
195190
return WaitManySelect(timeout, events_per_sock, event_params.m_wrap_func);
196-
case SocketEventsMode::EPoll:
197191
#ifdef USE_EPOLL
192+
case SocketEventsMode::EPoll:
198193
assert(event_params.m_event_fd != INVALID_SOCKET);
199194
return WaitManyEPoll(timeout, events_per_sock, event_params.m_event_fd, event_params.m_wrap_func);
200-
#else
201-
debug_str += "Sock::Wait -- Support for epoll not compiled in, falling back on ";
202-
break;
203195
#endif /* USE_EPOLL */
204-
case SocketEventsMode::KQueue:
205196
#ifdef USE_KQUEUE
197+
case SocketEventsMode::KQueue:
206198
assert(event_params.m_event_fd != INVALID_SOCKET);
207199
return WaitManyKQueue(timeout, events_per_sock, event_params.m_event_fd, event_params.m_wrap_func);
208-
#else
209-
debug_str += "Sock::Wait -- Support for kqueue not compiled in, falling back on ";
210-
break;
211200
#endif /* USE_KQUEUE */
212201
default:
213202
assert(false);
214203
}
215-
#ifdef USE_POLL
216-
debug_str += "poll";
217-
#else
218-
debug_str += "select";
219-
#endif /* USE_POLL*/
220-
LogPrint(BCLog::NET, "%s\n", debug_str);
221-
#ifdef USE_POLL
222-
return WaitManyPoll(timeout, events_per_sock, event_params.m_wrap_func);
223-
#else
224-
return WaitManySelect(timeout, events_per_sock, event_params.m_wrap_func);
225-
#endif /* USE_POLL */
226204
}
227205

228206
#ifdef USE_EPOLL

0 commit comments

Comments
 (0)