refresh

diff --git a/meta b/meta
index 1e037c6de04f82d02854f65fabc9b602b01530b3..3b0541c13786d47917940bc7747e3b287d16e9c0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: f4d118de8d64422695467161203925e115a16b8c
-Head: b6085817dc3e24c6eb60380b04dde5f9253cd63e
+Previous: 8321b2a6444c8ca208ebf9c6d99c8b6c47e9b363
+Head: cb8102a08e2d22c7758b7f3c409d241043e1c3ac
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -8,8 +8,7 @@ Applied:
   rstream-fork: a1d261650896286989c5197199da7729b3d61fa5
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
-  mpi-finalize: 44af6b9a4bb25bff3e44beb61413d496babc79fc
-  refresh-temp: b6085817dc3e24c6eb60380b04dde5f9253cd63e
+  mpi-finalize: cb8102a08e2d22c7758b7f3c409d241043e1c3ac
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/mpi-finalize b/patches/mpi-finalize
index 1f668a02da99caeea34f09aaa5f2b0893ee97523..b0c45e0e5cccd8ee7b95de9ca056c577c4e44ea7 100644 (file)
--- a/patches/mpi-finalize
+++ b/patches/mpi-finalize
@@ -1,5 +1,5 @@
 Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    4f6b6265d543312f4e8c9d74b6522b4168986bb9
+Top:    7af76078e335d5acccea9e83cb4e86eea842ce74
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-26 15:35:32 -0700
 
@@ -13,10 +13,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 52eaf1a..996d8e0 100644
+index 52eaf1a..515cc10 100644
 --- a/src/preload.c
 +++ b/src/preload.c
-@@ -798,9 +798,12 @@ int select(int nfds, fd_set *readfds, fd_set *writefds,
+@@ -798,9 +798,13 @@ int select(int nfds, fd_set *readfds, fd_set *writefds,
        return ret;
  }
  
@@ -26,6 +26,7 @@ index 52eaf1a..996d8e0 100644
  {
        int fd;
 +      printf("shutdown how %s\n", how == SHUT_RDWR ? "RDWR" : how == SHUT_RD ? "RD" : "WR");
++      fflush(stdout);
        return (fd_get(socket, &fd) == fd_rsocket) ?
                rshutdown(fd, how) : real.shutdown(fd, how);
  }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4a06215..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 4f6b6265d543312f4e8c9d74b6522b4168986bb9
-Top:    7af76078e335d5acccea9e83cb4e86eea842ce74
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-26 15:43:36 -0700
-
-Refresh of mpi-finalize
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 996d8e0..515cc10 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -804,6 +804,7 @@ int shutdown(int socket, int how)
- {
-       int fd;
-       printf("shutdown how %s\n", how == SHUT_RDWR ? "RDWR" : how == SHUT_RD ? "RD" : "WR");
-+      fflush(stdout);
-       return (fd_get(socket, &fd) == fd_rsocket) ?
-               rshutdown(fd, how) : real.shutdown(fd, how);
- }