refresh (create temporary patch)

diff --git a/meta b/meta
index 3ab4ab2eeaf29d42a4d4392e29f31766e4fcaf28..8f89e9c9c495005b8b38ba2e888e98f5dce97789 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 8c7d9ec4ba3cffe2ae825fd6d56b8a19155d6da3
-Head: bc7d39b5bd7e376900e5b0d0024e5b9a521697c7
+Previous: 7b44dd94bfe39fde10cc89237bf0894fb01c485c
+Head: 612882f8ecb7d3e93f89385bd1292f063b0609b1
 Applied:
   dsocket: bc7d39b5bd7e376900e5b0d0024e5b9a521697c7
+  refresh-temp: 612882f8ecb7d3e93f89385bd1292f063b0609b1
 Unapplied:
   udpong: a003dda8e0d2f6ea134932bdd8bf5a5f29b7bfce
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..e6e1971
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,37 @@
+Bottom: 89a1bd159135ab5aae205202e62cdc91b9ab3b0d
+Top:    8d2f75897b59b2230d826c1aa131f191ac2a54cb
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-12-18 14:58:18 -0800
+
+Refresh of dsocket
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 219aa4a..42a28d2 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -2833,6 +2833,7 @@ static int rs_poll_arm(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds)
+                               else
+                                       rfds[i].fd = rs->cm_id->channel->fd;
+                       } else {
++                              printf("%s ready to poll epfd\n", __func__);
+                               rfds[i].fd = rs->epfd;
+                       }
+                       rfds[i].events = POLLIN;
+@@ -2841,7 +2842,6 @@ static int rs_poll_arm(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds)
+                       rfds[i].events = fds[i].events;
+               }
+               rfds[i].revents = 0;
+-
+       }
+       return 0;
+ }
+@@ -2906,7 +2906,7 @@ int rpoll(struct pollfd *fds, nfds_t nfds, int timeout)
+               if (ret)
+                       break;
+ 
+-              ret = poll(rfds, nfds, timeout);
++              ret = poll(rfds, nfds, timeout ? 10000 : 0);
+               if (ret <= 0)
+                       break;