refresh

diff --git a/meta b/meta
index 82273cba04bd666f4324793a63a52f35fd1625dc..8d0a2fbdd59077b3a7bf28f3243583f31c2ad18e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 0e8e9eece5f49b42941d65c94f682b1bdd92ce17
-Head: 6145fff4b6c6383fd150d166577d8bb99863b6b3
+Previous: e4058ab722793e0af056856d189da851736b9a29
+Head: 671f4a60e5306f13fc58310d05efa3b10c88586c
 Applied:
   cmtime-bind: 2a2e561da8ea810b7f0ea4c2e077a649f25c7997
-  cmtime-to: 9ff7c4ee711e97b928530af70af84a26ce56343f
-  refresh-temp: 6145fff4b6c6383fd150d166577d8bb99863b6b3
+  cmtime-to: 671f4a60e5306f13fc58310d05efa3b10c88586c
 Unapplied:
   shutdown: 358b798ae3566d0803f8e0fcdea9805ad24cb2fe
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3

diff --git a/patches/cmtime-to b/patches/cmtime-to
index e2bbec6753c0c4a669e406719db3b85571f2db7a..609cbd3edc0781d528da68453c5f6f6b9f1277e0 100644 (file)
--- a/patches/cmtime-to
+++ b/patches/cmtime-to
@@ -1,5 +1,5 @@
 Bottom: 3773213b5371853cc561f76a6c125ee7961adf4b
-Top:    3773213b5371853cc561f76a6c125ee7961adf4b
+Top:    c8131841c4408d2abb5c97e5b8b2c21c82f21c38
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-08-22 11:54:56 -0700
 
@@ -10,4 +10,59 @@ cmtime: Allow user to specify timeout values
 
 ---
 
-
+diff --git a/examples/cmtime.c b/examples/cmtime.c
+index fb6bb19..7342666 100644
+--- a/examples/cmtime.c
++++ b/examples/cmtime.c
+@@ -51,6 +51,7 @@ static struct rdma_event_channel *channel;
+ static char *port = "7471";
+ static char *dst_addr;
+ static char *src_addr;
++static int timeout = 2000;
+ 
+ enum step {
+       STEP_CREATE_ID,
+@@ -374,7 +375,7 @@ static int run_client(void)
+       for (i = 0; i < connections; i++) {
+               start_perf(&nodes[i], STEP_RESOLVE_ADDR);
+               ret = rdma_resolve_addr(nodes[i].id, rai->ai_src_addr,
+-                                      rai->ai_dst_addr, 2000);
++                                      rai->ai_dst_addr, timeout);
+               if (ret) {
+                       perror("failure getting addr");
+                       nodes[i].error = 1;
+@@ -393,7 +394,7 @@ static int run_client(void)
+               if (nodes[i].error)
+                       continue;
+               start_perf(&nodes[i], STEP_RESOLVE_ROUTE);
+-              ret = rdma_resolve_route(nodes[i].id, 2000);
++              ret = rdma_resolve_route(nodes[i].id, timeout);
+               if (ret) {
+                       perror("failure resolving route");
+                       nodes[i].error = 1;
+@@ -464,7 +465,7 @@ int main(int argc, char **argv)
+ 
+       hints.ai_port_space = RDMA_PS_TCP;
+       hints.ai_qp_type = IBV_QPT_RC;
+-      while ((op = getopt(argc, argv, "s:b:c:p:")) != -1) {
++      while ((op = getopt(argc, argv, "s:b:c:p:t:")) != -1) {
+               switch (op) {
+               case 's':
+                       dst_addr = optarg;
+@@ -478,12 +479,16 @@ int main(int argc, char **argv)
+               case 'p':
+                       port = optarg;
+                       break;
++              case 't':
++                      timeout = atoi(optarg);
++                      break;
+               default:
+                       printf("usage: %s\n", argv[0]);
+                       printf("\t[-s server_address]\n");
+                       printf("\t[-b bind_address]\n");
+                       printf("\t[-c connections]\n");
+                       printf("\t[-p port_number]\n");
++                      printf("\t[-t timeout_ms]\n");
+                       exit(1);
+               }
+       }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 23be19b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,65 +0,0 @@
-Bottom: 3773213b5371853cc561f76a6c125ee7961adf4b
-Top:    c8131841c4408d2abb5c97e5b8b2c21c82f21c38
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-08-22 11:56:27 -0700
-
-Refresh of cmtime-to
-
----
-
-diff --git a/examples/cmtime.c b/examples/cmtime.c
-index fb6bb19..7342666 100644
---- a/examples/cmtime.c
-+++ b/examples/cmtime.c
-@@ -51,6 +51,7 @@ static struct rdma_event_channel *channel;
- static char *port = "7471";
- static char *dst_addr;
- static char *src_addr;
-+static int timeout = 2000;
- 
- enum step {
-       STEP_CREATE_ID,
-@@ -374,7 +375,7 @@ static int run_client(void)
-       for (i = 0; i < connections; i++) {
-               start_perf(&nodes[i], STEP_RESOLVE_ADDR);
-               ret = rdma_resolve_addr(nodes[i].id, rai->ai_src_addr,
--                                      rai->ai_dst_addr, 2000);
-+                                      rai->ai_dst_addr, timeout);
-               if (ret) {
-                       perror("failure getting addr");
-                       nodes[i].error = 1;
-@@ -393,7 +394,7 @@ static int run_client(void)
-               if (nodes[i].error)
-                       continue;
-               start_perf(&nodes[i], STEP_RESOLVE_ROUTE);
--              ret = rdma_resolve_route(nodes[i].id, 2000);
-+              ret = rdma_resolve_route(nodes[i].id, timeout);
-               if (ret) {
-                       perror("failure resolving route");
-                       nodes[i].error = 1;
-@@ -464,7 +465,7 @@ int main(int argc, char **argv)
- 
-       hints.ai_port_space = RDMA_PS_TCP;
-       hints.ai_qp_type = IBV_QPT_RC;
--      while ((op = getopt(argc, argv, "s:b:c:p:")) != -1) {
-+      while ((op = getopt(argc, argv, "s:b:c:p:t:")) != -1) {
-               switch (op) {
-               case 's':
-                       dst_addr = optarg;
-@@ -478,12 +479,16 @@ int main(int argc, char **argv)
-               case 'p':
-                       port = optarg;
-                       break;
-+              case 't':
-+                      timeout = atoi(optarg);
-+                      break;
-               default:
-                       printf("usage: %s\n", argv[0]);
-                       printf("\t[-s server_address]\n");
-                       printf("\t[-b bind_address]\n");
-                       printf("\t[-c connections]\n");
-                       printf("\t[-p port_number]\n");
-+                      printf("\t[-t timeout_ms]\n");
-                       exit(1);
-               }
-       }