refresh

diff --git a/meta b/meta
index 2cc3a201bd435a474e2f4da41648b3ab966f2f3b..55cd6ada900e7d27e7b1a321125e59fb939f23c7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 08348b0c154ab53b8f8d73c84cb32e3505f87f94
-Head: 7f3e56d78f5db45f2983ec29eb57b95a8761b1ba
+Previous: 546904c215356367cb97ded1610f2e7483e8e522
+Head: e6682f3bb964b36c9f5ae12d52d1ff369bf6d0b1
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 0744fbe2b19f7924faf0dce72349307cc445577e
   rstream-fork: edf0409ab2138bdaf8283fa19ef0d2560c723478
-  dbg: 85351ae17b237162385cef7c3bc28af253a5f81c
-  refresh-temp: 7f3e56d78f5db45f2983ec29eb57b95a8761b1ba
+  dbg: e6682f3bb964b36c9f5ae12d52d1ff369bf6d0b1
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index 0f73884b6b11443a2db909374d9f0041932c61af..663fb14cb1628d26dde0913c1fc3245662fe7783 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: 1f4485c0b98410aa12e6f2832d81210b64ac5c0f
-Top:    25795c71de349a280df948e9098a56a50c76435e
+Top:    c096dcff0d5d97207fb65f8ca607b8a29148e67e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -106,10 +106,31 @@ index f824af3..e429ad6 100644
                goto lclose;
  
 diff --git a/src/rsocket.c b/src/rsocket.c
-index ed125b3..003b7d8 100644
+index ed125b3..68361f5 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -602,16 +602,19 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -425,10 +425,12 @@ static int rs_create_ep(struct rsocket *rs)
+ 
+       rs_set_qp_size(rs);
+       ret = rs_init_bufs(rs);
++      printf("rs create ep init bufs %d\n", ret);
+       if (ret)
+               return ret;
+ 
+       ret = rs_create_cq(rs);
++      printf("rs create ep - create cq %d\n", ret);
+       if (ret)
+               return ret;
+ 
+@@ -445,6 +447,7 @@ static int rs_create_ep(struct rsocket *rs)
+       qp_attr.cap.max_inline_data = rs->sq_inline;
+ 
+       ret = rdma_create_qp(rs->cm_id, NULL, &qp_attr);
++      printf("rs create ep - create qp %d\n", ret);
+       if (ret)
+               return ret;
+ 
+@@ -602,16 +605,19 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
        struct rs_conn_data *creq, cresp;
        int ret;
  
@@ -129,7 +150,7 @@ index ed125b3..003b7d8 100644
        if (ret < 0)
                goto err;
  
-@@ -625,6 +628,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -625,6 +631,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
                rs_set_nonblocking(new_rs, O_NONBLOCK);
  
        ret = rs_create_ep(new_rs);
@@ -137,7 +158,7 @@ index ed125b3..003b7d8 100644
        if (ret)
                goto err;
  
-@@ -632,6 +636,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -632,6 +639,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
        param = new_rs->cm_id->event->param.conn;
        rs_set_conn_data(new_rs, &param, &cresp);
        ret = rdma_accept(new_rs->cm_id, &param);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2c8affa..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,33 +0,0 @@
-Bottom: 25795c71de349a280df948e9098a56a50c76435e
-Top:    c096dcff0d5d97207fb65f8ca607b8a29148e67e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 14:05:01 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 003b7d8..68361f5 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -425,10 +425,12 @@ static int rs_create_ep(struct rsocket *rs)
- 
-       rs_set_qp_size(rs);
-       ret = rs_init_bufs(rs);
-+      printf("rs create ep init bufs %d\n", ret);
-       if (ret)
-               return ret;
- 
-       ret = rs_create_cq(rs);
-+      printf("rs create ep - create cq %d\n", ret);
-       if (ret)
-               return ret;
- 
-@@ -445,6 +447,7 @@ static int rs_create_ep(struct rsocket *rs)
-       qp_attr.cap.max_inline_data = rs->sq_inline;
- 
-       ret = rdma_create_qp(rs->cm_id, NULL, &qp_attr);
-+      printf("rs create ep - create qp %d\n", ret);
-       if (ret)
-               return ret;