mirror of
https://github.com/MariaDB/server.git
synced 2025-08-30 11:22:14 +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
360 lines
8.0 KiB
C
360 lines
8.0 KiB
C
/*
|
|
* 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_EPOLL
|
|
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
#include <sys/resource.h>
|
|
#ifdef HAVE_SYS_TIME_H
|
|
#include <sys/time.h>
|
|
#else
|
|
#include <sys/_time.h>
|
|
#endif
|
|
#include <sys/queue.h>
|
|
#include <sys/epoll.h>
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h>
|
|
#endif
|
|
|
|
#include "event.h"
|
|
#include "event-internal.h"
|
|
#include "evsignal.h"
|
|
#include "log.h"
|
|
|
|
/* due to limitations in the epoll interface, we need to keep track of
|
|
* all file descriptors outself.
|
|
*/
|
|
struct evepoll {
|
|
struct event *evread;
|
|
struct event *evwrite;
|
|
};
|
|
|
|
struct epollop {
|
|
struct evepoll *fds;
|
|
int nfds;
|
|
struct epoll_event *events;
|
|
int nevents;
|
|
int epfd;
|
|
};
|
|
|
|
static void *epoll_init (struct event_base *);
|
|
static int epoll_add (void *, struct event *);
|
|
static int epoll_del (void *, struct event *);
|
|
static int epoll_dispatch (struct event_base *, void *, struct timeval *);
|
|
static void epoll_dealloc (struct event_base *, void *);
|
|
|
|
struct eventop epollops = {
|
|
"epoll",
|
|
epoll_init,
|
|
epoll_add,
|
|
epoll_del,
|
|
epoll_dispatch,
|
|
epoll_dealloc,
|
|
1 /* need reinit */
|
|
};
|
|
|
|
#ifdef HAVE_SETFD
|
|
#define FD_CLOSEONEXEC(x) do { \
|
|
if (fcntl(x, F_SETFD, 1) == -1) \
|
|
event_warn("fcntl(%d, F_SETFD)", x); \
|
|
} while (0)
|
|
#else
|
|
#define FD_CLOSEONEXEC(x)
|
|
#endif
|
|
|
|
#define NEVENT 32000
|
|
|
|
static void *
|
|
epoll_init(struct event_base *base)
|
|
{
|
|
int epfd, nfiles = NEVENT;
|
|
struct rlimit rl;
|
|
struct epollop *epollop;
|
|
|
|
/* Disable epollueue when this environment variable is set */
|
|
if (getenv("EVENT_NOEPOLL"))
|
|
return (NULL);
|
|
|
|
if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
|
|
rl.rlim_cur != RLIM_INFINITY) {
|
|
/*
|
|
* Solaris is somewhat retarded - it's important to drop
|
|
* backwards compatibility when making changes. So, don't
|
|
* dare to put rl.rlim_cur here.
|
|
*/
|
|
nfiles = rl.rlim_cur - 1;
|
|
}
|
|
|
|
/* Initalize the kernel queue */
|
|
|
|
if ((epfd = epoll_create(nfiles)) == -1) {
|
|
event_warn("epoll_create");
|
|
return (NULL);
|
|
}
|
|
|
|
FD_CLOSEONEXEC(epfd);
|
|
|
|
if (!(epollop = calloc(1, sizeof(struct epollop))))
|
|
return (NULL);
|
|
|
|
epollop->epfd = epfd;
|
|
|
|
/* Initalize fields */
|
|
epollop->events = malloc(nfiles * sizeof(struct epoll_event));
|
|
if (epollop->events == NULL) {
|
|
free(epollop);
|
|
return (NULL);
|
|
}
|
|
epollop->nevents = nfiles;
|
|
|
|
epollop->fds = calloc(nfiles, sizeof(struct evepoll));
|
|
if (epollop->fds == NULL) {
|
|
free(epollop->events);
|
|
free(epollop);
|
|
return (NULL);
|
|
}
|
|
epollop->nfds = nfiles;
|
|
|
|
evsignal_init(base);
|
|
|
|
return (epollop);
|
|
}
|
|
|
|
static int
|
|
epoll_recalc(struct event_base *base, void *arg, int max)
|
|
{
|
|
struct epollop *epollop = arg;
|
|
|
|
if (max > epollop->nfds) {
|
|
struct evepoll *fds;
|
|
int nfds;
|
|
|
|
nfds = epollop->nfds;
|
|
while (nfds < max)
|
|
nfds <<= 1;
|
|
|
|
fds = realloc(epollop->fds, nfds * sizeof(struct evepoll));
|
|
if (fds == NULL) {
|
|
event_warn("realloc");
|
|
return (-1);
|
|
}
|
|
epollop->fds = fds;
|
|
memset(fds + epollop->nfds, 0,
|
|
(nfds - epollop->nfds) * sizeof(struct evepoll));
|
|
epollop->nfds = nfds;
|
|
}
|
|
|
|
return (0);
|
|
}
|
|
|
|
static int
|
|
epoll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
|
|
{
|
|
struct epollop *epollop = arg;
|
|
struct epoll_event *events = epollop->events;
|
|
struct evepoll *evep;
|
|
int i, res, timeout = -1;
|
|
|
|
if (tv != NULL)
|
|
timeout = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
|
|
|
|
res = epoll_wait(epollop->epfd, events, epollop->nevents, timeout);
|
|
|
|
if (res == -1) {
|
|
if (errno != EINTR) {
|
|
event_warn("epoll_wait");
|
|
return (-1);
|
|
}
|
|
|
|
evsignal_process(base);
|
|
return (0);
|
|
} else if (base->sig.evsignal_caught) {
|
|
evsignal_process(base);
|
|
}
|
|
|
|
event_debug(("%s: epoll_wait reports %d", __func__, res));
|
|
|
|
for (i = 0; i < res; i++) {
|
|
int what = events[i].events;
|
|
struct event *evread = NULL, *evwrite = NULL;
|
|
|
|
evep = (struct evepoll *)events[i].data.ptr;
|
|
|
|
if (what & (EPOLLHUP|EPOLLERR)) {
|
|
evread = evep->evread;
|
|
evwrite = evep->evwrite;
|
|
} else {
|
|
if (what & EPOLLIN) {
|
|
evread = evep->evread;
|
|
}
|
|
|
|
if (what & EPOLLOUT) {
|
|
evwrite = evep->evwrite;
|
|
}
|
|
}
|
|
|
|
if (!(evread||evwrite))
|
|
continue;
|
|
|
|
if (evread != NULL)
|
|
event_active(evread, EV_READ, 1);
|
|
if (evwrite != NULL)
|
|
event_active(evwrite, EV_WRITE, 1);
|
|
}
|
|
|
|
return (0);
|
|
}
|
|
|
|
|
|
static int
|
|
epoll_add(void *arg, struct event *ev)
|
|
{
|
|
struct epollop *epollop = arg;
|
|
struct epoll_event epev = {0, {0}};
|
|
struct evepoll *evep;
|
|
int fd, op, events;
|
|
|
|
if (ev->ev_events & EV_SIGNAL)
|
|
return (evsignal_add(ev));
|
|
|
|
fd = ev->ev_fd;
|
|
if (fd >= epollop->nfds) {
|
|
/* Extent the file descriptor array as necessary */
|
|
if (epoll_recalc(ev->ev_base, epollop, fd) == -1)
|
|
return (-1);
|
|
}
|
|
evep = &epollop->fds[fd];
|
|
op = EPOLL_CTL_ADD;
|
|
events = 0;
|
|
if (evep->evread != NULL) {
|
|
events |= EPOLLIN;
|
|
op = EPOLL_CTL_MOD;
|
|
}
|
|
if (evep->evwrite != NULL) {
|
|
events |= EPOLLOUT;
|
|
op = EPOLL_CTL_MOD;
|
|
}
|
|
|
|
if (ev->ev_events & EV_READ)
|
|
events |= EPOLLIN;
|
|
if (ev->ev_events & EV_WRITE)
|
|
events |= EPOLLOUT;
|
|
|
|
epev.data.ptr = evep;
|
|
epev.events = events;
|
|
if (epoll_ctl(epollop->epfd, op, ev->ev_fd, &epev) == -1)
|
|
return (-1);
|
|
|
|
/* Update events responsible */
|
|
if (ev->ev_events & EV_READ)
|
|
evep->evread = ev;
|
|
if (ev->ev_events & EV_WRITE)
|
|
evep->evwrite = ev;
|
|
|
|
return (0);
|
|
}
|
|
|
|
static int
|
|
epoll_del(void *arg, struct event *ev)
|
|
{
|
|
struct epollop *epollop = arg;
|
|
struct epoll_event epev = {0, {0}};
|
|
struct evepoll *evep;
|
|
int fd, events, op;
|
|
int needwritedelete = 1, needreaddelete = 1;
|
|
|
|
if (ev->ev_events & EV_SIGNAL)
|
|
return (evsignal_del(ev));
|
|
|
|
fd = ev->ev_fd;
|
|
if (fd >= epollop->nfds)
|
|
return (0);
|
|
evep = &epollop->fds[fd];
|
|
|
|
op = EPOLL_CTL_DEL;
|
|
events = 0;
|
|
|
|
if (ev->ev_events & EV_READ)
|
|
events |= EPOLLIN;
|
|
if (ev->ev_events & EV_WRITE)
|
|
events |= EPOLLOUT;
|
|
|
|
if ((events & (EPOLLIN|EPOLLOUT)) != (EPOLLIN|EPOLLOUT)) {
|
|
if ((events & EPOLLIN) && evep->evwrite != NULL) {
|
|
needwritedelete = 0;
|
|
events = EPOLLOUT;
|
|
op = EPOLL_CTL_MOD;
|
|
} else if ((events & EPOLLOUT) && evep->evread != NULL) {
|
|
needreaddelete = 0;
|
|
events = EPOLLIN;
|
|
op = EPOLL_CTL_MOD;
|
|
}
|
|
}
|
|
|
|
epev.events = events;
|
|
epev.data.ptr = evep;
|
|
|
|
if (needreaddelete)
|
|
evep->evread = NULL;
|
|
if (needwritedelete)
|
|
evep->evwrite = NULL;
|
|
|
|
if (epoll_ctl(epollop->epfd, op, fd, &epev) == -1)
|
|
return (-1);
|
|
|
|
return (0);
|
|
}
|
|
|
|
static void
|
|
epoll_dealloc(struct event_base *base, void *arg)
|
|
{
|
|
struct epollop *epollop = arg;
|
|
|
|
evsignal_dealloc(base);
|
|
if (epollop->fds)
|
|
free(epollop->fds);
|
|
if (epollop->events)
|
|
free(epollop->events);
|
|
if (epollop->epfd >= 0)
|
|
close(epollop->epfd);
|
|
|
|
memset(epollop, 0, sizeof(struct epollop));
|
|
free(epollop);
|
|
}
|
|
|
|
#endif /* HAVE_EPOLL */
|