From 43ae41549e3d9f1a716b15a6a187b68ecda36ed8 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 16 Nov 2012 00:07:58 -0800 Subject: [PATCH] refresh --- meta | 7 +- patches/refresh-temp | 151 ------------------------------------------- patches/test-udp | 124 ++++++++++++++++++++++++++++------- 3 files changed, 103 insertions(+), 179 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 591890b3..e86c0cb5 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 02e912644435f4da0204f5b7478e63026923156f -Head: 5a399006926f7b33ed4aa433e05a73c925ef3849 +Previous: 3630adade02cfe19c3f5aaae83cf92b4b26110dd +Head: e18be9201f9d4a8267541dd9185c5c14fc09c547 Applied: - test-udp: 1ff4874c7272040955adbcc3a0f0abe8a184bb1b - refresh-temp: 5a399006926f7b33ed4aa433e05a73c925ef3849 + test-udp: e18be9201f9d4a8267541dd9185c5c14fc09c547 Unapplied: usocket: 158ea5a8c1a0fcf3ca61c642095023af16759c90 iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index df83cd58..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,151 +0,0 @@ -Bottom: d3cf6446fd6282f1865b0aab7918b786da23eafb -Top: cae235e68f5c1b9ddbefc3f6eb456f6481b17743 -Author: Sean Hefty -Date: 2012-11-16 00:07:58 -0800 - -Refresh of test-udp - ---- - -diff --git a/src/preload.c b/src/preload.c -index 01f0b0e..b913091 100644 ---- a/src/preload.c -+++ b/src/preload.c -@@ -34,7 +34,7 @@ - #if HAVE_CONFIG_H - # include - #endif /* HAVE_CONFIG_H */ -- -+#include - #include - #include - #include -@@ -132,11 +132,13 @@ static int fd_open(void) - if (!fdi) - return ERR(ENOMEM); - -- index = real.socket(PF_INET, SOCK_DGRAM, 0);//open("/dev/null", O_RDONLY); -+ index = open("/dev/null", O_RDONLY); - if (index < 0) { - ret = index; - goto err1; - } -+ fdi->udp_fd = real.socket(PF_INET, SOCK_DGRAM, 0); -+ real.fcntl(fdi->udp_fd, F_SETFL, O_NONBLOCK); - - fdi->dupfd = -1; - atomic_init(&fdi->refcnt); -@@ -438,7 +440,9 @@ real: - int bind(int socket, const struct sockaddr *addr, socklen_t addrlen) - { - int fd; -- real.bind(socket, addr, addrlen); -+ printf("%s in\n", __func__); -+// real.bind(socket, addr, addrlen); -+ printf("%s call out\n", __func__); - return (fd_get(socket, &fd) == fd_rsocket) ? - rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen); - } -@@ -446,6 +450,7 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen) - int listen(int socket, int backlog) - { - int fd, ret; -+ printf("%s in\n", __func__); - if (fd_get(socket, &fd) == fd_rsocket) { - ret = rlisten(fd, backlog); - } else { -@@ -453,6 +458,7 @@ int listen(int socket, int backlog) - if (!ret && fd_gets(socket) == fd_fork) - fd_store(socket, fd, fd_normal, fd_fork_listen); - } -+ printf("%s out\n", __func__); - return ret; - } - -@@ -472,6 +478,7 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen) - } - - fd_store(index, ret, fd_rsocket, fd_ready); -+ printf("%s out\n", __func__); - return index; - } else if (fd_gets(socket) == fd_fork_listen) { - index = fd_open(); -@@ -638,8 +645,11 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen) - { - int fd, ret; - -+ printf("%s in\n", __func__); - if (fd_get(socket, &fd) == fd_rsocket) { -+ printf("%s rconnect\n", __func__); - ret = rconnect(fd, addr, addrlen); -+ printf("%s ret %d\n", __func__, ret); - if (!ret || errno == EINPROGRESS) - return ret; - -@@ -659,9 +669,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(socket, buf, len, flags, &sa, &slen); -+// struct sockaddr sa; -+// 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); - } -@@ -758,11 +768,13 @@ int poll(struct pollfd *fds, nfds_t nfds, int timeout) - struct pollfd *rfds; - int i, ret; - -+// printf("%s in\n", __func__); - init_preload(); - for (i = 0; i < nfds; i++) { - if (fd_gett(fds[i].fd) == fd_rsocket) - goto use_rpoll; - } -+// printf("%s call real poll\n", __func__); - - return real.poll(fds, nfds, timeout); - -@@ -775,7 +787,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); -+// real.poll(&fds[i], 1, 0); - } - - ret = rpoll(rfds, nfds, timeout); -@@ -783,6 +795,7 @@ use_rpoll: - for (i = 0; i < nfds; i++) - fds[i].revents = rfds[i].revents; - -+// printf("%s out\n", __func__); - return ret; - } - -@@ -941,6 +954,7 @@ int fcntl(int socket, int cmd, ... /* arg */) - void *pparam; - int fd, ret; - -+ printf("%s in\n", __func__); - init_preload(); - va_start(args, cmd); - switch (cmd) { -@@ -963,7 +977,6 @@ int fcntl(int socket, int cmd, ... /* arg */) - lparam = va_arg(args, long); - ret = (fd_get(socket, &fd) == fd_rsocket) ? - rfcntl(fd, cmd, lparam) : real.fcntl(fd, cmd, lparam); -- real.fcntl(fd, cmd, lparam); - break; - default: - pparam = va_arg(args, void *); -@@ -972,6 +985,7 @@ int fcntl(int socket, int cmd, ... /* arg */) - break; - } - va_end(args); -+ printf("%s out\n", __func__); - return ret; - } diff --git a/patches/test-udp b/patches/test-udp index e7bc478b..fdd34dbc 100644 --- a/patches/test-udp +++ b/patches/test-udp @@ -1,5 +1,5 @@ Bottom: 92d2aab8615c3d1003fee963587c4078b732e465 -Top: d3cf6446fd6282f1865b0aab7918b786da23eafb +Top: cae235e68f5c1b9ddbefc3f6eb456f6481b17743 Author: Sean Hefty Date: 2012-11-15 20:55:33 -0800 @@ -9,9 +9,18 @@ udp perf test --- diff --git a/src/preload.c b/src/preload.c -index fb2149b..01f0b0e 100644 +index fb2149b..b913091 100644 --- a/src/preload.c +++ b/src/preload.c +@@ -34,7 +34,7 @@ + #if HAVE_CONFIG_H + # include + #endif /* HAVE_CONFIG_H */ +- ++#include + #include + #include + #include @@ -120,6 +120,7 @@ struct fd_info { int fd; int dupfd; @@ -20,46 +29,113 @@ index fb2149b..01f0b0e 100644 }; static int fd_open(void) -@@ -131,7 +132,7 @@ static int fd_open(void) - if (!fdi) - return ERR(ENOMEM); - -- index = open("/dev/null", O_RDONLY); -+ index = real.socket(PF_INET, SOCK_DGRAM, 0);//open("/dev/null", O_RDONLY); - if (index < 0) { +@@ -136,6 +137,8 @@ static int fd_open(void) ret = index; goto err1; -@@ -437,6 +438,7 @@ real: + } ++ fdi->udp_fd = real.socket(PF_INET, SOCK_DGRAM, 0); ++ real.fcntl(fdi->udp_fd, F_SETFL, O_NONBLOCK); + + fdi->dupfd = -1; + atomic_init(&fdi->refcnt); +@@ -437,6 +440,9 @@ real: int bind(int socket, const struct sockaddr *addr, socklen_t addrlen) { int fd; -+ real.bind(socket, addr, addrlen); ++ printf("%s in\n", __func__); ++// real.bind(socket, addr, addrlen); ++ printf("%s call out\n", __func__); return (fd_get(socket, &fd) == fd_rsocket) ? rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen); } -@@ -657,6 +659,9 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen) +@@ -444,6 +450,7 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen) + int listen(int socket, int backlog) + { + int fd, ret; ++ printf("%s in\n", __func__); + if (fd_get(socket, &fd) == fd_rsocket) { + ret = rlisten(fd, backlog); + } else { +@@ -451,6 +458,7 @@ int listen(int socket, int backlog) + if (!ret && fd_gets(socket) == fd_fork) + fd_store(socket, fd, fd_normal, fd_fork_listen); + } ++ printf("%s out\n", __func__); + return ret; + } + +@@ -470,6 +478,7 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen) + } + + fd_store(index, ret, fd_rsocket, fd_ready); ++ printf("%s out\n", __func__); + return index; + } else if (fd_gets(socket) == fd_fork_listen) { + index = fd_open(); +@@ -636,8 +645,11 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen) + { + int fd, ret; + ++ printf("%s in\n", __func__); + if (fd_get(socket, &fd) == fd_rsocket) { ++ printf("%s rconnect\n", __func__); + ret = rconnect(fd, addr, addrlen); ++ printf("%s ret %d\n", __func__, ret); + if (!ret || errno == EINPROGRESS) + return ret; + +@@ -657,6 +669,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(socket, buf, len, flags, &sa, &slen); ++// struct sockaddr sa; ++// 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); } -@@ -770,6 +775,7 @@ use_rpoll: +@@ -753,11 +768,13 @@ int poll(struct pollfd *fds, nfds_t nfds, int timeout) + struct pollfd *rfds; + int i, ret; + ++// printf("%s in\n", __func__); + init_preload(); + for (i = 0; i < nfds; i++) { + if (fd_gett(fds[i].fd) == fd_rsocket) + goto use_rpoll; + } ++// printf("%s call real poll\n", __func__); + + return real.poll(fds, nfds, timeout); + +@@ -770,6 +787,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); ++// real.poll(&fds[i], 1, 0); } ret = rpoll(rfds, nfds, timeout); -@@ -957,6 +963,7 @@ int fcntl(int socket, int cmd, ... /* arg */) - lparam = va_arg(args, long); - ret = (fd_get(socket, &fd) == fd_rsocket) ? - rfcntl(fd, cmd, lparam) : real.fcntl(fd, cmd, lparam); -+ real.fcntl(fd, cmd, lparam); +@@ -777,6 +795,7 @@ use_rpoll: + for (i = 0; i < nfds; i++) + fds[i].revents = rfds[i].revents; + ++// printf("%s out\n", __func__); + return ret; + } + +@@ -935,6 +954,7 @@ int fcntl(int socket, int cmd, ... /* arg */) + void *pparam; + int fd, ret; + ++ printf("%s in\n", __func__); + init_preload(); + va_start(args, cmd); + switch (cmd) { +@@ -965,6 +985,7 @@ int fcntl(int socket, int cmd, ... /* arg */) break; - default: - pparam = va_arg(args, void *); + } + va_end(args); ++ printf("%s out\n", __func__); + return ret; + } -- 2.41.0