mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
4fe3425009
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
251 lines
6 KiB
C
251 lines
6 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
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; version 2 of the License.
|
|
|
|
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, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Functions to handle typelib */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
|
|
|
|
static const char field_separator=',';
|
|
|
|
int find_type_with_warning(const char *x, TYPELIB *typelib, const char *option)
|
|
{
|
|
int res;
|
|
const char **ptr;
|
|
|
|
if ((res= find_type((char *) x, typelib, 2)) <= 0)
|
|
{
|
|
ptr= typelib->type_names;
|
|
if (!*x)
|
|
fprintf(stderr, "No option given to %s\n", option);
|
|
else
|
|
fprintf(stderr, "Unknown option to %s: %s\n", option, x);
|
|
fprintf(stderr, "Alternatives are: '%s'", *ptr);
|
|
while (*++ptr)
|
|
fprintf(stderr, ",'%s'", *ptr);
|
|
fprintf(stderr, "\n");
|
|
}
|
|
return res;
|
|
}
|
|
|
|
|
|
uint find_type_or_exit(const char *x, TYPELIB *typelib, const char *option)
|
|
{
|
|
int res;
|
|
if ((res= find_type_with_warning(x, typelib, option)) <= 0)
|
|
exit(1);
|
|
return (uint) res;
|
|
}
|
|
|
|
|
|
/*
|
|
Search after a string in a list of strings. Endspace in x is not compared.
|
|
|
|
SYNOPSIS
|
|
find_type()
|
|
x String to find
|
|
lib TYPELIB (struct of pointer to values + count)
|
|
full_name bitmap of what to do
|
|
If & 1 accept only whole names
|
|
If & 2 don't expand if half field
|
|
If & 4 allow #number# as type
|
|
If & 8 use ',' as string terminator
|
|
|
|
NOTES
|
|
If part, uniq field is found and full_name == 0 then x is expanded
|
|
to full field.
|
|
|
|
RETURN
|
|
-1 Too many matching values
|
|
0 No matching value
|
|
>0 Offset+1 in typelib for matched string
|
|
*/
|
|
|
|
|
|
int find_type(char *x, const TYPELIB *typelib, uint full_name)
|
|
{
|
|
int find,pos,findpos;
|
|
reg1 char * i;
|
|
reg2 const char *j;
|
|
DBUG_ENTER("find_type");
|
|
DBUG_PRINT("enter",("x: '%s' lib: 0x%lx", x, (long) typelib));
|
|
|
|
if (!typelib->count)
|
|
{
|
|
DBUG_PRINT("exit",("no count"));
|
|
DBUG_RETURN(0);
|
|
}
|
|
LINT_INIT(findpos);
|
|
find=0;
|
|
for (pos=0 ; (j=typelib->type_names[pos]) ; pos++)
|
|
{
|
|
for (i=x ;
|
|
*i && (!(full_name & 8) || *i != field_separator) &&
|
|
my_toupper(&my_charset_latin1,*i) ==
|
|
my_toupper(&my_charset_latin1,*j) ; i++, j++) ;
|
|
if (! *j)
|
|
{
|
|
while (*i == ' ')
|
|
i++; /* skip_end_space */
|
|
if (! *i || ((full_name & 8) && *i == field_separator))
|
|
DBUG_RETURN(pos+1);
|
|
}
|
|
if ((!*i && (!(full_name & 8) || *i != field_separator)) &&
|
|
(!*j || !(full_name & 1)))
|
|
{
|
|
find++;
|
|
findpos=pos;
|
|
}
|
|
}
|
|
if (find == 0 && (full_name & 4) && x[0] == '#' && strend(x)[-1] == '#' &&
|
|
(findpos=atoi(x+1)-1) >= 0 && (uint) findpos < typelib->count)
|
|
find=1;
|
|
else if (find == 0 || ! x[0])
|
|
{
|
|
DBUG_PRINT("exit",("Couldn't find type"));
|
|
DBUG_RETURN(0);
|
|
}
|
|
else if (find != 1 || (full_name & 1))
|
|
{
|
|
DBUG_PRINT("exit",("Too many possybilities"));
|
|
DBUG_RETURN(-1);
|
|
}
|
|
if (!(full_name & 2))
|
|
(void) strmov(x,typelib->type_names[findpos]);
|
|
DBUG_RETURN(findpos+1);
|
|
} /* find_type */
|
|
|
|
|
|
/* Get name of type nr 'nr' */
|
|
/* Warning first type is 1, 0 = empty field */
|
|
|
|
void make_type(register char * to, register uint nr,
|
|
register TYPELIB *typelib)
|
|
{
|
|
DBUG_ENTER("make_type");
|
|
if (!nr)
|
|
to[0]=0;
|
|
else
|
|
(void) strmov(to,get_type(typelib,nr-1));
|
|
DBUG_VOID_RETURN;
|
|
} /* make_type */
|
|
|
|
|
|
/* Get type */
|
|
/* Warning first type is 0 */
|
|
|
|
const char *get_type(TYPELIB *typelib, uint nr)
|
|
{
|
|
if (nr < (uint) typelib->count && typelib->type_names)
|
|
return(typelib->type_names[nr]);
|
|
return "?";
|
|
}
|
|
|
|
|
|
/*
|
|
Create an integer value to represent the supplied comma-seperated
|
|
string where each string in the TYPELIB denotes a bit position.
|
|
|
|
SYNOPSIS
|
|
find_typeset()
|
|
x string to decompose
|
|
lib TYPELIB (struct of pointer to values + count)
|
|
err index (not char position) of string element which was not
|
|
found or 0 if there was no error
|
|
|
|
RETURN
|
|
a integer representation of the supplied string
|
|
*/
|
|
|
|
my_ulonglong find_typeset(char *x, TYPELIB *lib, int *err)
|
|
{
|
|
my_ulonglong result;
|
|
int find;
|
|
char *i;
|
|
DBUG_ENTER("find_set");
|
|
DBUG_PRINT("enter",("x: '%s' lib: 0x%lx", x, (long) lib));
|
|
|
|
if (!lib->count)
|
|
{
|
|
DBUG_PRINT("exit",("no count"));
|
|
DBUG_RETURN(0);
|
|
}
|
|
result= 0;
|
|
*err= 0;
|
|
while (*x)
|
|
{
|
|
(*err)++;
|
|
i= x;
|
|
while (*x && *x != field_separator) x++;
|
|
if ((find= find_type(i, lib, 2 | 8) - 1) < 0)
|
|
DBUG_RETURN(0);
|
|
result|= (ULL(1) << find);
|
|
}
|
|
*err= 0;
|
|
DBUG_RETURN(result);
|
|
} /* find_set */
|
|
|
|
|
|
/*
|
|
Create a copy of a specified TYPELIB structure.
|
|
|
|
SYNOPSIS
|
|
copy_typelib()
|
|
root pointer to a MEM_ROOT object for allocations
|
|
from pointer to a source TYPELIB structure
|
|
|
|
RETURN
|
|
pointer to the new TYPELIB structure on successful copy, or
|
|
NULL otherwise
|
|
*/
|
|
|
|
TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from)
|
|
{
|
|
TYPELIB *to;
|
|
uint i;
|
|
|
|
if (!from)
|
|
return NULL;
|
|
|
|
if (!(to= (TYPELIB*) alloc_root(root, sizeof(TYPELIB))))
|
|
return NULL;
|
|
|
|
if (!(to->type_names= (const char **)
|
|
alloc_root(root, (sizeof(char *) + sizeof(int)) * (from->count + 1))))
|
|
return NULL;
|
|
to->type_lengths= (unsigned int *)(to->type_names + from->count + 1);
|
|
to->count= from->count;
|
|
if (from->name)
|
|
{
|
|
if (!(to->name= strdup_root(root, from->name)))
|
|
return NULL;
|
|
}
|
|
else
|
|
to->name= NULL;
|
|
|
|
for (i= 0; i < from->count; i++)
|
|
{
|
|
if (!(to->type_names[i]= strmake_root(root, from->type_names[i],
|
|
from->type_lengths[i])))
|
|
return NULL;
|
|
to->type_lengths[i]= from->type_lengths[i];
|
|
}
|
|
to->type_names[to->count]= NULL;
|
|
to->type_lengths[to->count]= 0;
|
|
|
|
return to;
|
|
}
|