refresh

diff --git a/meta b/meta
index 353692b15facd1e1243470204fc7598cad9f4787..c679b4aceff496327638947e112b658c063156c1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 63bef12757065f55f870d19e7b80e84153f1a616
-Head: edf1637312c81eff0f8c6b22e8fa46f963169ff8
+Previous: 06c5b5afaf5c9ec8047dba2a9cc1475868de0a98
+Head: 358b798ae3566d0803f8e0fcdea9805ad24cb2fe
 Applied:
-  shutdown: 3de5b8a8cb62cb25875a1830f81881ef237aaa0e
-  refresh-temp: edf1637312c81eff0f8c6b22e8fa46f963169ff8
+  shutdown: 358b798ae3566d0803f8e0fcdea9805ad24cb2fe
 Unapplied:
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7c9e7be..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,59 +0,0 @@
-Bottom: 26793bc5d4be7bce14b20893dce3fbb7222355b2
-Top:    d4d2e5639ec08b8fe5dbd44a5f83ab895a727cee
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-08-16 23:45:53 -0700
-
-Refresh of shutdown
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 0135927..278437f 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -445,20 +445,8 @@ free:
-       return ret;
- }
- 
--static void *do_shutdown(void *arg)
--{
--      int rs = (int) arg;
--
--      sleep(1);
--      printf("calling shutdown from separate thread\n");
--      rs_shutdown(rs, SHUT_RDWR);
--      printf("shutdown completed\n");
--      return NULL;
--}
--
- static int run(void)
- {
--      struct pollfd fds;
-       int i, ret = 0;
- 
-       buf = malloc(!custom ? test_size[TEST_CNT - 1].size : transfer_size);
-@@ -518,23 +506,7 @@ static int run(void)
-       if (fork_pid)
-               wait(NULL);
-       else
--      {
--              if (dst_addr) {
--                      pthread_t thread_id;
--                      ret = pthread_create(&thread_id, NULL, do_shutdown, (void*) rs);
--
--                      fds.fd = rs;
--                      fds.events = POLLIN;
--                      printf("calling poll\n");
--                      ret = rs_poll(&fds, 1, 10000);
--                      printf("poll ret %d (%s) revents 0x%x (POLLHUP 0x%x)\n",
--                              ret, strerror(errno), fds.revents, POLLHUP);
--              } else {
--                      printf("sleeping for 10 seconds\n");
--                      sleep(10);
--                      rs_shutdown(rs, SHUT_RDWR);
--              }
--      }
-+              rs_shutdown(rs, SHUT_RDWR);
-       rs_close(rs);
- free:
-       free(buf);

diff --git a/patches/shutdown b/patches/shutdown
index 0ca0c16c8780564cd9249a2a4119d35a9ed9a28d..64966e7a81f45ed7a4790eb2aeafa531c3a3a6bf 100644 (file)
--- a/patches/shutdown
+++ b/patches/shutdown
@@ -1,5 +1,5 @@
 Bottom: 668ddd4271538fc243a888fad972f12f0e1bf29d
-Top:    26793bc5d4be7bce14b20893dce3fbb7222355b2
+Top:    d4d2e5639ec08b8fe5dbd44a5f83ab895a727cee
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-08-16 15:15:12 -0700
 
@@ -10,56 +10,6 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 278437f..0135927 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -445,8 +445,20 @@ free:
-       return ret;
- }
- 
-+static void *do_shutdown(void *arg)
-+{
-+      int rs = (int) arg;
-+
-+      sleep(1);
-+      printf("calling shutdown from separate thread\n");
-+      rs_shutdown(rs, SHUT_RDWR);
-+      printf("shutdown completed\n");
-+      return NULL;
-+}
-+
- static int run(void)
- {
-+      struct pollfd fds;
-       int i, ret = 0;
- 
-       buf = malloc(!custom ? test_size[TEST_CNT - 1].size : transfer_size);
-@@ -506,7 +518,23 @@ static int run(void)
-       if (fork_pid)
-               wait(NULL);
-       else
--              rs_shutdown(rs, SHUT_RDWR);
-+      {
-+              if (dst_addr) {
-+                      pthread_t thread_id;
-+                      ret = pthread_create(&thread_id, NULL, do_shutdown, (void*) rs);
-+
-+                      fds.fd = rs;
-+                      fds.events = POLLIN;
-+                      printf("calling poll\n");
-+                      ret = rs_poll(&fds, 1, 10000);
-+                      printf("poll ret %d (%s) revents 0x%x (POLLHUP 0x%x)\n",
-+                              ret, strerror(errno), fds.revents, POLLHUP);
-+              } else {
-+                      printf("sleeping for 10 seconds\n");
-+                      sleep(10);
-+                      rs_shutdown(rs, SHUT_RDWR);
-+              }
-+      }
-       rs_close(rs);
- free:
-       free(buf);
 diff --git a/src/rsocket.c b/src/rsocket.c
 index d544dd0..e45b26d 100644
 --- a/src/rsocket.c