mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
52c84d144d
After the merge of VIO stuff from MySQL 5.6, there were some bugs left in the non-blocking client library: - vio_io_wait() was introduced without any support for non-blocking operation, so async queries could turn into sync. - Timeouts were changed to milliseconds, but this was not reflected in the non-blocking API, also semantics was changed so signed -1 was used for "no timeout" rather than unsigned 0. Fix by implementing and using my_io_wait_async() in the non-blocking case. And by introducing a new mysql_get_timeout_value_ms() API function that provides the timeout with millisecond granularity. The old mysql_get_timeout_value() is kept and fixed to work correctly, converting the timeout to whole seconds.
38 lines
1.8 KiB
C
38 lines
1.8 KiB
C
/* Copyright (C) 2012 MariaDB Services and Kristian Nielsen
|
|
|
|
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 */
|
|
|
|
/* Common definitions for MariaDB non-blocking client library. */
|
|
|
|
#ifndef MYSQL_ASYNC_H
|
|
#define MYSQL_ASYNC_H
|
|
|
|
extern int my_connect_async(struct mysql_async_context *b, my_socket fd,
|
|
const struct sockaddr *name, uint namelen,
|
|
int vio_timeout);
|
|
extern ssize_t my_recv_async(struct mysql_async_context *b, int fd,
|
|
unsigned char *buf, size_t size, int timeout);
|
|
extern ssize_t my_send_async(struct mysql_async_context *b, int fd,
|
|
const unsigned char *buf, size_t size,
|
|
int timeout);
|
|
extern my_bool my_io_wait_async(struct mysql_async_context *b,
|
|
enum enum_vio_io_event event, int timeout);
|
|
#ifdef HAVE_OPENSSL
|
|
extern int my_ssl_read_async(struct mysql_async_context *b, SSL *ssl,
|
|
void *buf, int size);
|
|
extern int my_ssl_write_async(struct mysql_async_context *b, SSL *ssl,
|
|
const void *buf, int size);
|
|
#endif
|
|
|
|
#endif /* MYSQL_ASYNC_H */
|