This reverts commit c8b1906cf59d73a7cb39926c53dc4e136611d4f5.
---
...wrk-remove-check-of-file-descriptor-value.patch | 37 ----------------------
wrk/Makefile | 1 -
2 files changed, 38 deletions(-)
delete mode 100644 wrk/0003-wrk-remove-check-of-file-descriptor-value.patch
diff --git a/wrk/0003-wrk-remove-check-of-file-descriptor-value.patch
b/wrk/0003-wrk-remove-check-of-file-descriptor-value.patch
deleted file mode 100644
index 459fe07..0000000
--- a/wrk/0003-wrk-remove-check-of-file-descriptor-value.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 96322a4915582f69c5d7ef1816c215885b681ba7 Mon Sep 17 00:00:00 2001
-From: Justin Cinkelj <justin.cink...@xlab.si>
-Date: Wed, 30 Aug 2017 16:37:06 +0200
-Subject: [PATCH] wrk: remove check of file descriptor value
-
-The check incorrectly fails on OSv. With say 1 conection, max expected
-fd was 10+3*1. Once other apps consume some fds, the check fails.
-
-Signed-off-by: Justin Cinkelj <justin.cink...@xlab.si>
----
- src/ae.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/ae.c b/src/ae.c
-index 90be4e2..ef8ca01 100644
---- a/src/ae.c
-+++ b/src/ae.c
-@@ -105,9 +105,14 @@ void aeStop(aeEventLoop *eventLoop) {
- int aeCreateFileEvent(aeEventLoop *eventLoop, int fd, int mask,
- aeFileProc *proc, void *clientData)
- {
-+ // The eventLoop->setsize is set by:
-+ // ./src/wrk.c:145: t->loop = aeCreateEventLoop(10 +
cfg.connections * 3);
-+ // This does not work on OSv. FD numbers are shared by all apps,
-+ // and can get arbitrary large.
- if (fd >= eventLoop->setsize) {
-- errno = ERANGE;
-- return AE_ERR;
-+ //fprintf(stderr, "INFO: wrk, allow large fd=%d > %d in
aeCreateFileEvent on OSv\n", fd, eventLoop->setsize);
-+ //errno = ERANGE;
-+ //return AE_ERR;
- }
- aeFileEvent *fe = &eventLoop->events[fd];
-
---
-2.9.4
-
diff --git a/wrk/Makefile b/wrk/Makefile
index 0cb9165..cce8f17 100644
--- a/wrk/Makefile
+++ b/wrk/Makefile
@@ -13,7 +13,6 @@ wrk: $(tarball)
mv wrk-$(version) wrk
cd wrk && patch -p1 < ../0001-make-build-as-DSO.patch
cd wrk && patch -p1 < ../wrk-fix-uninit-connection.patch
- cd wrk && patch -p1 <
../0003-wrk-remove-check-of-file-descriptor-value.patch
clean:
rm -rf wrk $(tarball)
--
2.9.5
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
