diff options
author | Ken Lierman <ken.lierman@windriver.com> | 2013-06-20 09:27:13 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2014-05-19 16:16:42 -0700 |
commit | aecc6a6657746afc9b95a960eedad10484bf14ac (patch) | |
tree | 892ed6eb7017161b3d6e81d53c4dc4edbd07d7e4 /libcutils | |
parent | f03bd9537b77f996cddd562d88558151d3d6c7fd (diff) | |
download | system_core-aecc6a6657746afc9b95a960eedad10484bf14ac.zip system_core-aecc6a6657746afc9b95a960eedad10484bf14ac.tar.gz system_core-aecc6a6657746afc9b95a960eedad10484bf14ac.tar.bz2 |
Bound the ADB connect time with a non-blocking connect
After a disconnect, the initial blocking connect takes
a long time to return, while subsequent calls return
quicks. Switch to a non-blocking connect to make the
re-connect time more consistent and faster overall.
Change-Id: I21d02b22a8eb9a457c2f1fa95eb17894d5612ccd
Signed-off-by: Ken Lierman <ken.lierman@windriver.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Diffstat (limited to 'libcutils')
-rw-r--r-- | libcutils/socket_network_client.c | 77 |
1 files changed, 72 insertions, 5 deletions
diff --git a/libcutils/socket_network_client.c b/libcutils/socket_network_client.c index c52013d..4862949 100644 --- a/libcutils/socket_network_client.c +++ b/libcutils/socket_network_client.c @@ -15,6 +15,7 @@ */ #include <errno.h> +#include <fcntl.h> #include <stddef.h> #include <stdlib.h> #include <string.h> @@ -36,27 +37,93 @@ */ int socket_network_client(const char *host, int port, int type) { + return socket_network_client_timeout(host, port, type, 0); +} + +/* Connect to port on the IP interface. type is SOCK_STREAM or SOCK_DGRAM. + * timeout in seconds return is a file descriptor or -1 on error + */ +int socket_network_client_timeout(const char *host, int port, int type, int timeout) +{ struct hostent *hp; struct sockaddr_in addr; + socklen_t alen; int s; + int flags = 0, error = 0, ret = 0; + fd_set rset, wset; + socklen_t len = sizeof(error); + struct timeval ts; + + ts.tv_sec = timeout; + ts.tv_usec = 0; hp = gethostbyname(host); - if(hp == 0) return -1; - + if (hp == 0) return -1; + memset(&addr, 0, sizeof(addr)); addr.sin_family = hp->h_addrtype; addr.sin_port = htons(port); memcpy(&addr.sin_addr, hp->h_addr, hp->h_length); s = socket(hp->h_addrtype, type, 0); - if(s < 0) return -1; + if (s < 0) return -1; - if(connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + if ((flags = fcntl(s, F_GETFL, 0)) < 0) { close(s); return -1; } - return s; + if (fcntl(s, F_SETFL, flags | O_NONBLOCK) < 0) { + close(s); + return -1; + } + + if ((ret = connect(s, (struct sockaddr *) &addr, sizeof(addr))) < 0) { + if (errno != EINPROGRESS) { + close(s); + return -1; + } + } + + if (ret == 0) + goto done; + + FD_ZERO(&rset); + FD_SET(s, &rset); + wset = rset; + + if ((ret = select(s + 1, &rset, &wset, NULL, (timeout) ? &ts : NULL)) < 0) { + close(s); + return -1; + } + if (ret == 0) { // we had a timeout + errno = ETIMEDOUT; + close(s); + return -1; + } + if (FD_ISSET(s, &rset) || FD_ISSET(s, &wset)) { + if (getsockopt(s, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { + close(s); + return -1; + } + } else { + close(s); + return -1; + } + + if (error) { // check if we had a socket error + errno = error; + close(s); + return -1; + } + +done: + if (fcntl(s, F_SETFL, flags) < 0) { + close(s); + return -1; + } + + return s; } |