refresh

diff --git a/meta b/meta
index 2db501d13f00cdcec2294649ca520ce47641fb1e..90a68a0e66420f0cd55357f9b725131c26142b85 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 41575f60d01c82fac34e7ceb9d78e28b2def3c19
-Head: ab2b3b7a37929849b4b7d0453a3f736a9086bf15
+Previous: d6f624dfac56fe399fbd9a65b4cd1b444a74bbc3
+Head: ae46429bed49504d5f3f89bb2e9b9840acca819b
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -8,8 +8,7 @@ Applied:
   rstream-fork: a1d261650896286989c5197199da7729b3d61fa5
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
-  mpi-finalize: cb8102a08e2d22c7758b7f3c409d241043e1c3ac
-  refresh-temp: ab2b3b7a37929849b4b7d0453a3f736a9086bf15
+  mpi-finalize: ae46429bed49504d5f3f89bb2e9b9840acca819b
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/mpi-finalize b/patches/mpi-finalize
index b0c45e0e5cccd8ee7b95de9ca056c577c4e44ea7..16f6f1786035e4d4fc3882d66472cac201296db6 100644 (file)
--- a/patches/mpi-finalize
+++ b/patches/mpi-finalize
@@ -1,5 +1,5 @@
 Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    7af76078e335d5acccea9e83cb4e86eea842ce74
+Top:    ca9c46877a96db574c5387990a9f437b760e32f3
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-26 15:35:32 -0700
 
@@ -13,20 +13,70 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 52eaf1a..515cc10 100644
+index 52eaf1a..026ff1c 100644
 --- a/src/preload.c
 +++ b/src/preload.c
-@@ -798,9 +798,13 @@ int select(int nfds, fd_set *readfds, fd_set *writefds,
-       return ret;
- }
- 
-+#include <stdio.h>
-+
+@@ -801,6 +801,7 @@ int select(int nfds, fd_set *readfds, fd_set *writefds,
  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);
  }
+diff --git a/src/rsocket.c b/src/rsocket.c
+index ed125b3..d374af7 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1708,6 +1708,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 +1727,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;
+               }
+@@ -1735,14 +1738,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 +1761,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 519616c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,82 +0,0 @@
-Bottom: 7af76078e335d5acccea9e83cb4e86eea842ce74
-Top:    ca9c46877a96db574c5387990a9f437b760e32f3
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-26 16:17:30 -0700
-
-Refresh of mpi-finalize
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 515cc10..026ff1c 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -798,12 +798,9 @@ 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");
-       fflush(stdout);
-       return (fd_get(socket, &fd) == fd_rsocket) ?
-               rshutdown(fd, how) : real.shutdown(fd, how);
-diff --git a/src/rsocket.c b/src/rsocket.c
-index ed125b3..d374af7 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1708,6 +1708,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 +1727,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;
-               }
-@@ -1735,14 +1738,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 +1761,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;
- }