github-migration/mysql2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

retry connect if interrupted by signals

Browse Source 
The MySQL client libraries normally retry system calls when
interrupted by signals.  The lone exception I've found is in the
(infrequent) connection setup where it'll propagate the
connect(2) syscall error all the way back up to the caller.
Fortunately inspection of the MySQL client library reveals it
properly preserves the global "errno" variable even with
debugging enabled.

Note that the net.last_errno member does NOT correspond to the
system "errno".
This commit is contained in:
Eric Wong 2010-08-19 14:16:02 -07:00 committed by Brian Lopez
parent 8bfbfa2708
commit 8e81dcb053
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/mysql2/client.c
View File

@ -1,5 +1,6 @@
#include <mysql2_ext.h> #include <mysql2_ext.h>
#include <client.h> #include <client.h>
#include <errno.h>
VALUE cMysql2Client; VALUE cMysql2Client;
extern VALUE mMysql2, cMysql2Error; extern VALUE mMysql2, cMysql2Error;
@ -96,10 +97,12 @@ static VALUE nogvl_connect(void *ptr) {
struct nogvl_connect_args *args = ptr; struct nogvl_connect_args *args = ptr;
MYSQL *client; MYSQL *client;
client = mysql_real_connect(args->mysql, args->host, do {
args->user, args->passwd, client = mysql_real_connect(args->mysql, args->host,
args->db, args->port, args->unix_socket, args->user, args->passwd,
args->client_flag); args->db, args->port, args->unix_socket,
args->client_flag);
} while (! client && errno == EINTR && (errno = 0) == 0);
return client ? Qtrue : Qfalse; return client ? Qtrue : Qfalse;
} }