Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add IOWait callback for blocking IO operations #71

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add IOWait callback for blocking IO operations #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/ma_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ struct st_mysql_options_extension {
char *server_public_key;
char *proxy_header;
size_t proxy_header_len;
int (*io_wait)(my_socket handle, my_bool is_read, int timeout);
};

typedef struct st_connection_handler
Expand Down
3 changes: 2 additions & 1 deletion include/mysql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ extern const char *SQLSTATE_UNKNOWN;
MARIADB_OPT_MULTI_RESULTS,
MARIADB_OPT_MULTI_STATEMENTS,
MARIADB_OPT_INTERACTIVE,
MARIADB_OPT_PROXY_HEADER
MARIADB_OPT_PROXY_HEADER,
MARIADB_OPT_IO_WAIT
};

enum mariadb_value {
Expand Down
6 changes: 6 additions & 0 deletions libmariadb/mariadb_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3015,6 +3015,9 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
case MYSQL_OPT_TLS_VERSION:
OPT_SET_EXTENDED_VALUE_STR(&mysql->options, tls_version, (char *)arg1);
break;
case MARIADB_OPT_IO_WAIT:
mysql->options.extension->io_wait = (int(*)(my_socket, my_bool, int))arg1;
break;
default:
va_end(ap);
return(-1);
Expand Down Expand Up @@ -3229,6 +3232,9 @@ mysql_get_optionv(MYSQL *mysql, enum mysql_option option, void *arg, ...)
case MARIADB_OPT_CONNECTION_HANDLER:
*((char **)arg)= mysql->options.extension ? mysql->options.extension->connection_handler : NULL;
break;
case MARIADB_OPT_IO_WAIT:
*((int(**)(my_socket, my_bool, int))arg) = mysql->options.extension->io_wait;
break;
default:
va_end(ap);
return(-1);
Expand Down
7 changes: 7 additions & 0 deletions plugins/pvio/pvio_npipe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,13 @@ ssize_t pvio_npipe_write(MARIADB_PVIO *pvio, const uchar *buffer, size_t length)

int pvio_npipe_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int timeout)
{
if (pvio->mysql->options.extension->io_wait != NULL) {
HANDLE handle;
if (pvio_npipe_get_handle(pvio, &handle))
return 0;
return pvio->mysql->options.extension->io_wait(handle, is_read, timeout);
}

DWORD status;
int save_error;
struct st_pvio_npipe *cpipe= NULL;
Expand Down
7 changes: 7 additions & 0 deletions plugins/pvio/pvio_socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,13 @@ int pvio_socket_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int time
if (!pvio || !pvio->data)
return 0;

if (pvio->mysql->options.extension->io_wait != NULL) {
my_socket handle;
if (pvio_socket_get_handle(pvio, &handle))
return 0;
return pvio->mysql->options.extension->io_wait(handle, is_read, timeout);
}

csock= (struct st_pvio_socket *)pvio->data;
{
#ifndef _WIN32
Expand Down