mirror of
https://github.com/MariaDB/server.git
synced 2025-08-24 14:48:09 +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
199 lines
5.5 KiB
C
199 lines
5.5 KiB
C
/*
|
|
* Copyright (c) 2007 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>
|
|
#undef WIN32_LEAN_AND_MEAN
|
|
#include <winsock2.h>
|
|
#include "misc.h"
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
#include <sys/socket.h>
|
|
#endif
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h>
|
|
#endif
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
#include <errno.h>
|
|
|
|
#include "evutil.h"
|
|
#include "log.h"
|
|
|
|
int
|
|
evutil_socketpair(int family, int type, int protocol, int fd[2])
|
|
{
|
|
#ifndef WIN32
|
|
return socketpair(family, type, protocol, fd);
|
|
#else
|
|
/* This code is originally from Tor. Used with permission. */
|
|
|
|
/* This socketpair does not work when localhost is down. So
|
|
* it's really not the same thing at all. But it's close enough
|
|
* for now, and really, when localhost is down sometimes, we
|
|
* have other problems too.
|
|
*/
|
|
int listener = -1;
|
|
int connector = -1;
|
|
int acceptor = -1;
|
|
struct sockaddr_in listen_addr;
|
|
struct sockaddr_in connect_addr;
|
|
int size;
|
|
int saved_errno = -1;
|
|
|
|
if (protocol
|
|
#ifdef AF_UNIX
|
|
|| family != AF_UNIX
|
|
#endif
|
|
) {
|
|
EVUTIL_SET_SOCKET_ERROR(WSAEAFNOSUPPORT);
|
|
return -1;
|
|
}
|
|
if (!fd) {
|
|
EVUTIL_SET_SOCKET_ERROR(WSAEINVAL);
|
|
return -1;
|
|
}
|
|
|
|
listener = (int)socket(AF_INET, type, 0);
|
|
if (listener < 0)
|
|
return -1;
|
|
memset(&listen_addr, 0, sizeof(listen_addr));
|
|
listen_addr.sin_family = AF_INET;
|
|
listen_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
|
|
listen_addr.sin_port = 0; /* kernel chooses port. */
|
|
if (bind(listener, (struct sockaddr *) &listen_addr, sizeof (listen_addr))
|
|
== -1)
|
|
goto tidy_up_and_fail;
|
|
if (listen(listener, 1) == -1)
|
|
goto tidy_up_and_fail;
|
|
|
|
connector = (int)socket(AF_INET, type, 0);
|
|
if (connector < 0)
|
|
goto tidy_up_and_fail;
|
|
/* We want to find out the port number to connect to. */
|
|
size = sizeof(connect_addr);
|
|
if (getsockname(listener, (struct sockaddr *) &connect_addr, &size) == -1)
|
|
goto tidy_up_and_fail;
|
|
if (size != sizeof (connect_addr))
|
|
goto abort_tidy_up_and_fail;
|
|
if (connect(connector, (struct sockaddr *) &connect_addr,
|
|
sizeof(connect_addr)) == -1)
|
|
goto tidy_up_and_fail;
|
|
|
|
size = sizeof(listen_addr);
|
|
acceptor = (int)accept(listener, (struct sockaddr *) &listen_addr, &size);
|
|
if (acceptor < 0)
|
|
goto tidy_up_and_fail;
|
|
if (size != sizeof(listen_addr))
|
|
goto abort_tidy_up_and_fail;
|
|
EVUTIL_CLOSESOCKET(listener);
|
|
/* Now check we are talking to ourself by matching port and host on the
|
|
two sockets. */
|
|
if (getsockname(connector, (struct sockaddr *) &connect_addr, &size) == -1)
|
|
goto tidy_up_and_fail;
|
|
if (size != sizeof (connect_addr)
|
|
|| listen_addr.sin_family != connect_addr.sin_family
|
|
|| listen_addr.sin_addr.s_addr != connect_addr.sin_addr.s_addr
|
|
|| listen_addr.sin_port != connect_addr.sin_port)
|
|
goto abort_tidy_up_and_fail;
|
|
fd[0] = connector;
|
|
fd[1] = acceptor;
|
|
|
|
return 0;
|
|
|
|
abort_tidy_up_and_fail:
|
|
saved_errno = WSAECONNABORTED;
|
|
tidy_up_and_fail:
|
|
if (saved_errno < 0)
|
|
saved_errno = WSAGetLastError();
|
|
if (listener != -1)
|
|
EVUTIL_CLOSESOCKET(listener);
|
|
if (connector != -1)
|
|
EVUTIL_CLOSESOCKET(connector);
|
|
if (acceptor != -1)
|
|
EVUTIL_CLOSESOCKET(acceptor);
|
|
|
|
EVUTIL_SET_SOCKET_ERROR(saved_errno);
|
|
return -1;
|
|
#endif
|
|
}
|
|
|
|
int
|
|
evutil_make_socket_nonblocking(int fd)
|
|
{
|
|
#ifdef WIN32
|
|
{
|
|
unsigned long nonblocking = 1;
|
|
ioctlsocket(fd, FIONBIO, (unsigned long*) &nonblocking);
|
|
}
|
|
#else
|
|
if (fcntl(fd, F_SETFL, O_NONBLOCK) == -1) {
|
|
event_warn("fcntl(O_NONBLOCK)");
|
|
return -1;
|
|
}
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
ev_int64_t
|
|
evutil_strtoll(const char *s, char **endptr, int base)
|
|
{
|
|
#ifdef HAVE_STRTOLL
|
|
return (ev_int64_t)strtoll(s, endptr, base);
|
|
#elif SIZEOF_LONG == 8
|
|
return (ev_int64_t)strtol(s, endptr, base);
|
|
#elif defined(WIN32) && defined(_MSC_VER) && _MSC_VER < 1300
|
|
/* XXXX on old versions of MS APIs, we only support base
|
|
* 10. */
|
|
ev_int64_t r;
|
|
if (base != 10)
|
|
return 0;
|
|
r = (ev_int64_t) _atoi64(s);
|
|
while (isspace(*s))
|
|
++s;
|
|
while (isdigit(*s))
|
|
++s;
|
|
if (endptr)
|
|
*endptr = (char*) s;
|
|
return r;
|
|
#elif defined(WIN32)
|
|
return (ev_int64_t) _strtoi64(s, endptr, base);
|
|
#else
|
|
#error "I don't know how to parse 64-bit integers."
|
|
#endif
|
|
}
|