refresh

diff --git a/meta b/meta
index 3a51d3bf6ff98deaccd96c7e065623bf2b66207e..0bd77d7e168810faf44a02458fb74889cbdaab28 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 8234eca48740fda98685ed482263df8fee601867
-Head: 530c1dab05eacc006bc30eaefb0d310c42268348
+Previous: acad43c7cd299d7047341db4181d7ff1c8950743
+Head: 1ff4874c7272040955adbcc3a0f0abe8a184bb1b
 Applied:
-  test-udp: e633944d0a9d3a680904ab64fa1b092861b8e6d9
-  refresh-temp: 530c1dab05eacc006bc30eaefb0d310c42268348
+  test-udp: 1ff4874c7272040955adbcc3a0f0abe8a184bb1b
 Unapplied:
   usocket: 158ea5a8c1a0fcf3ca61c642095023af16759c90
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7422cf0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,33 +0,0 @@
-Bottom: 3bb2d5c4840cc0d59a5a500ba614c6001a92dc00
-Top:    d3cf6446fd6282f1865b0aab7918b786da23eafb
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-11-15 22:46:17 -0800
-
-Refresh of test-udp
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 2d44848..01f0b0e 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -660,8 +660,8 @@ ssize_t recv(int socket, void *buf, size_t len, int flags)
- {
-       int fd;
-       struct sockaddr sa;
--      socklen_t len = sizeof sa;
--      real.recvfrom(socket, buf, len, flags, &sa, &len);
-+      socklen_t slen = sizeof sa;
-+      real.recvfrom(socket, buf, len, flags, &sa, &slen);
-       return (fd_fork_get(socket, &fd) == fd_rsocket) ?
-               rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags);
- }
-@@ -775,7 +775,7 @@ use_rpoll:
-               rfds[i].fd = fd_getd(fds[i].fd);
-               rfds[i].events = fds[i].events;
-               rfds[i].revents = 0;
--              real.poll(&fds[i], 1, timeout);
-+              real.poll(&fds[i], 1, 0);
-       }
- 
-       ret = rpoll(rfds, nfds, timeout);

diff --git a/patches/test-udp b/patches/test-udp
index f5751e3a6eb88bd478154a13967bfaaed9bba14d..e7bc478b442305eac93b96c98277bc0332b73522 100644 (file)
--- a/patches/test-udp
+++ b/patches/test-udp
@@ -1,5 +1,5 @@
 Bottom: 92d2aab8615c3d1003fee963587c4078b732e465
-Top:    3bb2d5c4840cc0d59a5a500ba614c6001a92dc00
+Top:    d3cf6446fd6282f1865b0aab7918b786da23eafb
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-11-15 20:55:33 -0800
 
@@ -9,7 +9,7 @@ udp perf test
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index fb2149b..2d44848 100644
+index fb2149b..01f0b0e 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -120,6 +120,7 @@ struct fd_info {
@@ -42,8 +42,8 @@ index fb2149b..2d44848 100644
  {
        int fd;
 +      struct sockaddr sa;
-+      socklen_t len = sizeof sa;
-+      real.recvfrom(socket, buf, len, flags, &sa, &len);
++      socklen_t slen = sizeof sa;
++      real.recvfrom(socket, buf, len, flags, &sa, &slen);
        return (fd_fork_get(socket, &fd) == fd_rsocket) ?
                rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags);
  }
@@ -51,7 +51,7 @@ index fb2149b..2d44848 100644
                rfds[i].fd = fd_getd(fds[i].fd);
                rfds[i].events = fds[i].events;
                rfds[i].revents = 0;
-+              real.poll(&fds[i], 1, timeout);
++              real.poll(&fds[i], 1, 0);
        }
  
        ret = rpoll(rfds, nfds, timeout);