refresh

diff --git a/meta b/meta
index 4cfd116c404d9588199ddc868d254ea71e59dcb6..c283d5a1d41f671989fe1117bf3c95af0bb7315b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 0a06d930f9b37902d3473aed322a630ff2f9d2bc
-Head: fa019a4fcbe900a521637b3d38a9f270f7da4114
+Previous: a74b8916f3e29ebcf67c0f6d807adaa18ba09fd5
+Head: 3d8313d0bb08a63dc96a9449ccbd175d4ee16052
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 0744fbe2b19f7924faf0dce72349307cc445577e
   rstream-fork: edf0409ab2138bdaf8283fa19ef0d2560c723478
-  dbg: e6682f3bb964b36c9f5ae12d52d1ff369bf6d0b1
-  refresh-temp: fa019a4fcbe900a521637b3d38a9f270f7da4114
+  dbg: 3d8313d0bb08a63dc96a9449ccbd175d4ee16052
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index 663fb14cb1628d26dde0913c1fc3245662fe7783..ee0ef7a2316892dd45c153e0b7a4d34232097618 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: 1f4485c0b98410aa12e6f2832d81210b64ac5c0f
-Top:    c096dcff0d5d97207fb65f8ca607b8a29148e67e
+Top:    9dd8ba614fbbe9d82b591d8736ae29f0d34396a7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -8,6 +8,18 @@ debug fork
 
 ---
 
+diff --git a/examples/rstream.c b/examples/rstream.c
+index 8595657..a699e0a 100644
+--- a/examples/rstream.c
++++ b/examples/rstream.c
+@@ -181,6 +181,7 @@ static void show_perf(void)
+ 
+ static int size_to_count(int size)
+ {
++      return 100;
+       if (size >= 1000000)
+               return 100;
+       else if (size >= 100000)
 diff --git a/src/preload.c b/src/preload.c
 index f824af3..e429ad6 100644
 --- a/src/preload.c
@@ -106,10 +118,20 @@ index f824af3..e429ad6 100644
                goto lclose;
  
 diff --git a/src/rsocket.c b/src/rsocket.c
-index ed125b3..68361f5 100644
+index ed125b3..1d293f7 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -425,10 +425,12 @@ static int rs_create_ep(struct rsocket *rs)
+@@ -361,7 +361,9 @@ static int rs_init_bufs(struct rsocket *rs)
+       if (!rs->sbuf)
+               return -1;
+ 
++      printf("rs init bufs cm_id %p pd %p\n", rs->cm_id, rs->cm_id->pd);
+       rs->smr = rdma_reg_msgs(rs->cm_id, rs->sbuf, rs->sbuf_size);
++      printf("rs init bufs - after reg %p\n", rs->smr);
+       if (!rs->smr)
+               return -1;
+ 
+@@ -425,10 +427,12 @@ static int rs_create_ep(struct rsocket *rs)
  
        rs_set_qp_size(rs);
        ret = rs_init_bufs(rs);
@@ -122,7 +144,7 @@ index ed125b3..68361f5 100644
        if (ret)
                return ret;
  
-@@ -445,6 +447,7 @@ static int rs_create_ep(struct rsocket *rs)
+@@ -445,6 +449,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);
@@ -130,7 +152,7 @@ index ed125b3..68361f5 100644
        if (ret)
                return ret;
  
-@@ -602,16 +605,19 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -602,16 +607,19 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
        struct rs_conn_data *creq, cresp;
        int ret;
  
@@ -150,7 +172,7 @@ index ed125b3..68361f5 100644
        if (ret < 0)
                goto err;
  
-@@ -625,6 +631,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -625,6 +633,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
                rs_set_nonblocking(new_rs, O_NONBLOCK);
  
        ret = rs_create_ep(new_rs);
@@ -158,7 +180,7 @@ index ed125b3..68361f5 100644
        if (ret)
                goto err;
  
-@@ -632,6 +639,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -632,6 +641,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 255355a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,34 +0,0 @@
-Bottom: c096dcff0d5d97207fb65f8ca607b8a29148e67e
-Top:    9dd8ba614fbbe9d82b591d8736ae29f0d34396a7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 14:11:42 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 8595657..a699e0a 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -181,6 +181,7 @@ static void show_perf(void)
- 
- static int size_to_count(int size)
- {
-+      return 100;
-       if (size >= 1000000)
-               return 100;
-       else if (size >= 100000)
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 68361f5..1d293f7 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -361,7 +361,9 @@ static int rs_init_bufs(struct rsocket *rs)
-       if (!rs->sbuf)
-               return -1;
- 
-+      printf("rs init bufs cm_id %p pd %p\n", rs->cm_id, rs->cm_id->pd);
-       rs->smr = rdma_reg_msgs(rs->cm_id, rs->sbuf, rs->sbuf_size);
-+      printf("rs init bufs - after reg %p\n", rs->smr);
-       if (!rs->smr)
-               return -1;