refresh (create temporary patch)

diff --git a/meta b/meta
index d2575b96e45abdb6faf9b76fc0534cff7ad6382a..00589830e12de63802900df94f5404fcd629ec78 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 7f904f71daceadb3d2444d48b5a7929788dfe677
-Head: 890472e62de313a18e4386f72793ffe94a4b9ae2
+Previous: e6f4f236f5e181a1e6f30e3af933f263494022b6
+Head: 874d77a8d965f5bbabd1665c2903273a721a84a9
 Applied:
   rs-iomap: d8a287dba3737e23dbebb8f72fc1de97413e5370
   riostream: 890472e62de313a18e4386f72793ffe94a4b9ae2
+  refresh-temp: 874d77a8d965f5bbabd1665c2903273a721a84a9
 Unapplied:
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..9ab6dab
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,76 @@
+Bottom: f670071efe52d65e6a223b0f4d819af48505465e
+Top:    dfeed2f52eb6f65a9782c15a2e73c0464df3b887
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-10-24 15:25:51 -0700
+
+Refresh of riostream
+
+---
+
+diff --git a/examples/riostream.c b/examples/riostream.c
+index 35f7eaa..cc7d888 100644
+--- a/examples/riostream.c
++++ b/examples/riostream.c
+@@ -359,7 +359,7 @@ static int run_test(void)
+                       if (ret)
+                               goto out;
+ 
+-                      ret = recv_xfer(transfer_size, marker++)
++                      ret = recv_xfer(transfer_size, marker++);
+               } else {
+                       ret = recv_xfer(transfer_size, marker++);
+                       if (ret)
+@@ -401,7 +401,7 @@ static void set_options(int rs)
+ 
+       val = 1;
+       rsetsockopt(rs, IPPROTO_TCP, TCP_NODELAY, (void *) &val, sizeof(val));
+-      rsetsockopt(rs, SOL_RDMA, RDMA_IOMAP, (void *) &val, sizeof val);
++      rsetsockopt(rs, SOL_RDMA, RDMA_IOMAPSIZE, (void *) &val, sizeof val);
+ 
+       if (flags & MSG_DONTWAIT)
+               rfcntl(rs, F_SETFL, O_NONBLOCK);
+@@ -539,7 +539,7 @@ static int client_connect(void)
+ 
+ close:
+       if (ret)
+-              rs_close(rs);
++              rclose(rs);
+ free:
+       freeaddrinfo(res);
+       return ret;
+@@ -575,14 +575,8 @@ static int run(void)
+                       init_latency_test(test_size[i].size);
+                       run_test();
+               }
+-              if (fork_pid)
+-                      wait(NULL);
+-              else
+-                      rs_shutdown(rs, SHUT_RDWR);
+-              rs_close(rs);
+-
+-              if (!dst_addr && use_fork && !fork_pid)
+-                      goto free;
++              rshutdown(rs, SHUT_RDWR);
++              rclose(rs);
+ 
+               optimization = opt_bandwidth;
+               ret = dst_addr ? client_connect() : server_connect();
+@@ -599,15 +593,11 @@ static int run(void)
+               if (ret)
+                       goto free;
+ 
+-              if (!fork_pid)
+-                      ret = run_test();
++              ret = run_test();
+       }
+ 
+-      if (fork_pid)
+-              wait(NULL);
+-      else
+-              rs_shutdown(rs, SHUT_RDWR);
+-      rs_close(rs);
++      rshutdown(rs, SHUT_RDWR);
++      rclose(rs);
+ free:
+       free(buf);
+       return ret;