From: Donald Sharp Date: Wed, 7 Feb 2024 15:38:02 +0000 (-0500) Subject: lib, ospfclient, tests, vtysh: Allow for a minimum fd poll size X-Git-Tag: base_10.0~1^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=729dd6f6261933d51a49d68995ff70b6d015e4b5;p=matthieu%2Ffrr.git lib, ospfclient, tests, vtysh: Allow for a minimum fd poll size There exists cases where just honoring the FD_LIMIT size as given to us by the operating system makes no sense. Let's just make a switch to allow for this for things like vtysh and ospfclient which will never have 1k files open at any given time. Fixes: #15315 Signed-off-by: Donald Sharp --- diff --git a/lib/event.c b/lib/event.c index 6427705e90..fc46a11c0b 100644 --- a/lib/event.c +++ b/lib/event.c @@ -570,9 +570,12 @@ struct event_loop *event_master_create(const char *name) rv->fd_limit = (int)limit.rlim_cur; } - if (rv->fd_limit > STUPIDLY_LARGE_FD_SIZE) - zlog_warn("FD Limit set: %u is stupidly large. Is this what you intended? Consider using --limit-fds", - rv->fd_limit); + if (rv->fd_limit > STUPIDLY_LARGE_FD_SIZE) { + zlog_warn("FD Limit set: %u is stupidly large. Is this what you intended? Consider using --limit-fds also limiting size to %u", + rv->fd_limit, STUPIDLY_LARGE_FD_SIZE); + + rv->fd_limit = STUPIDLY_LARGE_FD_SIZE; + } rv->read = XCALLOC(MTYPE_EVENT_POLL, sizeof(struct event *) * rv->fd_limit);