refresh (create temporary patch)

diff --git a/meta b/meta
index c8c846a1107e3bbaec77f35dbf919701150735b8..f3412eb905acf685e96cf6eb4eb202fca4ab0230 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 95c2c2477e09cb430e4d83229c6705454731b5f6
-Head: 33ebfdf89e5ba9a69cc9001625155c351c7c7cd5
+Previous: 1bdfd2f8bf977c39e8a950db70dffa81e10e9e2a
+Head: ea7a06860095d5f8b1408394cbc0dba394867f6a
 Applied:
   transpose: 33ebfdf89e5ba9a69cc9001625155c351c7c7cd5
+  refresh-temp: ea7a06860095d5f8b1408394cbc0dba394867f6a
 Unapplied:
   fork: d62b389a7f30187f39e8c6ae709fbdbf8423e7e8
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..9d87c5f
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,87 @@
+Bottom: 8ec84e6e24d58093de94f5921ca22d6e4c566290
+Top:    18cd5fab283e42099140977cad709ad19315ac7a
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-16 14:20:30 -0700
+
+Refresh of transpose
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 8b9fbaf..69597e0 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;