mirror of
https://github.com/MariaDB/server.git
synced 2025-11-02 02:53:04 +03:00
This is a backport of code from MySQL 6.0 with cleanups and extensions The following new options are supported configure options: --with-libevent ; Enable use of libevent, which is needed for pool of threads mysqld options: --thread-handling=pool-of-threads ; Use a pool of threads to handle queries --thread-pool-size=# ; Define how many threads should be created to handle all queries --extra-port=# ; Extra tcp port that uses the old one-thread-per-connection method --extra-max-connections=# ; Number of connections to accept to 'extra-port' --test-ignore-wrong-options ; Ignore setting an enum value to a wrong option (for mysql-test-run) BUILD/SETUP.sh: Added libevents (and thus pool-of-threads) to max builds CMakeLists.txt: Added libevent Makefile.am: Added libevents config/ac-macros/libevent.m4: Libevent code for configure config/ac-macros/libevent_configure.m4: Libevent code for configure configure.in: Added libevents dbug/dbug.c: Added _db_is_pushed(); Needed for pool-of-threads code extra/Makefile.am: Added libevents extra/libevent: Libevent initial code extra/libevent/CMakeLists.txt: Libevent initial code extra/libevent/Makefile.am: Libevent initial code extra/libevent/README: Libevent initial code extra/libevent/WIN32-Code: Libevent initial code extra/libevent/WIN32-Code/config.h: Libevent initial code extra/libevent/WIN32-Code/misc.c: Libevent initial code extra/libevent/WIN32-Code/misc.h: Libevent initial code extra/libevent/WIN32-Code/tree.h: Libevent initial code extra/libevent/WIN32-Code/win32.c: Libevent initial code extra/libevent/buffer.c: Libevent initial code extra/libevent/compat: Libevent initial code extra/libevent/compat/sys: Libevent initial code extra/libevent/compat/sys/_time.h: Libevent initial code extra/libevent/compat/sys/queue.h: Libevent initial code extra/libevent/compat/sys/tree.h: Libevent initial code extra/libevent/devpoll.c: Libevent initial code extra/libevent/epoll.c: Libevent initial code extra/libevent/epoll_sub.c: Libevent initial code extra/libevent/evbuffer.c: Libevent initial code extra/libevent/evdns.c: Libevent initial code extra/libevent/evdns.h: Libevent initial code extra/libevent/event-config.h: Libevent initial code extra/libevent/event-internal.h: Libevent initial code extra/libevent/event.c: Libevent initial code extra/libevent/event.h: Libevent initial code extra/libevent/event_tagging.c: Libevent initial code extra/libevent/evhttp.h: Libevent initial code extra/libevent/evport.c: Libevent initial code extra/libevent/evrpc-internal.h: Libevent initial code extra/libevent/evrpc.c: Libevent initial code extra/libevent/evrpc.h: Libevent initial code extra/libevent/evsignal.h: Libevent initial code extra/libevent/evutil.c: Libevent initial code extra/libevent/evutil.h: Libevent initial code extra/libevent/http-internal.h: Libevent initial code extra/libevent/http.c: Libevent initial code extra/libevent/kqueue.c: Libevent initial code extra/libevent/log.c: Libevent initial code extra/libevent/log.h: Libevent initial code extra/libevent/min_heap.h: Libevent initial code extra/libevent/poll.c: Libevent initial code extra/libevent/select.c: Libevent initial code extra/libevent/signal.c: Libevent initial code extra/libevent/strlcpy-internal.h: Libevent initial code extra/libevent/strlcpy.c: Libevent initial code include/config-win.h: Libevent support include/my_dbug.h: ADded _db_is_pushed include/mysql.h.pp: Update to handle new prototypes include/typelib.h: Split find_type_or_exit() into two functions include/violite.h: Added vio_is_pending() libmysqld/Makefile.am: Added libevent mysql-test/include/have_pool_of_threads.inc: Added test for pool-of-threads mysql-test/mysql-test-run.pl: Don't abort based on time and don't retry test cases when run under --gdb or --debug mysql-test/r/crash_commit_before.result: USE GLOBAL for debug variable mysql-test/r/have_pool_of_threads.require: Added test for pool-of-threads mysql-test/r/pool_of_threads.result: Added test for pool-of-threads mysql-test/r/subselect_debug.result: USE GLOBAL for debug variable mysql-test/t/crash_commit_before.test: USE GLOBAL for debug variable mysql-test/t/merge-big.test: USE GLOBAL for debug variable mysql-test/t/pool_of_threads-master.opt: Added test for pool-of-threads mysql-test/t/pool_of_threads.test: Added test for pool-of-threads mysys/typelib.c: Split find_type_or_exit() into find_type_with_warning() sql/Makefile.am: Added libevent sql/handler.cc: Indentation fix. Fixed memory loss bug Fixed crash on exit when handler plugin failed sql/mysql_priv.h: Added extra_max_connections and mysqld_extra_port Added extern functions from sql_connect.cc sql/mysqld.cc: Added support for new mysqld options Added code for 'extra-port' and 'extra-max-connections' Split some functions into smaller pieces to be able to reuse code Added code for test-ignore-wrong-options sql/scheduler.cc: Updated schduler code from MySQL 6.0 sql/scheduler.h: Updated schduler code from MySQL 6.0 sql/set_var.cc: Added support for changing "extra_max_connections" sql/sql_class.cc: Iniitalize thread schduler options in THD sql/sql_class.h: Added to extra_port and scheduler to 'THD' sql/sql_connect.cc: Use thd->schduler to check number of connections and terminate connection Made some local functions global (for scheduler.cc) vio/viosocket.c: Added 'vio_pending', needed for scheduler..c
379 lines
9.0 KiB
C
379 lines
9.0 KiB
C
/* $OpenBSD: poll.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */
|
|
|
|
/*
|
|
* Copyright 2000-2003 Niels Provos <provos@citi.umich.edu>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#ifdef HAVE_POLL
|
|
|
|
#include <sys/types.h>
|
|
#ifdef HAVE_SYS_TIME_H
|
|
#include <sys/time.h>
|
|
#else
|
|
#include <sys/_time.h>
|
|
#endif
|
|
#include <sys/queue.h>
|
|
#include <poll.h>
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
#ifdef CHECK_INVARIANTS
|
|
#include <assert.h>
|
|
#endif
|
|
|
|
#include "event.h"
|
|
#include "event-internal.h"
|
|
#include "evsignal.h"
|
|
#include "log.h"
|
|
|
|
struct pollop {
|
|
int event_count; /* Highest number alloc */
|
|
int nfds; /* Size of event_* */
|
|
int fd_count; /* Size of idxplus1_by_fd */
|
|
struct pollfd *event_set;
|
|
struct event **event_r_back;
|
|
struct event **event_w_back;
|
|
int *idxplus1_by_fd; /* Index into event_set by fd; we add 1 so
|
|
* that 0 (which is easy to memset) can mean
|
|
* "no entry." */
|
|
};
|
|
|
|
static void *poll_init (struct event_base *);
|
|
static int poll_add (void *, struct event *);
|
|
static int poll_del (void *, struct event *);
|
|
static int poll_dispatch (struct event_base *, void *, struct timeval *);
|
|
static void poll_dealloc (struct event_base *, void *);
|
|
|
|
const struct eventop pollops = {
|
|
"poll",
|
|
poll_init,
|
|
poll_add,
|
|
poll_del,
|
|
poll_dispatch,
|
|
poll_dealloc,
|
|
0
|
|
};
|
|
|
|
static void *
|
|
poll_init(struct event_base *base)
|
|
{
|
|
struct pollop *pollop;
|
|
|
|
/* Disable poll when this environment variable is set */
|
|
if (getenv("EVENT_NOPOLL"))
|
|
return (NULL);
|
|
|
|
if (!(pollop = calloc(1, sizeof(struct pollop))))
|
|
return (NULL);
|
|
|
|
evsignal_init(base);
|
|
|
|
return (pollop);
|
|
}
|
|
|
|
#ifdef CHECK_INVARIANTS
|
|
static void
|
|
poll_check_ok(struct pollop *pop)
|
|
{
|
|
int i, idx;
|
|
struct event *ev;
|
|
|
|
for (i = 0; i < pop->fd_count; ++i) {
|
|
idx = pop->idxplus1_by_fd[i]-1;
|
|
if (idx < 0)
|
|
continue;
|
|
assert(pop->event_set[idx].fd == i);
|
|
if (pop->event_set[idx].events & POLLIN) {
|
|
ev = pop->event_r_back[idx];
|
|
assert(ev);
|
|
assert(ev->ev_events & EV_READ);
|
|
assert(ev->ev_fd == i);
|
|
}
|
|
if (pop->event_set[idx].events & POLLOUT) {
|
|
ev = pop->event_w_back[idx];
|
|
assert(ev);
|
|
assert(ev->ev_events & EV_WRITE);
|
|
assert(ev->ev_fd == i);
|
|
}
|
|
}
|
|
for (i = 0; i < pop->nfds; ++i) {
|
|
struct pollfd *pfd = &pop->event_set[i];
|
|
assert(pop->idxplus1_by_fd[pfd->fd] == i+1);
|
|
}
|
|
}
|
|
#else
|
|
#define poll_check_ok(pop)
|
|
#endif
|
|
|
|
static int
|
|
poll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
|
|
{
|
|
int res, i, msec = -1, nfds;
|
|
struct pollop *pop = arg;
|
|
|
|
poll_check_ok(pop);
|
|
|
|
if (tv != NULL)
|
|
msec = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
|
|
|
|
nfds = pop->nfds;
|
|
res = poll(pop->event_set, nfds, msec);
|
|
|
|
if (res == -1) {
|
|
if (errno != EINTR) {
|
|
event_warn("poll");
|
|
return (-1);
|
|
}
|
|
|
|
evsignal_process(base);
|
|
return (0);
|
|
} else if (base->sig.evsignal_caught) {
|
|
evsignal_process(base);
|
|
}
|
|
|
|
event_debug(("%s: poll reports %d", __func__, res));
|
|
|
|
if (res == 0)
|
|
return (0);
|
|
|
|
for (i = 0; i < nfds; i++) {
|
|
int what = pop->event_set[i].revents;
|
|
struct event *r_ev = NULL, *w_ev = NULL;
|
|
if (!what)
|
|
continue;
|
|
|
|
res = 0;
|
|
|
|
/* If the file gets closed notify */
|
|
if (what & (POLLHUP|POLLERR))
|
|
what |= POLLIN|POLLOUT;
|
|
if (what & POLLIN) {
|
|
res |= EV_READ;
|
|
r_ev = pop->event_r_back[i];
|
|
}
|
|
if (what & POLLOUT) {
|
|
res |= EV_WRITE;
|
|
w_ev = pop->event_w_back[i];
|
|
}
|
|
if (res == 0)
|
|
continue;
|
|
|
|
if (r_ev && (res & r_ev->ev_events)) {
|
|
event_active(r_ev, res & r_ev->ev_events, 1);
|
|
}
|
|
if (w_ev && w_ev != r_ev && (res & w_ev->ev_events)) {
|
|
event_active(w_ev, res & w_ev->ev_events, 1);
|
|
}
|
|
}
|
|
|
|
return (0);
|
|
}
|
|
|
|
static int
|
|
poll_add(void *arg, struct event *ev)
|
|
{
|
|
struct pollop *pop = arg;
|
|
struct pollfd *pfd = NULL;
|
|
int i;
|
|
|
|
if (ev->ev_events & EV_SIGNAL)
|
|
return (evsignal_add(ev));
|
|
if (!(ev->ev_events & (EV_READ|EV_WRITE)))
|
|
return (0);
|
|
|
|
poll_check_ok(pop);
|
|
if (pop->nfds + 1 >= pop->event_count) {
|
|
struct pollfd *tmp_event_set;
|
|
struct event **tmp_event_r_back;
|
|
struct event **tmp_event_w_back;
|
|
int tmp_event_count;
|
|
|
|
if (pop->event_count < 32)
|
|
tmp_event_count = 32;
|
|
else
|
|
tmp_event_count = pop->event_count * 2;
|
|
|
|
/* We need more file descriptors */
|
|
tmp_event_set = realloc(pop->event_set,
|
|
tmp_event_count * sizeof(struct pollfd));
|
|
if (tmp_event_set == NULL) {
|
|
event_warn("realloc");
|
|
return (-1);
|
|
}
|
|
pop->event_set = tmp_event_set;
|
|
|
|
tmp_event_r_back = realloc(pop->event_r_back,
|
|
tmp_event_count * sizeof(struct event *));
|
|
if (tmp_event_r_back == NULL) {
|
|
/* event_set overallocated; that's okay. */
|
|
event_warn("realloc");
|
|
return (-1);
|
|
}
|
|
pop->event_r_back = tmp_event_r_back;
|
|
|
|
tmp_event_w_back = realloc(pop->event_w_back,
|
|
tmp_event_count * sizeof(struct event *));
|
|
if (tmp_event_w_back == NULL) {
|
|
/* event_set and event_r_back overallocated; that's
|
|
* okay. */
|
|
event_warn("realloc");
|
|
return (-1);
|
|
}
|
|
pop->event_w_back = tmp_event_w_back;
|
|
|
|
pop->event_count = tmp_event_count;
|
|
}
|
|
if (ev->ev_fd >= pop->fd_count) {
|
|
int *tmp_idxplus1_by_fd;
|
|
int new_count;
|
|
if (pop->fd_count < 32)
|
|
new_count = 32;
|
|
else
|
|
new_count = pop->fd_count * 2;
|
|
while (new_count <= ev->ev_fd)
|
|
new_count *= 2;
|
|
tmp_idxplus1_by_fd =
|
|
realloc(pop->idxplus1_by_fd, new_count * sizeof(int));
|
|
if (tmp_idxplus1_by_fd == NULL) {
|
|
event_warn("realloc");
|
|
return (-1);
|
|
}
|
|
pop->idxplus1_by_fd = tmp_idxplus1_by_fd;
|
|
memset(pop->idxplus1_by_fd + pop->fd_count,
|
|
0, sizeof(int)*(new_count - pop->fd_count));
|
|
pop->fd_count = new_count;
|
|
}
|
|
|
|
i = pop->idxplus1_by_fd[ev->ev_fd] - 1;
|
|
if (i >= 0) {
|
|
pfd = &pop->event_set[i];
|
|
} else {
|
|
i = pop->nfds++;
|
|
pfd = &pop->event_set[i];
|
|
pfd->events = 0;
|
|
pfd->fd = ev->ev_fd;
|
|
pop->event_w_back[i] = pop->event_r_back[i] = NULL;
|
|
pop->idxplus1_by_fd[ev->ev_fd] = i + 1;
|
|
}
|
|
|
|
pfd->revents = 0;
|
|
if (ev->ev_events & EV_WRITE) {
|
|
pfd->events |= POLLOUT;
|
|
pop->event_w_back[i] = ev;
|
|
}
|
|
if (ev->ev_events & EV_READ) {
|
|
pfd->events |= POLLIN;
|
|
pop->event_r_back[i] = ev;
|
|
}
|
|
poll_check_ok(pop);
|
|
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* Nothing to be done here.
|
|
*/
|
|
|
|
static int
|
|
poll_del(void *arg, struct event *ev)
|
|
{
|
|
struct pollop *pop = arg;
|
|
struct pollfd *pfd = NULL;
|
|
int i;
|
|
|
|
if (ev->ev_events & EV_SIGNAL)
|
|
return (evsignal_del(ev));
|
|
|
|
if (!(ev->ev_events & (EV_READ|EV_WRITE)))
|
|
return (0);
|
|
|
|
poll_check_ok(pop);
|
|
i = pop->idxplus1_by_fd[ev->ev_fd] - 1;
|
|
if (i < 0)
|
|
return (-1);
|
|
|
|
/* Do we still want to read or write? */
|
|
pfd = &pop->event_set[i];
|
|
if (ev->ev_events & EV_READ) {
|
|
pfd->events &= ~POLLIN;
|
|
pop->event_r_back[i] = NULL;
|
|
}
|
|
if (ev->ev_events & EV_WRITE) {
|
|
pfd->events &= ~POLLOUT;
|
|
pop->event_w_back[i] = NULL;
|
|
}
|
|
poll_check_ok(pop);
|
|
if (pfd->events)
|
|
/* Another event cares about that fd. */
|
|
return (0);
|
|
|
|
/* Okay, so we aren't interested in that fd anymore. */
|
|
pop->idxplus1_by_fd[ev->ev_fd] = 0;
|
|
|
|
--pop->nfds;
|
|
if (i != pop->nfds) {
|
|
/*
|
|
* Shift the last pollfd down into the now-unoccupied
|
|
* position.
|
|
*/
|
|
memcpy(&pop->event_set[i], &pop->event_set[pop->nfds],
|
|
sizeof(struct pollfd));
|
|
pop->event_r_back[i] = pop->event_r_back[pop->nfds];
|
|
pop->event_w_back[i] = pop->event_w_back[pop->nfds];
|
|
pop->idxplus1_by_fd[pop->event_set[i].fd] = i + 1;
|
|
}
|
|
|
|
poll_check_ok(pop);
|
|
return (0);
|
|
}
|
|
|
|
static void
|
|
poll_dealloc(struct event_base *base, void *arg)
|
|
{
|
|
struct pollop *pop = arg;
|
|
|
|
evsignal_dealloc(base);
|
|
if (pop->event_set)
|
|
free(pop->event_set);
|
|
if (pop->event_r_back)
|
|
free(pop->event_r_back);
|
|
if (pop->event_w_back)
|
|
free(pop->event_w_back);
|
|
if (pop->idxplus1_by_fd)
|
|
free(pop->idxplus1_by_fd);
|
|
|
|
memset(pop, 0, sizeof(struct pollop));
|
|
free(pop);
|
|
}
|
|
|
|
#endif /* HAVE_POLL */
|