From ea7a06860095d5f8b1408394cbc0dba394867f6a Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 16 Jul 2012 14:20:30 -0700 Subject: [PATCH] Refresh of transpose --- src/preload.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/src/preload.c b/src/preload.c index 8b9fbafd..69597e05 100644 --- a/src/preload.c +++ b/src/preload.c @@ -92,12 +92,10 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER; static int sq_size; static int rq_size; static int sq_inline; -static int fork_support; enum fd_type { fd_normal, - fd_rsocket, - fd_fork + fd_rsocket }; struct fd_info { @@ -209,10 +207,6 @@ void getenv_options(void) var = getenv("RS_INLINE"); if (var) sq_inline = atoi(var); - - var = getenv("RDMAV_FORK_SAFE"); - if (var) - fork_support = atoi(var); } static void init_preload(void) @@ -400,16 +394,8 @@ int socket(int domain, int type, int protocol) ret = rsocket(domain, type, protocol); recursive = 0; if (ret >= 0) { - if (fork_support) { - rclose(ret); - ret = real_socket(domain, type, protocol); - if (ret < 0) - return ret; - fd_store(index, ret, fd_fork); - } else { - fd_store(index, ret, fd_rsocket); - set_rsocket_options(ret); - } + fd_store(index, ret, fd_rsocket); + set_rsocket_options(ret); return index; } fd_close(index, &ret); @@ -464,29 +450,6 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen) } } -static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrlen) -{ - uint32_t msg; - int rs, fd, ret; - - fd = fd_getd(socket); - ret = real_connect(fd, addr, addrlen); - if (!ret) - return ret; - - ret = real_read(fd, &msg, sizeof msg); - if (ret != sizeof msg) - return ret; - - rs = rsocket(domain, type, protocol); - - real_shutdown(fd, SHUT_RDWR); - real_close(fd); - - fd_store(socket, fd, fd_rsocket); - return connect(socket, addr, addrlen); -} - int connect(int socket, const struct sockaddr *addr, socklen_t addrlen) { struct sockaddr_in *sin; -- 2.45.2