mirror of
https://github.com/MariaDB/server.git
synced 2025-08-29 00:08: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
305 lines
7.7 KiB
C
305 lines
7.7 KiB
C
/* $OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */
|
|
|
|
/*
|
|
* Copyright 2000-2002 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 WIN32
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#include <windows.h>
|
|
#include <winsock2.h>
|
|
#undef WIN32_LEAN_AND_MEAN
|
|
#endif
|
|
#include <sys/types.h>
|
|
#ifdef HAVE_SYS_TIME_H
|
|
#include <sys/time.h>
|
|
#endif
|
|
#include <sys/queue.h>
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
#include <sys/socket.h>
|
|
#endif
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
#include <errno.h>
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h>
|
|
#endif
|
|
#include <assert.h>
|
|
|
|
#include "event.h"
|
|
#include "event-internal.h"
|
|
#include "evsignal.h"
|
|
#include "evutil.h"
|
|
#include "log.h"
|
|
|
|
struct event_base *evsignal_base = NULL;
|
|
|
|
static void evsignal_handler(int sig);
|
|
|
|
/* Callback for when the signal handler write a byte to our signaling socket */
|
|
static void
|
|
evsignal_cb(int fd, short what, void *arg)
|
|
{
|
|
static char signals[100];
|
|
#ifdef WIN32
|
|
SSIZE_T n;
|
|
#else
|
|
ssize_t n;
|
|
#endif
|
|
|
|
n = recv(fd, signals, sizeof(signals), 0);
|
|
if (n == -1)
|
|
event_err(1, "%s: read", __func__);
|
|
}
|
|
|
|
#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
|
|
|
|
void
|
|
evsignal_init(struct event_base *base)
|
|
{
|
|
/*
|
|
* Our signal handler is going to write to one end of the socket
|
|
* pair to wake up our event loop. The event loop then scans for
|
|
* signals that got delivered.
|
|
*/
|
|
if (evutil_socketpair(AF_UNIX, SOCK_STREAM, 0, base->sig.ev_signal_pair) == -1)
|
|
event_err(1, "%s: socketpair", __func__);
|
|
|
|
FD_CLOSEONEXEC(base->sig.ev_signal_pair[0]);
|
|
FD_CLOSEONEXEC(base->sig.ev_signal_pair[1]);
|
|
base->sig.sh_old = NULL;
|
|
base->sig.sh_old_max = 0;
|
|
base->sig.evsignal_caught = 0;
|
|
memset(&base->sig.evsigcaught, 0, sizeof(sig_atomic_t)*NSIG);
|
|
|
|
evutil_make_socket_nonblocking(base->sig.ev_signal_pair[0]);
|
|
|
|
event_set(&base->sig.ev_signal, base->sig.ev_signal_pair[1],
|
|
EV_READ | EV_PERSIST, evsignal_cb, &base->sig.ev_signal);
|
|
base->sig.ev_signal.ev_base = base;
|
|
base->sig.ev_signal.ev_flags |= EVLIST_INTERNAL;
|
|
}
|
|
|
|
/* Helper: set the signal handler for evsignal to handler in base, so that
|
|
* we can restore the original handler when we clear the current one. */
|
|
int
|
|
_evsignal_set_handler(struct event_base *base,
|
|
int evsignal, void (*handler)(int))
|
|
{
|
|
#ifdef HAVE_SIGACTION
|
|
struct sigaction sa;
|
|
#else
|
|
ev_sighandler_t sh;
|
|
#endif
|
|
struct evsignal_info *sig = &base->sig;
|
|
void *p;
|
|
|
|
/*
|
|
* resize saved signal handler array up to the highest signal number.
|
|
* a dynamic array is used to keep footprint on the low side.
|
|
*/
|
|
if (evsignal >= sig->sh_old_max) {
|
|
event_debug(("%s: evsignal (%d) >= sh_old_max (%d), resizing",
|
|
__func__, evsignal, sig->sh_old_max));
|
|
sig->sh_old_max = evsignal + 1;
|
|
p = realloc(sig->sh_old, sig->sh_old_max * sizeof *sig->sh_old);
|
|
if (p == NULL) {
|
|
event_warn("realloc");
|
|
return (-1);
|
|
}
|
|
sig->sh_old = p;
|
|
}
|
|
|
|
/* allocate space for previous handler out of dynamic array */
|
|
sig->sh_old[evsignal] = malloc(sizeof *sig->sh_old[evsignal]);
|
|
if (sig->sh_old[evsignal] == NULL) {
|
|
event_warn("malloc");
|
|
return (-1);
|
|
}
|
|
|
|
/* save previous handler and setup new handler */
|
|
#ifdef HAVE_SIGACTION
|
|
memset(&sa, 0, sizeof(sa));
|
|
sa.sa_handler = handler;
|
|
sa.sa_flags |= SA_RESTART;
|
|
sigfillset(&sa.sa_mask);
|
|
|
|
if (sigaction(evsignal, &sa, sig->sh_old[evsignal]) == -1) {
|
|
event_warn("sigaction");
|
|
free(sig->sh_old[evsignal]);
|
|
return (-1);
|
|
}
|
|
#else
|
|
if ((sh = signal(evsignal, handler)) == SIG_ERR) {
|
|
event_warn("signal");
|
|
free(sig->sh_old[evsignal]);
|
|
return (-1);
|
|
}
|
|
*sig->sh_old[evsignal] = sh;
|
|
#endif
|
|
|
|
return (0);
|
|
}
|
|
|
|
int
|
|
evsignal_add(struct event *ev)
|
|
{
|
|
int evsignal;
|
|
struct event_base *base = ev->ev_base;
|
|
struct evsignal_info *sig = &ev->ev_base->sig;
|
|
|
|
if (ev->ev_events & (EV_READ|EV_WRITE))
|
|
event_errx(1, "%s: EV_SIGNAL incompatible use", __func__);
|
|
evsignal = EVENT_SIGNAL(ev);
|
|
|
|
event_debug(("%s: %p: changing signal handler", __func__, ev));
|
|
if (_evsignal_set_handler(base, evsignal, evsignal_handler) == -1)
|
|
return (-1);
|
|
|
|
/* catch signals if they happen quickly */
|
|
evsignal_base = base;
|
|
|
|
if (!sig->ev_signal_added) {
|
|
sig->ev_signal_added = 1;
|
|
event_add(&sig->ev_signal, NULL);
|
|
}
|
|
|
|
return (0);
|
|
}
|
|
|
|
int
|
|
_evsignal_restore_handler(struct event_base *base, int evsignal)
|
|
{
|
|
int ret = 0;
|
|
struct evsignal_info *sig = &base->sig;
|
|
#ifdef HAVE_SIGACTION
|
|
struct sigaction *sh;
|
|
#else
|
|
ev_sighandler_t *sh;
|
|
#endif
|
|
|
|
/* restore previous handler */
|
|
sh = sig->sh_old[evsignal];
|
|
sig->sh_old[evsignal] = NULL;
|
|
#ifdef HAVE_SIGACTION
|
|
if (sigaction(evsignal, sh, NULL) == -1) {
|
|
event_warn("sigaction");
|
|
ret = -1;
|
|
}
|
|
#else
|
|
if (signal(evsignal, *sh) == SIG_ERR) {
|
|
event_warn("signal");
|
|
ret = -1;
|
|
}
|
|
#endif
|
|
free(sh);
|
|
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
evsignal_del(struct event *ev)
|
|
{
|
|
event_debug(("%s: %p: restoring signal handler", __func__, ev));
|
|
return _evsignal_restore_handler(ev->ev_base, EVENT_SIGNAL(ev));
|
|
}
|
|
|
|
static void
|
|
evsignal_handler(int sig)
|
|
{
|
|
int save_errno = errno;
|
|
|
|
if(evsignal_base == NULL) {
|
|
event_warn(
|
|
"%s: received signal %d, but have no base configured",
|
|
__func__, sig);
|
|
return;
|
|
}
|
|
|
|
evsignal_base->sig.evsigcaught[sig]++;
|
|
evsignal_base->sig.evsignal_caught = 1;
|
|
|
|
#ifndef HAVE_SIGACTION
|
|
signal(sig, evsignal_handler);
|
|
#endif
|
|
|
|
/* Wake up our notification mechanism */
|
|
send(evsignal_base->sig.ev_signal_pair[0], "a", 1, 0);
|
|
errno = save_errno;
|
|
}
|
|
|
|
void
|
|
evsignal_process(struct event_base *base)
|
|
{
|
|
struct event *ev;
|
|
sig_atomic_t ncalls;
|
|
|
|
base->sig.evsignal_caught = 0;
|
|
TAILQ_FOREACH(ev, &base->sig.signalqueue, ev_signal_next) {
|
|
ncalls = base->sig.evsigcaught[EVENT_SIGNAL(ev)];
|
|
if (ncalls) {
|
|
if (!(ev->ev_events & EV_PERSIST))
|
|
event_del(ev);
|
|
event_active(ev, EV_SIGNAL, ncalls);
|
|
base->sig.evsigcaught[EVENT_SIGNAL(ev)] = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
evsignal_dealloc(struct event_base *base)
|
|
{
|
|
if(base->sig.ev_signal_added) {
|
|
event_del(&base->sig.ev_signal);
|
|
base->sig.ev_signal_added = 0;
|
|
}
|
|
assert(TAILQ_EMPTY(&base->sig.signalqueue));
|
|
|
|
EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]);
|
|
base->sig.ev_signal_pair[0] = -1;
|
|
EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]);
|
|
base->sig.ev_signal_pair[1] = -1;
|
|
base->sig.sh_old_max = 0;
|
|
|
|
/* per index frees are handled in evsignal_del() */
|
|
free(base->sig.sh_old);
|
|
}
|