refresh

diff --git a/meta b/meta
index 94b90fbed3057667db17aa86c13dfd63f3031c76..01c2a8febda00d0d65625ceaca9ee64a0ebbf2fa 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: b1427d2d70bb253c02a58d6e496677d1c72aa49e
-Head: b92a1bb8a984bdea72fa518eeb1672e75d2b5b8e
+Previous: 47e6ce6f61e69c170d4ea6a92454c7b4cf16ef1e
+Head: 6326a5d82c986cfe962896624a9e051e66669fbd
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
   rs-qpsize: 950e3a6667196c14d0f9457d56e53e02d715581b
-  dbg: 879a80783e2d63c67fe4224b1fba83f6bfdbd791
-  refresh-temp: b92a1bb8a984bdea72fa518eeb1672e75d2b5b8e
+  dbg: 6326a5d82c986cfe962896624a9e051e66669fbd
 Unapplied:
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
   rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7

diff --git a/patches/dbg b/patches/dbg
index 124085170f18f3d7ebe37feeb75484daa058b438..dd58bbfefef1085a6674530de69be09bd77bb581 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: e59c7d297d75ab32441e4182b0c9e524692ce2c2
-Top:    e59c7d297d75ab32441e4182b0c9e524692ce2c2
+Top:    4c27f2fafdbf639907561a0f2e280180a695a880
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-21 16:56:51 -0700
 
@@ -9,4 +9,63 @@ debug
 
 ---
 
-
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 388cf90..0195866 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -578,6 +578,7 @@ static int rs_do_connect(struct rsocket *rs)
+       case rs_init:
+       case rs_bound:
+ resolve_addr:
++printf("rs_do_connect - resolve addr\n");
+               to = 1000 << rs->retries++;
+               ret = rdma_resolve_addr(rs->cm_id, NULL,
+                                       &rs->cm_id->route.addr.dst_addr, to);
+@@ -587,6 +588,7 @@ resolve_addr:
+                       rs->state = rs_resolving_addr;
+               break;
+       case rs_resolving_addr:
++printf("rs_do_connect - complete resolve addr\n");
+               ret = ucma_complete(rs->cm_id);
+               if (ret) {
+                       if (errno == ETIMEDOUT && rs->retries <= RS_CONN_RETRIES)
+@@ -597,6 +599,7 @@ resolve_addr:
+               rs->retries = 0;
+ resolve_route:
+               to = 1000 << rs->retries++;
++printf("rs_do_connect - resolve route\n");
+               ret = rdma_resolve_route(rs->cm_id, to);
+               if (!ret)
+                       goto do_connect;
+@@ -604,6 +607,7 @@ resolve_route:
+                       rs->state = rs_resolving_route;
+               break;
+       case rs_resolving_route:
++printf("rs_do_connect - complete resolve route\n");
+               ret = ucma_complete(rs->cm_id);
+               if (ret) {
+                       if (errno == ETIMEDOUT && rs->retries <= RS_CONN_RETRIES)
+@@ -611,6 +615,7 @@ resolve_route:
+                       break;
+               }
+ do_connect:
++printf("rs_do_connect - create ep\n");
+               ret = rs_create_ep(rs);
+               if (ret)
+                       break;
+@@ -622,6 +627,7 @@ do_connect:
+               param.rnr_retry_count = 7;
+               rs->retries = 0;
+ 
++printf("rs_do_connect - connect\n");
+               ret = rdma_connect(rs->cm_id, &param);
+               if (!ret)
+                       goto connected;
+@@ -629,6 +635,7 @@ do_connect:
+                       rs->state = rs_connecting;
+               break;
+       case rs_connecting:
++printf("rs_do_connect - complete connect\n");
+               ret = ucma_complete(rs->cm_id);
+               if (ret)
+                       break;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c36aa0a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,69 +0,0 @@
-Bottom: e59c7d297d75ab32441e4182b0c9e524692ce2c2
-Top:    4c27f2fafdbf639907561a0f2e280180a695a880
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-21 17:00:06 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 388cf90..0195866 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -578,6 +578,7 @@ static int rs_do_connect(struct rsocket *rs)
-       case rs_init:
-       case rs_bound:
- resolve_addr:
-+printf("rs_do_connect - resolve addr\n");
-               to = 1000 << rs->retries++;
-               ret = rdma_resolve_addr(rs->cm_id, NULL,
-                                       &rs->cm_id->route.addr.dst_addr, to);
-@@ -587,6 +588,7 @@ resolve_addr:
-                       rs->state = rs_resolving_addr;
-               break;
-       case rs_resolving_addr:
-+printf("rs_do_connect - complete resolve addr\n");
-               ret = ucma_complete(rs->cm_id);
-               if (ret) {
-                       if (errno == ETIMEDOUT && rs->retries <= RS_CONN_RETRIES)
-@@ -597,6 +599,7 @@ resolve_addr:
-               rs->retries = 0;
- resolve_route:
-               to = 1000 << rs->retries++;
-+printf("rs_do_connect - resolve route\n");
-               ret = rdma_resolve_route(rs->cm_id, to);
-               if (!ret)
-                       goto do_connect;
-@@ -604,6 +607,7 @@ resolve_route:
-                       rs->state = rs_resolving_route;
-               break;
-       case rs_resolving_route:
-+printf("rs_do_connect - complete resolve route\n");
-               ret = ucma_complete(rs->cm_id);
-               if (ret) {
-                       if (errno == ETIMEDOUT && rs->retries <= RS_CONN_RETRIES)
-@@ -611,6 +615,7 @@ resolve_route:
-                       break;
-               }
- do_connect:
-+printf("rs_do_connect - create ep\n");
-               ret = rs_create_ep(rs);
-               if (ret)
-                       break;
-@@ -622,6 +627,7 @@ do_connect:
-               param.rnr_retry_count = 7;
-               rs->retries = 0;
- 
-+printf("rs_do_connect - connect\n");
-               ret = rdma_connect(rs->cm_id, &param);
-               if (!ret)
-                       goto connected;
-@@ -629,6 +635,7 @@ do_connect:
-                       rs->state = rs_connecting;
-               break;
-       case rs_connecting:
-+printf("rs_do_connect - complete connect\n");
-               ret = ucma_complete(rs->cm_id);
-               if (ret)
-                       break;