Current SmartOS also has epoll(), so we need to prefer ports ...

... in order to actually use it by default
varnishcache · May 31, 2016 · 45ca71b · 45ca71b · hermunn · Jun 6, 2016
1 parent 11b91d1
commit 45ca71b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
@@ -247,11 +247,11 @@ usage(void)
 #if defined(HAVE_KQUEUE)
 	fprintf(stderr, FMT, "", "  -W kqueue");
 #endif
-#if defined(HAVE_EPOLL_CTL)
-	fprintf(stderr, FMT, "", "  -W epoll");
-#endif
 #if defined(HAVE_PORT_CREATE)
 	fprintf(stderr, FMT, "", "  -W ports");
+#endif
+#if defined(HAVE_EPOLL_CTL)
+	fprintf(stderr, FMT, "", "  -W epoll");
 #endif
 	fprintf(stderr, FMT, "", "  -W poll");
 

diff --git a/bin/varnishd/waiter/mgt_waiter.c b/bin/varnishd/waiter/mgt_waiter.c
@@ -40,11 +40,11 @@ static const struct choice waiter_choice[] = {
     #if defined(HAVE_KQUEUE)
 	{ "kqueue",	&waiter_kqueue },
     #endif
-    #if defined(HAVE_EPOLL_CTL)
-	{ "epoll",	&waiter_epoll },
-    #endif
     #if defined(HAVE_PORT_CREATE)
 	{ "ports",	&waiter_ports },
+    #endif
+    #if defined(HAVE_EPOLL_CTL)
+	{ "epoll",	&waiter_epoll },
     #endif
 	{ "poll",	&waiter_poll },
 	{ NULL,		NULL}