pop (CONFLICT)

diff --git a/meta b/meta
index 647856a80f787a24bbb2e9d3b6cce432c5947a4b..0f75ab3b5da100c70988b685cbb465a87d9875f6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: 07eebb8a51eef06e655ed0df66d597ffdb2a14f7
+Previous: 479bee1848087358f90dff38668e12fa21688c02
 Head: 4ba5e8e895ef314c9af70ddcc52e1849c9a126a1
 Applied:
   cmtime-bind: afd49dcc2bb13052075e07a7593f6593b43606ce
   cmtime-to: b031fead061eb0d2874be8f259c84e21433e4505
+  cmtime-ret: 4ba5e8e895ef314c9af70ddcc52e1849c9a126a1
 Unapplied:
-  cmtime-ret: 7cfd26448bbbaf9120e448297f03fd41a4b20c22
   shutdown: 358b798ae3566d0803f8e0fcdea9805ad24cb2fe
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/cmtime-ret b/patches/cmtime-ret
index 7698429fa245994a72439d33d0cda2bdea0ee048..f991ea5f1338752718135de32d71d1ac52f12860 100644 (file)
--- a/patches/cmtime-ret
+++ b/patches/cmtime-ret
@@ -1,5 +1,5 @@
-Bottom: c8131841c4408d2abb5c97e5b8b2c21c82f21c38
-Top:    402d2d10d9903030f3741ec14be531b1501dc4c4
+Bottom: 4e28c06a2606dd99557b8d56fae4cb73eb704c83
+Top:    4e28c06a2606dd99557b8d56fae4cb73eb704c83
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-08-22 12:00:54 -0700
 
@@ -10,50 +10,4 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/examples/cmtime.c b/examples/cmtime.c
-index 7342666..ea5529e 100644
---- a/examples/cmtime.c
-+++ b/examples/cmtime.c
-@@ -52,6 +52,7 @@ static char *port = "7471";
- static char *dst_addr;
- static char *src_addr;
- static int timeout = 2000;
-+static int retries = 2;
- 
- enum step {
-       STEP_CREATE_ID,
-@@ -80,6 +81,7 @@ struct node {
-       struct rdma_cm_id *id;
-       struct timeval times[STEP_CNT][2];
-       int error;
-+      int retries;
- };
- 
- static struct node *nodes;
-@@ -373,6 +375,7 @@ static int run_client(void)
-       printf("resolving address\n");
-       start_time(STEP_RESOLVE_ADDR);
-       for (i = 0; i < connections; i++) {
-+              nodes[i].retries = retries;
-               start_perf(&nodes[i], STEP_RESOLVE_ADDR);
-               ret = rdma_resolve_addr(nodes[i].id, rai->ai_src_addr,
-                                       rai->ai_dst_addr, timeout);
-@@ -465,7 +468,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:t:")) != -1) {
-+      while ((op = getopt(argc, argv, "s:b:c:p:r:t:")) != -1) {
-               switch (op) {
-               case 's':
-                       dst_addr = optarg;
-@@ -479,6 +482,9 @@ int main(int argc, char **argv)
-               case 'p':
-                       port = optarg;
-                       break;
-+              case 'r':
-+                      retries = atoi(optarg);
-+                      break;
-               case 't':
-                       timeout = atoi(optarg);
-                       break;
+