mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
09a53f28a7
Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() BUILD/compile-solaris-sparc-forte: Updated script to current Solaris installations Now we compile by default for 64 bits client/mysql.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysql_upgrade.c: Fixed compiler warning (on Forte) client/mysqladmin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysqlcheck.c: Fixed compiler warning (on Forte) client/mysqldump.c: Fixed compiler warning (on Forte) client/mysqlslap.c: Fixed compiler warning (on Forte) client/mysqltest.c: Fixed compiler warning (on Forte) client/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ configure.in: Added detection of mtmalloc and ieeefp.h extra/replace.c: Fixed compiler warning (on Forte) include/m_ctype.h: Added some typedef's to make it easy to use C function pointers in C++ include/my_sys.h: Added my_file_total_opened (counter for calls to my_open()) include/myisam.h: Fixed compiler warning (on Forte) libmysql/libmysql.c: Fixed compiler warning (on Forte) by adding casts and change types libmysql/manager.c: Fixed compiler warning (on Forte) by adding casts and change types mysql-test/r/ctype_cp932_binlog_stm.result: Updated positions (Needed because we didn't before correctly restore collation_database after running stored procedure mysys/my_fopen.c: Count number of opened files mysys/my_open.c: Count number of opened files mysys/my_static.c: Count number of opened files mysys/thr_alarm.c: Optimization to do less alarm() and pthread_sigmask() calls. Idea is to remember time for next pending alarm and not reschedule a new alarm if it's after the current one. Before we only did this if there was other pending alarms. We don't have to use pthread_sigmask() in case of 'USE_ONE_SIGNAL_HAND' as the alarm() signal will be blocked for the calling thread anyway and no other thread will have the alarm() signal enabled to call process_alarm() regex/regcomp.c: Fixed compiler warning (on Forte) by adding casts and change types scripts/mysql_install_db.sh: Added option --source-install to allow one to create a mysql database from the source tree without installing MySQL Don't give (unnecessary) warnings server-tools/instance-manager/angel.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) server-tools/instance-manager/thread_registry.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/event_db_repository.cc: index_read() -> index_read_map() sql/event_queue.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/field.cc: Fixed compiler warnings about hidden fields sql/ha_partition.cc: Fixed compiler warnings about hidden fields index_read() -> index_read_map() sql/ha_partition.h: index_read() -> index_read_map() sql/handler.cc: Added PAGE option to row types (to prepare for future) index_read() -> index_read_map() sql/handler.h: Added ROW_TYPE_PAGE (for future) Added flag to signal if table was to be created transactionally I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() sql/item.cc: Fixed indentation Renamed local variable to avoid hiding class variable sql/item_cmpfunc.cc: Renamed local variable to avoid hiding class variable sql/item_cmpfunc.h: Removed not used variable sql/item_func.cc: Renamed local variable to avoid hiding class variable sql/item_strfunc.cc: Moved functions from Item_strfunc.cc sql/item_strfunc.h: Move functions to item_strfunc.cc Use C function pointer type to avoid compiler warnings (with Forte) sql/item_subselect.cc: index_read() -> index_read_map() sql/item_xmlfunc.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/key.cc: Fixed indentation sql/log.cc: Renamed local variable to avoid hiding class variable sql/log_event.cc: Removed call to my_time() when creating class instance of Log_event() as this may have static instances. (One can't call my_time() before my_init()) index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/log_event_old.cc: Renamed local variable to avoid hiding class variable sql/mysql_priv.h: Made all create_backup_ctx() declarations identical. This lifted up a bug where wrong create_backup_ctx() was called in some cases. Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/mysqld.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Fixed indentation Don't call end_thr_alarm() when calling unireg_abort() as unireg_abort() already calls end_thr_alarm() Added variable 'Opened_files' (number of calls to my_open() or my_fopen()) Don't print 'loose' warnings when using --bootstrap (to avoid warnings when running mysql_install_db) Fixed compiler warnings sql/opt_range.cc: index_read() -> index_read_map() sql/opt_sum.cc: index_read() -> index_read_map() sql/partition_info.cc: Renamed local variable to avoid hiding class variable sql/rpl_filter.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/set_var.cc: Renamed local variable to avoid hiding class variable Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/set_var.h: Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/sp.cc: More debugging index_read() -> index_read_map() sql/sp_cache.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sp_head.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Moved 'saved_creation_ctx' higher up to be able to free objects allocated by create_backup_ctx() sql/sql_acl.cc: index_read() -> index_read_map() sql/sql_class.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_class.h: Renamed local variable to avoid hiding class variable sql/sql_db.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_delete.cc: Renamed local variable to avoid hiding class variable sql/sql_handler.cc: index_read() -> index_read_map() sql/sql_help.cc: index_read() -> index_read_map() sql/sql_insert.cc: index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/sql_lex.cc: Renamed local variable to avoid hiding class variable sql/sql_plugin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) index_read() -> index_read_map() Don't give warnings about not used plugins if we are using --warnings=0 sql/sql_select.cc: index_read() -> index_read_map() sql-common/client.c: Fixed compiler warning (on Forte) sql-common/my_time.c: Removed never accessed code Fixed compiler warning (on Forte) sql/sql_servers.cc: index_read() -> index_read_map() sql/sql_show.cc: Added TRANSACTIONAL to SHOW CREATE Fixed ROW_TYPE_PAGE sql/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ sql/sql_table.cc: Set create_info->transactional if we used TRANSACTIONAL=1 sql/sql_udf.cc: index_read() -> index_read_map() sql/sql_yacc.yy: Added TRANSACTIONAL=0|1 to CREATE (for future) Added row type PAGE (was only partionally handled before) sql/strfunc.cc: Avoid compiler warnings when using C function pointers in C++ sql/table.cc: More DBUG statements Declare all create_backup_ctx() functions identically Remember if table was created with TRANSACTIONAL flag or not (future safe) Renamed local variable to avoid hiding class variable sql/table.h: Remember if table was created with TRANSACTIONAL=1 sql/tztime.cc: index_read() -> index_read_map() sql-common/pack.c: Fixed compiler warning (on Forte) storage/archive/archive_reader.c: Fixed compiler warning (on Forte) storage/archive/azio.c: Fixed compiler warning (on Forte) storage/blackhole/ha_blackhole.cc: index_read() -> index_read_map() storage/blackhole/ha_blackhole.h: index_read() -> index_read_map() storage/csv/ha_tina.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) storage/example/ha_example.cc: index_read() -> index_read_map() storage/example/ha_example.h: index_read() -> index_read_map() storage/heap/ha_heap.cc: index_read() -> index_read_map() storage/heap/ha_heap.h: index_read() -> index_read_map() storage/heap/hp_test1.c: Fixed compiler warning (on Forte) storage/heap/hp_test2.c: Fixed compiler warning (on Forte) storage/myisam/ft_boolean_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_nlq_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_parser.c: Fixed compiler warning (on Forte) storage/myisam/ft_stopwords.c: Fixed compiler warning (on Forte) storage/myisam/ha_myisam.cc: index_read() -> index_read_map() storage/myisam/ha_myisam.h: index_read() -> index_read_map() storage/myisam/mi_check.c: Fixed compiler warning (on Forte) storage/myisam/mi_delete.c: Fixed compiler warning (on Forte) storage/myisam/mi_dynrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_extra.c: Fixed compiler warning (on Forte) storage/myisam/mi_key.c: Fixed compiler warning (on Forte) storage/myisam/mi_keycache.c: Fixed compiler warning (on Forte) storage/myisam/mi_locking.c: Fixed compiler warning (on Forte) storage/myisam/mi_log.c: Fixed compiler warning (on Forte) storage/myisam/mi_open.c: Fixed compiler warning (on Forte) storage/myisam/mi_packrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_page.c: Fixed compiler warning (on Forte) storage/myisam/mi_rkey.c: Added comment storage/myisam/mi_search.c: Fixed compiler warning (on Forte) storage/myisam/mi_statrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_test1.c: Fixed compiler warning (on Forte) storage/myisam/mi_test2.c: Fixed compiler warning (on Forte) storage/myisam/mi_test3.c: Fixed compiler warning (on Forte) storage/myisam/mi_update.c: Fixed compiler warning (on Forte) storage/myisam/mi_write.c: Fixed compiler warning (on Forte) storage/myisam/myisamdef.h: Fixed that file_read/file_write returns type size_t Changed some functions to use uchar * as argument/return value instead of char* This fixed some compiler warnings on Forte storage/myisam/myisamlog.c: Fixed compiler warning (on Forte) storage/myisam/myisampack.c: Fixed compiler warning (on Forte) storage/myisam/rt_test.c: Fixed compiler warning (on Forte) storage/myisam/sort.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisam/sp_test.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisammrg/ha_myisammrg.cc: index_read() -> index_read_map() storage/myisammrg/ha_myisammrg.h: index_read() -> index_read_map() storage/myisammrg/myrg_create.c: Fixed compiler warning (on Forte) by adding casts or changing variable types storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Tdummy -> align (as in other part of cluster code) storage/ndb/src/kernel/vm/DynArr256.cpp: Removed not used variable storage/ndb/src/ndbapi/Ndb.cpp: Removed not used variable strings/strtod.c: Include ieeefp.h to avoid compiler warning tests/bug25714.c: Fixed compiler warning tests/mysql_client_test.c: Remove not used variable Fixed indentation Removed never reached code Fixed compiler warning (on Forte) by adding casts or changing variable types vio/viosocket.c: Fixed compiler warning (on Forte) by adding casts or changing variable types
639 lines
15 KiB
C
639 lines
15 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 */
|
|
|
|
/*
|
|
Note that we can't have assertion on file descriptors; The reason for
|
|
this is that during mysql shutdown, another thread can close a file
|
|
we are working on. In this case we should just return read errors from
|
|
the file descriptior.
|
|
*/
|
|
|
|
#include "vio_priv.h"
|
|
|
|
int vio_errno(Vio *vio __attribute__((unused)))
|
|
{
|
|
return socket_errno; /* On Win32 this mapped to WSAGetLastError() */
|
|
}
|
|
|
|
|
|
size_t vio_read(Vio * vio, uchar* buf, size_t size)
|
|
{
|
|
size_t r;
|
|
DBUG_ENTER("vio_read");
|
|
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, (long) buf,
|
|
(uint) size));
|
|
|
|
/* Ensure nobody uses vio_read_buff and vio_read simultaneously */
|
|
DBUG_ASSERT(vio->read_end == vio->read_pos);
|
|
#ifdef __WIN__
|
|
r = recv(vio->sd, buf, size,0);
|
|
#else
|
|
errno=0; /* For linux */
|
|
r = read(vio->sd, buf, size);
|
|
#endif /* __WIN__ */
|
|
#ifndef DBUG_OFF
|
|
if (r == (size_t) -1)
|
|
{
|
|
DBUG_PRINT("vio_error", ("Got error %d during read",errno));
|
|
}
|
|
#endif /* DBUG_OFF */
|
|
DBUG_PRINT("exit", ("%ld", (long) r));
|
|
DBUG_RETURN(r);
|
|
}
|
|
|
|
|
|
/*
|
|
Buffered read: if average read size is small it may
|
|
reduce number of syscalls.
|
|
*/
|
|
|
|
size_t vio_read_buff(Vio *vio, uchar* buf, size_t size)
|
|
{
|
|
size_t rc;
|
|
#define VIO_UNBUFFERED_READ_MIN_SIZE 2048
|
|
DBUG_ENTER("vio_read_buff");
|
|
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, (long) buf,
|
|
(uint) size));
|
|
|
|
if (vio->read_pos < vio->read_end)
|
|
{
|
|
rc= min((size_t) (vio->read_end - vio->read_pos), size);
|
|
memcpy(buf, vio->read_pos, rc);
|
|
vio->read_pos+= rc;
|
|
/*
|
|
Do not try to read from the socket now even if rc < size:
|
|
vio_read can return -1 due to an error or non-blocking mode, and
|
|
the safest way to handle it is to move to a separate branch.
|
|
*/
|
|
}
|
|
else if (size < VIO_UNBUFFERED_READ_MIN_SIZE)
|
|
{
|
|
rc= vio_read(vio, (uchar*) vio->read_buffer, VIO_READ_BUFFER_SIZE);
|
|
if (rc != 0 && rc != (size_t) -1)
|
|
{
|
|
if (rc > size)
|
|
{
|
|
vio->read_pos= vio->read_buffer + size;
|
|
vio->read_end= vio->read_buffer + rc;
|
|
rc= size;
|
|
}
|
|
memcpy(buf, vio->read_buffer, rc);
|
|
}
|
|
}
|
|
else
|
|
rc= vio_read(vio, buf, size);
|
|
DBUG_RETURN(rc);
|
|
#undef VIO_UNBUFFERED_READ_MIN_SIZE
|
|
}
|
|
|
|
|
|
size_t vio_write(Vio * vio, const uchar* buf, size_t size)
|
|
{
|
|
size_t r;
|
|
DBUG_ENTER("vio_write");
|
|
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, (long) buf,
|
|
(uint) size));
|
|
#ifdef __WIN__
|
|
r = send(vio->sd, buf, size,0);
|
|
#else
|
|
r = write(vio->sd, buf, size);
|
|
#endif /* __WIN__ */
|
|
#ifndef DBUG_OFF
|
|
if (r == (size_t) -1)
|
|
{
|
|
DBUG_PRINT("vio_error", ("Got error on write: %d",socket_errno));
|
|
}
|
|
#endif /* DBUG_OFF */
|
|
DBUG_PRINT("exit", ("%u", (uint) r));
|
|
DBUG_RETURN(r);
|
|
}
|
|
|
|
int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode,
|
|
my_bool *old_mode)
|
|
{
|
|
int r=0;
|
|
DBUG_ENTER("vio_blocking");
|
|
|
|
*old_mode= test(!(vio->fcntl_mode & O_NONBLOCK));
|
|
DBUG_PRINT("enter", ("set_blocking_mode: %d old_mode: %d",
|
|
(int) set_blocking_mode, (int) *old_mode));
|
|
|
|
#if !defined(__WIN__)
|
|
#if !defined(NO_FCNTL_NONBLOCK)
|
|
if (vio->sd >= 0)
|
|
{
|
|
int old_fcntl=vio->fcntl_mode;
|
|
if (set_blocking_mode)
|
|
vio->fcntl_mode &= ~O_NONBLOCK; /* clear bit */
|
|
else
|
|
vio->fcntl_mode |= O_NONBLOCK; /* set bit */
|
|
if (old_fcntl != vio->fcntl_mode)
|
|
{
|
|
r= fcntl(vio->sd, F_SETFL, vio->fcntl_mode);
|
|
if (r == -1)
|
|
{
|
|
DBUG_PRINT("info", ("fcntl failed, errno %d", errno));
|
|
vio->fcntl_mode= old_fcntl;
|
|
}
|
|
}
|
|
}
|
|
#else
|
|
r= set_blocking_mode ? 0 : 1;
|
|
#endif /* !defined(NO_FCNTL_NONBLOCK) */
|
|
#else /* !defined(__WIN__) */
|
|
if (vio->type != VIO_TYPE_NAMEDPIPE && vio->type != VIO_TYPE_SHARED_MEMORY)
|
|
{
|
|
ulong arg;
|
|
int old_fcntl=vio->fcntl_mode;
|
|
if (set_blocking_mode)
|
|
{
|
|
arg = 0;
|
|
vio->fcntl_mode &= ~O_NONBLOCK; /* clear bit */
|
|
}
|
|
else
|
|
{
|
|
arg = 1;
|
|
vio->fcntl_mode |= O_NONBLOCK; /* set bit */
|
|
}
|
|
if (old_fcntl != vio->fcntl_mode)
|
|
r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg);
|
|
}
|
|
else
|
|
r= test(!(vio->fcntl_mode & O_NONBLOCK)) != set_blocking_mode;
|
|
#endif /* !defined(__WIN__) */
|
|
DBUG_PRINT("exit", ("%d", r));
|
|
DBUG_RETURN(r);
|
|
}
|
|
|
|
my_bool
|
|
vio_is_blocking(Vio * vio)
|
|
{
|
|
my_bool r;
|
|
DBUG_ENTER("vio_is_blocking");
|
|
r = !(vio->fcntl_mode & O_NONBLOCK);
|
|
DBUG_PRINT("exit", ("%d", (int) r));
|
|
DBUG_RETURN(r);
|
|
}
|
|
|
|
|
|
int vio_fastsend(Vio * vio __attribute__((unused)))
|
|
{
|
|
int r=0;
|
|
DBUG_ENTER("vio_fastsend");
|
|
|
|
#if defined(IPTOS_THROUGHPUT)
|
|
{
|
|
int tos = IPTOS_THROUGHPUT;
|
|
r= setsockopt(vio->sd, IPPROTO_IP, IP_TOS, (void *) &tos, sizeof(tos));
|
|
}
|
|
#endif /* IPTOS_THROUGHPUT */
|
|
if (!r)
|
|
{
|
|
#ifdef __WIN__
|
|
BOOL nodelay= 1;
|
|
#else
|
|
int nodelay = 1;
|
|
#endif
|
|
|
|
r= setsockopt(vio->sd, IPPROTO_TCP, TCP_NODELAY,
|
|
IF_WIN(const char*, void*) &nodelay,
|
|
sizeof(nodelay));
|
|
|
|
}
|
|
if (r)
|
|
{
|
|
DBUG_PRINT("warning", ("Couldn't set socket option for fast send"));
|
|
r= -1;
|
|
}
|
|
DBUG_PRINT("exit", ("%d", r));
|
|
DBUG_RETURN(r);
|
|
}
|
|
|
|
int vio_keepalive(Vio* vio, my_bool set_keep_alive)
|
|
{
|
|
int r=0;
|
|
uint opt = 0;
|
|
DBUG_ENTER("vio_keepalive");
|
|
DBUG_PRINT("enter", ("sd: %d set_keep_alive: %d", vio->sd, (int)
|
|
set_keep_alive));
|
|
if (vio->type != VIO_TYPE_NAMEDPIPE)
|
|
{
|
|
if (set_keep_alive)
|
|
opt = 1;
|
|
r = setsockopt(vio->sd, SOL_SOCKET, SO_KEEPALIVE, (char *) &opt,
|
|
sizeof(opt));
|
|
}
|
|
DBUG_RETURN(r);
|
|
}
|
|
|
|
|
|
my_bool
|
|
vio_should_retry(Vio * vio __attribute__((unused)))
|
|
{
|
|
int en = socket_errno;
|
|
return (en == SOCKET_EAGAIN || en == SOCKET_EINTR ||
|
|
en == SOCKET_EWOULDBLOCK);
|
|
}
|
|
|
|
|
|
my_bool
|
|
vio_was_interrupted(Vio *vio __attribute__((unused)))
|
|
{
|
|
int en= socket_errno;
|
|
return (en == SOCKET_EAGAIN || en == SOCKET_EINTR ||
|
|
en == SOCKET_EWOULDBLOCK || en == SOCKET_ETIMEDOUT);
|
|
}
|
|
|
|
|
|
int vio_close(Vio * vio)
|
|
{
|
|
int r=0;
|
|
DBUG_ENTER("vio_close");
|
|
#ifdef __WIN__
|
|
if (vio->type == VIO_TYPE_NAMEDPIPE)
|
|
{
|
|
#if defined(__NT__) && defined(MYSQL_SERVER)
|
|
CancelIo(vio->hPipe);
|
|
DisconnectNamedPipe(vio->hPipe);
|
|
#endif
|
|
r=CloseHandle(vio->hPipe);
|
|
}
|
|
else
|
|
#endif /* __WIN__ */
|
|
if (vio->type != VIO_CLOSED)
|
|
{
|
|
DBUG_ASSERT(vio->sd >= 0);
|
|
if (shutdown(vio->sd, SHUT_RDWR))
|
|
r= -1;
|
|
if (closesocket(vio->sd))
|
|
r= -1;
|
|
}
|
|
if (r)
|
|
{
|
|
DBUG_PRINT("vio_error", ("close() failed, error: %d",socket_errno));
|
|
/* FIXME: error handling (not critical for MySQL) */
|
|
}
|
|
vio->type= VIO_CLOSED;
|
|
vio->sd= -1;
|
|
DBUG_RETURN(r);
|
|
}
|
|
|
|
|
|
const char *vio_description(Vio * vio)
|
|
{
|
|
return vio->desc;
|
|
}
|
|
|
|
enum enum_vio_type vio_type(Vio* vio)
|
|
{
|
|
return vio->type;
|
|
}
|
|
|
|
my_socket vio_fd(Vio* vio)
|
|
{
|
|
return vio->sd;
|
|
}
|
|
|
|
|
|
my_bool vio_peer_addr(Vio * vio, char *buf, uint16 *port)
|
|
{
|
|
DBUG_ENTER("vio_peer_addr");
|
|
DBUG_PRINT("enter", ("sd: %d", vio->sd));
|
|
if (vio->localhost)
|
|
{
|
|
strmov(buf,"127.0.0.1");
|
|
*port= 0;
|
|
}
|
|
else
|
|
{
|
|
size_socket addrLen = sizeof(vio->remote);
|
|
if (getpeername(vio->sd, (struct sockaddr *) (&vio->remote),
|
|
&addrLen) != 0)
|
|
{
|
|
DBUG_PRINT("exit", ("getpeername gave error: %d", socket_errno));
|
|
DBUG_RETURN(1);
|
|
}
|
|
my_inet_ntoa(vio->remote.sin_addr,buf);
|
|
*port= ntohs(vio->remote.sin_port);
|
|
}
|
|
DBUG_PRINT("exit", ("addr: %s", buf));
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Get in_addr for a TCP/IP connection
|
|
|
|
SYNOPSIS
|
|
vio_in_addr()
|
|
vio vio handle
|
|
in put in_addr here
|
|
|
|
NOTES
|
|
one must call vio_peer_addr() before calling this one
|
|
*/
|
|
|
|
void vio_in_addr(Vio *vio, struct in_addr *in)
|
|
{
|
|
DBUG_ENTER("vio_in_addr");
|
|
if (vio->localhost)
|
|
bzero((char*) in, sizeof(*in));
|
|
else
|
|
*in=vio->remote.sin_addr;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/* Return 0 if there is data to be read */
|
|
|
|
my_bool vio_poll_read(Vio *vio,uint timeout)
|
|
{
|
|
#ifndef HAVE_POLL
|
|
return 0;
|
|
#else
|
|
struct pollfd fds;
|
|
int res;
|
|
DBUG_ENTER("vio_poll");
|
|
fds.fd=vio->sd;
|
|
fds.events=POLLIN;
|
|
fds.revents=0;
|
|
if ((res=poll(&fds,1,(int) timeout*1000)) <= 0)
|
|
{
|
|
DBUG_RETURN(res < 0 ? 0 : 1); /* Don't return 1 on errors */
|
|
}
|
|
DBUG_RETURN(fds.revents & POLLIN ? 0 : 1);
|
|
#endif
|
|
}
|
|
|
|
|
|
void vio_timeout(Vio *vio, uint which, uint timeout)
|
|
{
|
|
#if defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO)
|
|
int r;
|
|
DBUG_ENTER("vio_timeout");
|
|
|
|
{
|
|
#ifdef __WIN__
|
|
/* Windows expects time in milliseconds as int */
|
|
int wait_timeout= (int) timeout * 1000;
|
|
#else
|
|
/* POSIX specifies time as struct timeval. */
|
|
struct timeval wait_timeout;
|
|
wait_timeout.tv_sec= timeout;
|
|
wait_timeout.tv_usec= 0;
|
|
#endif
|
|
|
|
r= setsockopt(vio->sd, SOL_SOCKET, which ? SO_SNDTIMEO : SO_RCVTIMEO,
|
|
IF_WIN(const char*, const void*)&wait_timeout,
|
|
sizeof(wait_timeout));
|
|
|
|
}
|
|
|
|
#ifndef DBUG_OFF
|
|
if (r != 0)
|
|
DBUG_PRINT("error", ("setsockopt failed: %d, errno: %d", r, socket_errno));
|
|
#endif
|
|
|
|
DBUG_VOID_RETURN;
|
|
#else
|
|
/*
|
|
Platforms not suporting setting of socket timeout should either use
|
|
thr_alarm or just run without read/write timeout(s)
|
|
*/
|
|
#endif
|
|
}
|
|
|
|
|
|
#ifdef __WIN__
|
|
size_t vio_read_pipe(Vio * vio, uchar* buf, size_t size)
|
|
{
|
|
DWORD length;
|
|
DBUG_ENTER("vio_read_pipe");
|
|
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, (long) buf,
|
|
(uint) size));
|
|
|
|
if (!ReadFile(vio->hPipe, buf, size, &length, NULL))
|
|
DBUG_RETURN(-1);
|
|
|
|
DBUG_PRINT("exit", ("%d", length));
|
|
DBUG_RETURN((size_t) length);
|
|
}
|
|
|
|
|
|
size_t vio_write_pipe(Vio * vio, const uchar* buf, size_t size)
|
|
{
|
|
DWORD length;
|
|
DBUG_ENTER("vio_write_pipe");
|
|
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, (long) buf,
|
|
(uint) size));
|
|
|
|
if (!WriteFile(vio->hPipe, (char*) buf, size, &length, NULL))
|
|
DBUG_RETURN(-1);
|
|
|
|
DBUG_PRINT("exit", ("%d", length));
|
|
DBUG_RETURN((size_t) length);
|
|
}
|
|
|
|
int vio_close_pipe(Vio * vio)
|
|
{
|
|
int r;
|
|
DBUG_ENTER("vio_close_pipe");
|
|
#if defined(__NT__) && defined(MYSQL_SERVER)
|
|
CancelIo(vio->hPipe);
|
|
DisconnectNamedPipe(vio->hPipe);
|
|
#endif
|
|
r=CloseHandle(vio->hPipe);
|
|
if (r)
|
|
{
|
|
DBUG_PRINT("vio_error", ("close() failed, error: %d",GetLastError()));
|
|
/* FIXME: error handling (not critical for MySQL) */
|
|
}
|
|
vio->type= VIO_CLOSED;
|
|
vio->sd= -1;
|
|
DBUG_RETURN(r);
|
|
}
|
|
|
|
|
|
void vio_ignore_timeout(Vio *vio __attribute__((unused)),
|
|
uint which __attribute__((unused)),
|
|
uint timeout __attribute__((unused)))
|
|
{
|
|
}
|
|
|
|
|
|
#ifdef HAVE_SMEM
|
|
|
|
size_t vio_read_shared_memory(Vio * vio, uchar* buf, size_t size)
|
|
{
|
|
size_t length;
|
|
size_t remain_local;
|
|
char *current_postion;
|
|
DBUG_ENTER("vio_read_shared_memory");
|
|
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %d", vio->sd, (long) buf,
|
|
size));
|
|
|
|
remain_local = size;
|
|
current_postion=buf;
|
|
do
|
|
{
|
|
if (vio->shared_memory_remain == 0)
|
|
{
|
|
HANDLE events[2];
|
|
events[0]= vio->event_server_wrote;
|
|
events[1]= vio->event_conn_closed;
|
|
/*
|
|
WaitForMultipleObjects can return next values:
|
|
WAIT_OBJECT_0+0 - event from vio->event_server_wrote
|
|
WAIT_OBJECT_0+1 - event from vio->event_conn_closed. We can't read
|
|
anything
|
|
WAIT_ABANDONED_0 and WAIT_TIMEOUT - fail. We can't read anything
|
|
*/
|
|
if (WaitForMultipleObjects(2, (HANDLE*)&events,FALSE,
|
|
vio->net->read_timeout*1000) != WAIT_OBJECT_0)
|
|
{
|
|
DBUG_RETURN(-1);
|
|
};
|
|
|
|
vio->shared_memory_pos = vio->handle_map;
|
|
vio->shared_memory_remain = uint4korr((ulong*)vio->shared_memory_pos);
|
|
vio->shared_memory_pos+=4;
|
|
}
|
|
|
|
length = size;
|
|
|
|
if (vio->shared_memory_remain < length)
|
|
length = vio->shared_memory_remain;
|
|
if (length > remain_local)
|
|
length = remain_local;
|
|
|
|
memcpy(current_postion,vio->shared_memory_pos,length);
|
|
|
|
vio->shared_memory_remain-=length;
|
|
vio->shared_memory_pos+=length;
|
|
current_postion+=length;
|
|
remain_local-=length;
|
|
|
|
if (!vio->shared_memory_remain)
|
|
{
|
|
if (!SetEvent(vio->event_client_read))
|
|
DBUG_RETURN(-1);
|
|
}
|
|
} while (remain_local);
|
|
length = size;
|
|
|
|
DBUG_PRINT("exit", ("%lu", (ulong) length));
|
|
DBUG_RETURN(length);
|
|
}
|
|
|
|
|
|
size_t vio_write_shared_memory(Vio * vio, const uchar* buf, size_t size)
|
|
{
|
|
size_t length, remain, sz;
|
|
HANDLE pos;
|
|
const uchar *current_postion;
|
|
DBUG_ENTER("vio_write_shared_memory");
|
|
DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %d", vio->sd, (long) buf,
|
|
size));
|
|
|
|
remain = size;
|
|
current_postion = buf;
|
|
while (remain != 0)
|
|
{
|
|
if (WaitForSingleObject(vio->event_server_read,
|
|
vio->net->write_timeout*1000) !=
|
|
WAIT_OBJECT_0)
|
|
{
|
|
DBUG_RETURN((size_t) -1);
|
|
}
|
|
|
|
sz= (remain > shared_memory_buffer_length ? shared_memory_buffer_length :
|
|
remain);
|
|
|
|
int4store(vio->handle_map,sz);
|
|
pos = vio->handle_map + 4;
|
|
memcpy(pos,current_postion,sz);
|
|
remain-=sz;
|
|
current_postion+=sz;
|
|
if (!SetEvent(vio->event_client_wrote))
|
|
DBUG_RETURN((size_t) -1);
|
|
}
|
|
length = size;
|
|
|
|
DBUG_PRINT("exit", ("%lu", (ulong) length));
|
|
DBUG_RETURN(length);
|
|
}
|
|
|
|
|
|
/**
|
|
Close shared memory and DBUG_PRINT any errors that happen on closing.
|
|
@return Zero if all closing functions succeed, and nonzero otherwise.
|
|
*/
|
|
int vio_close_shared_memory(Vio * vio)
|
|
{
|
|
int error_count= 0;
|
|
DBUG_ENTER("vio_close_shared_memory");
|
|
if (vio->type != VIO_CLOSED)
|
|
{
|
|
/*
|
|
Set event_conn_closed for notification of both client and server that
|
|
connection is closed
|
|
*/
|
|
SetEvent(vio->event_conn_closed);
|
|
/*
|
|
Close all handlers. UnmapViewOfFile and CloseHandle return non-zero
|
|
result if they are success.
|
|
*/
|
|
if (UnmapViewOfFile(vio->handle_map) == 0)
|
|
{
|
|
error_count++;
|
|
DBUG_PRINT("vio_error", ("UnmapViewOfFile() failed"));
|
|
}
|
|
if (CloseHandle(vio->event_server_wrote) == 0)
|
|
{
|
|
error_count++;
|
|
DBUG_PRINT("vio_error", ("CloseHandle(vio->esw) failed"));
|
|
}
|
|
if (CloseHandle(vio->event_server_read) == 0)
|
|
{
|
|
error_count++;
|
|
DBUG_PRINT("vio_error", ("CloseHandle(vio->esr) failed"));
|
|
}
|
|
if (CloseHandle(vio->event_client_wrote) == 0)
|
|
{
|
|
error_count++;
|
|
DBUG_PRINT("vio_error", ("CloseHandle(vio->ecw) failed"));
|
|
}
|
|
if (CloseHandle(vio->event_client_read) == 0)
|
|
{
|
|
error_count++;
|
|
DBUG_PRINT("vio_error", ("CloseHandle(vio->ecr) failed"));
|
|
}
|
|
if (CloseHandle(vio->handle_file_map) == 0)
|
|
{
|
|
error_count++;
|
|
DBUG_PRINT("vio_error", ("CloseHandle(vio->hfm) failed"));
|
|
}
|
|
if (CloseHandle(vio->event_conn_closed) == 0)
|
|
{
|
|
error_count++;
|
|
DBUG_PRINT("vio_error", ("CloseHandle(vio->ecc) failed"));
|
|
}
|
|
}
|
|
vio->type= VIO_CLOSED;
|
|
vio->sd= -1;
|
|
DBUG_RETURN(error_count);
|
|
}
|
|
#endif /* HAVE_SMEM */
|
|
#endif /* __WIN__ */
|