refresh (create temporary patch)

diff --git a/meta b/meta
index 10eca7cf9bf8536b9347ec17a39489d91d3d51f7..d1dbf5337fbd6e6db6b00b0da223910e64375b31 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: e5d7bd00da7ae673ccdf970e390f3fb616f887da
-Head: f092c856a9dc46646acd9f08a5947cf5d38ca8fd
+Previous: 0c2b59e249d82f6676a0bcdc2881f83e9077fb4a
+Head: 4bceae69aa3bc545d6a81d018538b48ae9503bc4
 Applied:
   rst-afib: 34148679ac24e294b1157d24f240b09e8aa7603a
   ex-afib: f137c61b3e9db128e1614c429c1e382de4448146
   rs-setroute: cecbb3b118fdd309aabb35d7225daa43bf3f4c6e
   stpath: f092c856a9dc46646acd9f08a5947cf5d38ca8fd
+  refresh-temp: 4bceae69aa3bc545d6a81d018538b48ae9503bc4
 Unapplied:
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..03d10d7
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,142 @@
+Bottom: aa3ea0f3e957a822d0f39c4029849fb50a756099
+Top:    b7f354c046af03e9939c2a4211520177128b5fdc
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-08-02 13:44:23 -0700
+
+Refresh of stpath
+
+---
+
+diff --git a/examples/rstream.c b/examples/rstream.c
+index af99062..d82fac4 100644
+--- a/examples/rstream.c
++++ b/examples/rstream.c
+@@ -75,7 +75,7 @@ static struct test_size_param test_size[] = {
+ 
+ static int rs, lrs;
+ static int use_async;
+-static int use_getaddrinfo = 1;
++static int use_rgai;
+ static int verify;
+ static int flags = MSG_DONTWAIT;
+ static int poll_timeout = 0;
+@@ -292,19 +292,19 @@ static int server_listen(void)
+       struct addrinfo *ai;
+       int val, ret;
+ 
+-      if (rai_hints.ai_flags) {
+-              rai_hints.ai_flags |= RAI_PASSIVE;
+-              ret = rdma_getaddrinfo(src_addr, port, &rai_hints, &rai);
+-      } else {
++      if (use_getaddrinfo) {
+               ai_hints.ai_flags |= AI_PASSIVE;
+               ret = getaddrinfo(src_addr, port, &ai_hints, &ai);
++      } else {
++              rai_hints.ai_flags |= RAI_PASSIVE;
++              ret = rdma_getaddrinfo(src_addr, port, &rai_hints, &rai);
+       }
+       if (ret) {
+               perror("getaddrinfo");
+               return ret;
+       }
+ 
+-      lrs = rai_hints.ai_flags ?
++      lrs = rai->ai_family ?
+             rs_socket(rai->ai_family, SOCK_STREAM, 0) :
+             rs_socket(ai->ai_family, SOCK_STREAM, 0);
+       if (lrs < 0) {
+@@ -377,23 +377,22 @@ static int server_connect(void)
+ 
+ static int client_connect(void)
+ {
+-      struct rdma_addrinfo *rai;
++      struct rdma_addrinfo *rai = NULL;
+       struct addrinfo *ai;
+       struct pollfd fds;
+       int ret, err;
+       socklen_t len;
+ 
+-      ret = use_getaddrinfo ?
+-            getaddrinfo(dst_addr, port, &ai_hints, &ai) :
+-            rdma_getaddrinfo(dst_addr, port, &rai_hints, &rai);
++      ret = use_rgai ? rdma_getaddrinfo(dst_addr, port, &rai_hints, &rai) :
++                       getaddrinfo(dst_addr, port, &ai_hints, &ai);
++
+       if (ret) {
+               perror("getaddrinfo");
+               return ret;
+       }
+ 
+-      rs = rai->ai_family ?
+-           rs_socket(rai->ai_family, SOCK_STREAM, 0) :
+-           rs_socket(ai->ai_family, SOCK_STREAM, 0);
++      rs = rai ? rs_socket(rai->ai_family, SOCK_STREAM, 0) :
++                 rs_socket(ai->ai_family, SOCK_STREAM, 0);
+       if (rs < 0) {
+               perror("rsocket");
+               ret = rs;
+@@ -403,18 +402,17 @@ static int client_connect(void)
+       set_options(rs);
+       /* TODO: bind client to src_addr */
+ 
+-      if (rai_hints.ai_route) {
+-              ret = rs_setsockopt(rs, SOL_RDMA, RDMA_ROUTE, rai_hints.ai_route,
+-                                  rai_hints.ai_route_len);
++      if (rai && rai->ai_route) {
++              ret = rs_setsockopt(rs, SOL_RDMA, RDMA_ROUTE, rai->ai_route,
++                                  rai->ai_route_len);
+               if (ret) {
+                       perror("rsetsockopt RDMA_ROUTE");
+                       goto close;
+               }
+       }
+ 
+-      ret = rai->ai_dst_addr ?
+-            rs_connect(rs, rai->ai_dst_addr, rai->ai_dst_len) :
+-            rs_connect(rs, ai->ai_addr, ai->ai_addrlen);
++      ret = rai ? rs_connect(rs, rai->ai_dst_addr, rai->ai_dst_len) :
++                  rs_connect(rs, ai->ai_addr, ai->ai_addrlen);
+       if (ret && (errno != EINPROGRESS)) {
+               perror("rconnect");
+               goto close;
+@@ -442,10 +440,10 @@ close:
+       if (ret)
+               rs_close(rs);
+ free:
+-      if (use_getaddrinfo)
+-              freeaddrinfo(ai);
+-      else
++      if (rai)
+               rdma_freeaddrinfo(rai);
++      else
++              freeaddrinfo(ai);
+       return ret;
+ }
+ 
+@@ -538,7 +536,7 @@ static int set_test_opt(char *optarg)
+                       flags |= MSG_DONTWAIT;
+                       break;
+               case 'r':
+-                      use_getaddrinfo = 0;
++                      use_rgai = 1;
+                       break;
+               case 'v':
+                       verify = 1;
+@@ -556,7 +554,7 @@ static int set_test_opt(char *optarg)
+               } else if (!strncasecmp("nonblock", optarg, 8)) {
+                       flags |= MSG_DONTWAIT;
+               } else if (strncasecmp("resolve", optarg, 7)) {
+-                      use_getaddrinfo = 0;
++                      use_rgai = 1;
+               } else if (!strncasecmp("verify", optarg, 6)) {
+                       verify = 1;
+               } else if (!strncasecmp("fork", optarg, 4)) {
+@@ -589,7 +587,7 @@ int main(int argc, char **argv)
+                       } else if (!strncasecmp("gid", optarg, 3)) {
+                               rai_hints.ai_flags = RAI_NUMERICHOST | RAI_FAMILY;
+                               rai_hints.ai_family = AF_IB;
+-                              use_getaddrinfo = 0;
++                              use_rgai = 1;
+                       }
+                       break;
+               case 'B':