refresh

diff --git a/meta b/meta
index 4f0d69dba7afe6e72d6786805e16d2f6c384657d..57f31ae0c16b03100add38d3f799f4f48b89359f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: ee34711dbf9559cee69ea679c6643b885f9e4fd1
-Head: fa973e2622b63c33a36a529cf2a39632728a1793
+Previous: a6222ce9a41c1c5548b94770c883e3f5b66c2906
+Head: 85351ae17b237162385cef7c3bc28af253a5f81c
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 0744fbe2b19f7924faf0dce72349307cc445577e
   rstream-fork: edf0409ab2138bdaf8283fa19ef0d2560c723478
-  dbg: 9a9aeb5954821434af3ace09e041bc06f8d7b1af
-  refresh-temp: fa973e2622b63c33a36a529cf2a39632728a1793
+  dbg: 85351ae17b237162385cef7c3bc28af253a5f81c
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index abb44c52c75dc1e3efb11ab8fbd0e899a750030c..0f73884b6b11443a2db909374d9f0041932c61af 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: 1f4485c0b98410aa12e6f2832d81210b64ac5c0f
-Top:    51cdc21140cba2d70c2ae10355c2ed5354963fe1
+Top:    25795c71de349a280df948e9098a56a50c76435e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -104,3 +104,44 @@ index f824af3..e429ad6 100644
 +      printf("fork - raccept %d %s\n", dfd, strerror(errno));
        if (dfd < 0)
                goto lclose;
+ 
+diff --git a/src/rsocket.c b/src/rsocket.c
+index ed125b3..003b7d8 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -602,16 +602,19 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+       struct rs_conn_data *creq, cresp;
+       int ret;
+ 
++      printf("raccept %d\n", socket);
+       rs = idm_at(&idm, socket);
+       new_rs = rs_alloc(rs);
+       if (!new_rs)
+               return ERR(ENOMEM);
+ 
+       ret = rdma_get_request(rs->cm_id, &new_rs->cm_id);
++      printf("raccept get request %d\n", ret);
+       if (ret)
+               goto err;
+ 
+       ret = rs_insert(new_rs);
++      printf("raccept insert %d\n", ret);
+       if (ret < 0)
+               goto err;
+ 
+@@ -625,6 +628,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+               rs_set_nonblocking(new_rs, O_NONBLOCK);
+ 
+       ret = rs_create_ep(new_rs);
++      printf("raccept create ep %d\n", ret);
+       if (ret)
+               goto err;
+ 
+@@ -632,6 +636,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);
++      printf("raccept rdma accept %d\n", ret);
+       if (!ret)
+               new_rs->state = rs_connect_rdwr;
+       else if (errno == EAGAIN || errno == EWOULDBLOCK)

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6663bde..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,49 +0,0 @@
-Bottom: 51cdc21140cba2d70c2ae10355c2ed5354963fe1
-Top:    25795c71de349a280df948e9098a56a50c76435e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 14:01:52 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index ed125b3..003b7d8 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -602,16 +602,19 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-       struct rs_conn_data *creq, cresp;
-       int ret;
- 
-+      printf("raccept %d\n", socket);
-       rs = idm_at(&idm, socket);
-       new_rs = rs_alloc(rs);
-       if (!new_rs)
-               return ERR(ENOMEM);
- 
-       ret = rdma_get_request(rs->cm_id, &new_rs->cm_id);
-+      printf("raccept get request %d\n", ret);
-       if (ret)
-               goto err;
- 
-       ret = rs_insert(new_rs);
-+      printf("raccept insert %d\n", ret);
-       if (ret < 0)
-               goto err;
- 
-@@ -625,6 +628,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-               rs_set_nonblocking(new_rs, O_NONBLOCK);
- 
-       ret = rs_create_ep(new_rs);
-+      printf("raccept create ep %d\n", ret);
-       if (ret)
-               goto err;
- 
-@@ -632,6 +636,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);
-+      printf("raccept rdma accept %d\n", ret);
-       if (!ret)
-               new_rs->state = rs_connect_rdwr;
-       else if (errno == EAGAIN || errno == EWOULDBLOCK)