refresh

diff --git a/meta b/meta
index 20a746b7836bbd5909c8eaae5441badc091dab58..76a200f33b3e51af755ef9944be25fa627712064 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 84e2fb4289703bc827857e344f05a84cf1c0dcaf
-Head: 63fc9ad7dbdb07e9a544ccea7845b11a105d110f
+Previous: f1ed7bb1d97d263ef014cfb99bf9454f5e79acf6
+Head: 59cddb8c2cd143ffe205716eef276b9c502e1eb5
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -8,8 +8,7 @@ Applied:
   rstream-fork: a1d261650896286989c5197199da7729b3d61fa5
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
-  mpi-finalize: 500e05f8efa98368ffe62652dfe9062315d1dd6f
-  refresh-temp: 63fc9ad7dbdb07e9a544ccea7845b11a105d110f
+  mpi-finalize: 59cddb8c2cd143ffe205716eef276b9c502e1eb5
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/mpi-finalize b/patches/mpi-finalize
index d7d581c6c86c9f45a526a819d9a6df0305434505..3ab34690ff4954c5ffbd61c03cc94ba1cf6095ae 100644 (file)
--- a/patches/mpi-finalize
+++ b/patches/mpi-finalize
@@ -1,5 +1,5 @@
 Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    47f8fbb306d277301161e94470a45895de0fbb36
+Top:    b5df9cc04d6e7629ae937bfe9bbc3c7da5193ea0
 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..3ba0a74 100644
+index ed125b3..1e391b3 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -132,6 +132,8 @@ union rs_wr_id {
@@ -87,13 +87,3 @@ index ed125b3..3ba0a74 100644
  
                if (ret) {
                        rs->state = rs_error;
-@@ -1726,7 +1741,9 @@ int rshutdown(int socket, int how)
-                               RS_CTRL_SHUTDOWN : RS_CTRL_DISCONNECT;
-               }
-               if (!rs_can_send_ctrl(rs)) {
-+                      printf("  rshutdown - need ctrl msg %d - %p\n", socket, rs);
-                       ret = rs_process_cq(rs, 0, rs_can_send_ctrl);
-+                      printf("  rshutdown - have ctrl msg %d - %p\n", socket, rs);
-                       if (ret)
-                               return ret;
-               }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4a28e06..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 47f8fbb306d277301161e94470a45895de0fbb36
-Top:    b5df9cc04d6e7629ae937bfe9bbc3c7da5193ea0
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-26 23:32:18 -0700
-
-Refresh of mpi-finalize
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 3ba0a74..1e391b3 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1741,9 +1741,7 @@ int rshutdown(int socket, int how)
-                               RS_CTRL_SHUTDOWN : RS_CTRL_DISCONNECT;
-               }
-               if (!rs_can_send_ctrl(rs)) {
--                      printf("  rshutdown - need ctrl msg %d - %p\n", socket, rs);
-                       ret = rs_process_cq(rs, 0, rs_can_send_ctrl);
--                      printf("  rshutdown - have ctrl msg %d - %p\n", socket, rs);
-                       if (ret)
-                               return ret;
-               }