delete

diff --git a/meta b/meta
index ca521e9983fa07ffa38970281ac75f1f40bad3fd..8a639aefad91f633903ab0034a80f85b5d251a84 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 077cd5f4dc04ffb374741354a6022635038c89be
+Previous: 2d81c78c4c11d2d30182d143fc113248b0f8d580
 Head: 6047e1991e95b96b1992f39a466457e584c01226
 Applied:
 Unapplied:
-  test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f

diff --git a/patches/test-udp b/patches/test-udp
deleted file mode 100644 (file)
index d3f21f2..0000000
--- a/patches/test-udp
+++ /dev/null
@@ -1,98 +0,0 @@
-Bottom: 92d2aab8615c3d1003fee963587c4078b732e465
-Top:    d9b92ddc1535f5f948e377adc72d85702f62d527
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-11-15 20:55:33 -0800
-
-udp perf test
-
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index fb2149b..d516086 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -34,7 +34,7 @@
- #if HAVE_CONFIG_H
- #  include <config.h>
- #endif /* HAVE_CONFIG_H */
--
-+#include <stdio.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
-@@ -120,6 +120,7 @@ struct fd_info {
-       int fd;
-       int dupfd;
-       atomic_t refcnt;
-+      int udp_fd;
- };
- 
- static int fd_open(void)
-@@ -136,6 +137,8 @@ static int fd_open(void)
-               ret = index;
-               goto err1;
-       }
-+      fdi->udp_fd = real.socket(PF_INET, SOCK_DGRAM, 0);
-+      ret = real.fcntl(fdi->udp_fd, F_SETFL, O_NONBLOCK);
- 
-       fdi->dupfd = -1;
-       atomic_init(&fdi->refcnt);
-@@ -188,6 +191,14 @@ static inline int fd_getd(int index)
-       return fdi ? fdi->fd : index;
- }
- 
-+static inline int fd_getudp(int index)
-+{
-+      struct fd_info *fdi;
-+
-+      fdi = idm_lookup(&idm, index);
-+      return fdi->udp_fd;
-+}
-+
- static inline enum fd_fork_state fd_gets(int index)
- {
-       struct fd_info *fdi;
-@@ -215,6 +226,7 @@ static enum fd_type fd_close(int index, int *fd)
-               *fd = fdi->fd;
-               type = fdi->type;
-               real.close(index);
-+              real.close(fdi->udp_fd);
-               free(fdi);
-       } else {
-               *fd = index;
-@@ -437,6 +449,7 @@ real:
- int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
- {
-       int fd;
-+      real.bind(fd_getudp(socket), addr, addrlen);
-       return (fd_get(socket, &fd) == fd_rsocket) ?
-               rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen);
- }
-@@ -638,6 +651,8 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
- 
-       if (fd_get(socket, &fd) == fd_rsocket) {
-               ret = rconnect(fd, addr, addrlen);
-+              if (!ret)
-+                      real.connect(fd_getudp(socket), addr, addrlen);
-               if (!ret || errno == EINPROGRESS)
-                       return ret;
- 
-@@ -657,6 +672,9 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
- ssize_t recv(int socket, void *buf, size_t len, int flags)
- {
-       int fd;
-+      struct sockaddr sa;
-+      socklen_t slen = sizeof sa;
-+      real.recvfrom(fd_getudp(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);
- }
-@@ -770,6 +788,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, 0);
-       }
- 
-       ret = rpoll(rfds, nfds, timeout);