refresh

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

diff --git a/patches/mpi-finalize b/patches/mpi-finalize
index be73f7a63e19eb0ba4c233deaffca32c3b8bc7ff..1f668a02da99caeea34f09aaa5f2b0893ee97523 100644 (file)
--- a/patches/mpi-finalize
+++ b/patches/mpi-finalize
@@ -1,5 +1,5 @@
 Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    2d7d36989522b9e010497256793038fb2cb5aa9e
+Top:    4f6b6265d543312f4e8c9d74b6522b4168986bb9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-26 15:35:32 -0700
 
@@ -12,4 +12,20 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index 52eaf1a..996d8e0 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -798,9 +798,12 @@ int select(int nfds, fd_set *readfds, fd_set *writefds,
+       return ret;
+ }
+ 
++#include <stdio.h>
++
+ int shutdown(int socket, int how)
+ {
+       int fd;
++      printf("shutdown how %s\n", how == SHUT_RDWR ? "RDWR" : how == SHUT_RD ? "RD" : "WR");
+       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 17abba8..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,26 +0,0 @@
-Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    4f6b6265d543312f4e8c9d74b6522b4168986bb9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-26 15:37:14 -0700
-
-Refresh of mpi-finalize
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 52eaf1a..996d8e0 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -798,9 +798,12 @@ int select(int nfds, fd_set *readfds, fd_set *writefds,
-       return ret;
- }
- 
-+#include <stdio.h>
-+
- int shutdown(int socket, int how)
- {
-       int fd;
-+      printf("shutdown how %s\n", how == SHUT_RDWR ? "RDWR" : how == SHUT_RD ? "RD" : "WR");
-       return (fd_get(socket, &fd) == fd_rsocket) ?
-               rshutdown(fd, how) : real.shutdown(fd, how);
- }