mirror of
https://github.com/samba-team/samba.git
synced 2024-12-28 07:21:54 +03:00
455fccf86b
Previously, only one fd handler was being called per main message loop in all smbd child processes. In the case where multiple fds are available for reading the fd corresponding to the event closest to the beginning of the event list would be run. Obviously this is arbitrary and could cause unfairness. Usually, the first event fd is the network socket, meaning heavy load of client requests can starve out other fd events such as oplock or notify upcalls from the kernel. In this patch, I have changed the behavior of run_events() to unset any fd that it has already called a handler function, as well as decrement the number of fds that were returned from select(). This allows the caller of run_events() to iterate it, until all available fds have been handled. I then changed the main loop in smbd child processes to iterate run_events(). This way, all available fds are handled on each wake of select, while still checking for timed or signalled events between each handler function call. I also added an explicit check for EINTR from select(), which previously was masked by the fact that run_events() would handle any signal event before the return code was checked. This required a signature change to run_events() but all other callers should have no change in their behavior. I also fixed a bug in run_events() where it could be called with a selrtn value of -1, doing unecessary looping through the fd_event list when no fds were available. Also, remove the temporary echo handler hack, as all fds should be treated fairly now.
40 lines
1.5 KiB
C
40 lines
1.5 KiB
C
/*
|
|
Unix SMB/CIFS implementation.
|
|
event handling
|
|
Copyright (C) Andrew Tridgell 1992-1998
|
|
Copyright (C) Volker Lendecke 2005
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#define TEVENT_COMPAT_DEFINES
|
|
#include <tevent.h>
|
|
|
|
#undef event_context_init
|
|
#define event_context_init(mem_ctx) s3_tevent_context_init(mem_ctx)
|
|
|
|
/* The following definitions come from lib/events.c */
|
|
|
|
bool event_add_to_select_args(struct event_context *event_ctx,
|
|
const struct timeval *now,
|
|
fd_set *read_fds, fd_set *write_fds,
|
|
struct timeval *timeout, int *maxfd);
|
|
bool run_events(struct event_context *event_ctx,
|
|
int *selrtn, fd_set *read_fds, fd_set *write_fds);
|
|
struct timeval *get_timed_events_timeout(struct event_context *event_ctx,
|
|
struct timeval *to_ret);
|
|
void dump_event_list(struct event_context *event_ctx);
|
|
struct tevent_context *s3_tevent_context_init(TALLOC_CTX *mem_ctx);
|
|
|