refresh

diff --git a/meta b/meta
index b622373563c6562c72ede9833bf38d5c49a9e451..165bd8cf085cc7537164894bdde984e569697463 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: cca6d4f35ecabfa2b5e9c266e1ee6c4baf75704e
-Head: f5de34ad38adb3ba5542a7d36225adc07dd11dbe
+Previous: 03ace8a92566a37645617dd85dcff6fccb10d69c
+Head: 500e05f8efa98368ffe62652dfe9062315d1dd6f
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -8,8 +8,7 @@ Applied:
   rstream-fork: a1d261650896286989c5197199da7729b3d61fa5
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
-  mpi-finalize: c8484a6e05086afebf91595cff5f0e7625dd2a61
-  refresh-temp: f5de34ad38adb3ba5542a7d36225adc07dd11dbe
+  mpi-finalize: 500e05f8efa98368ffe62652dfe9062315d1dd6f
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/mpi-finalize b/patches/mpi-finalize
index 4d876fd78088f03db3ac0c461a9ef673fc700e10..d7d581c6c86c9f45a526a819d9a6df0305434505 100644 (file)
--- a/patches/mpi-finalize
+++ b/patches/mpi-finalize
@@ -1,5 +1,5 @@
 Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    34a422e20b6864421c4dcbf249875027c9956b02
+Top:    47f8fbb306d277301161e94470a45895de0fbb36
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-26 15:35:32 -0700
 
@@ -28,7 +28,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index ed125b3..c53d5d5 100644
+index ed125b3..3ba0a74 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -132,6 +132,8 @@ union rs_wr_id {
@@ -87,15 +87,7 @@ index ed125b3..c53d5d5 100644
  
                if (ret) {
                        rs->state = rs_error;
-@@ -1708,6 +1723,7 @@ int rshutdown(int socket, int how)
-       int ctrl, ret = 0;
- 
-       rs = idm_at(&idm, socket);
-+      printf("rshutdown %d - %p {\n", socket, rs);
-       if (how == SHUT_RD) {
-               rs_shutdown_state(rs, rs_connect_rd);
-               return 0;
-@@ -1726,7 +1742,9 @@ int rshutdown(int socket, int how)
+@@ -1726,7 +1741,9 @@ int rshutdown(int socket, int how)
                                RS_CTRL_SHUTDOWN : RS_CTRL_DISCONNECT;
                }
                if (!rs_can_send_ctrl(rs)) {
@@ -105,37 +97,3 @@ index ed125b3..c53d5d5 100644
                        if (ret)
                                return ret;
                }
-@@ -1735,14 +1753,21 @@ int rshutdown(int socket, int how)
-               ret = rs_post_write(rs, 0, NULL, 0,
-                                   rs_msg_set(RS_OP_CTRL, ctrl),
-                                   0, 0, 0);
-+              if (ret)
-+                      printf("rs_post_write failed %d %s\n", ret, strerror(errno));
-       }
- 
-       if (!rs_all_sends_done(rs) && !(rs->state & rs_error))
-+      {
-+              printf("  rshutdown - need sends %d - %p\n", socket, rs);
-               rs_process_cq(rs, 0, rs_all_sends_done);
-+              printf("  rshutdown - have sends %d - %p\n", socket, rs);
-+      }
- 
-       if ((rs->fd_flags & O_NONBLOCK) && (rs->state & rs_connected))
-               rs_set_nonblocking(rs, 1);
- 
-+      printf("} rshutdown %d - %p\n", socket, rs);
-       return 0;
- }
- 
-@@ -1751,9 +1776,11 @@ int rclose(int socket)
-       struct rsocket *rs;
- 
-       rs = idm_at(&idm, socket);
-+      printf("rclose %d - %p {\n", socket, rs);
-       if (rs->state & rs_connected)
-               rshutdown(socket, SHUT_RDWR);
- 
-+      printf("} rclose %d - %p\n", socket, rs);
-       rs_free(rs);
-       return 0;
- }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e4eab93..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,55 +0,0 @@
-Bottom: 34a422e20b6864421c4dcbf249875027c9956b02
-Top:    47f8fbb306d277301161e94470a45895de0fbb36
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-26 23:31:37 -0700
-
-Refresh of mpi-finalize
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index c53d5d5..3ba0a74 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1723,7 +1723,6 @@ int rshutdown(int socket, int how)
-       int ctrl, ret = 0;
- 
-       rs = idm_at(&idm, socket);
--      printf("rshutdown %d - %p {\n", socket, rs);
-       if (how == SHUT_RD) {
-               rs_shutdown_state(rs, rs_connect_rd);
-               return 0;
-@@ -1753,21 +1752,14 @@ int rshutdown(int socket, int how)
-               ret = rs_post_write(rs, 0, NULL, 0,
-                                   rs_msg_set(RS_OP_CTRL, ctrl),
-                                   0, 0, 0);
--              if (ret)
--                      printf("rs_post_write failed %d %s\n", ret, strerror(errno));
-       }
- 
-       if (!rs_all_sends_done(rs) && !(rs->state & rs_error))
--      {
--              printf("  rshutdown - need sends %d - %p\n", socket, rs);
-               rs_process_cq(rs, 0, rs_all_sends_done);
--              printf("  rshutdown - have sends %d - %p\n", socket, rs);
--      }
- 
-       if ((rs->fd_flags & O_NONBLOCK) && (rs->state & rs_connected))
-               rs_set_nonblocking(rs, 1);
- 
--      printf("} rshutdown %d - %p\n", socket, rs);
-       return 0;
- }
- 
-@@ -1776,11 +1768,9 @@ int rclose(int socket)
-       struct rsocket *rs;
- 
-       rs = idm_at(&idm, socket);
--      printf("rclose %d - %p {\n", socket, rs);
-       if (rs->state & rs_connected)
-               rshutdown(socket, SHUT_RDWR);
- 
--      printf("} rclose %d - %p\n", socket, rs);
-       rs_free(rs);
-       return 0;
- }