refresh (create temporary patch)

diff --git a/meta b/meta
index 9feda4cf360c12f2473d16ad3bc349e7a178624d..b622373563c6562c72ede9833bf38d5c49a9e451 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 115b1c579591b328bbc2fb30775712698b497d26
-Head: c8484a6e05086afebf91595cff5f0e7625dd2a61
+Previous: cca6d4f35ecabfa2b5e9c266e1ee6c4baf75704e
+Head: f5de34ad38adb3ba5542a7d36225adc07dd11dbe
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -9,6 +9,7 @@ Applied:
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
   mpi-finalize: c8484a6e05086afebf91595cff5f0e7625dd2a61
+  refresh-temp: f5de34ad38adb3ba5542a7d36225adc07dd11dbe
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..e4eab93
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,55 @@
+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;
+ }