summaryrefslogtreecommitdiff
path: root/auto
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2019-10-17 16:02:19 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2019-10-17 16:02:19 +0300
commitfac4c7bdf53ee7d8fec6568f1e9fecefcde6feba (patch)
tree89ced1f3ff8283bc70f825c48083e1055cdc9135 /auto
parentd2ea226229f4039953af48bb7e0599c076f01c1f (diff)
downloadnginx-fac4c7bdf53ee7d8fec6568f1e9fecefcde6feba.tar.gz
Events: available bytes calculation via ioctl(FIONREAD).
This makes it possible to avoid looping for a long time while working with a fast enough peer when data are added to the socket buffer faster than we are able to read and process them (ticket #1431). This is basically what we already do on FreeBSD with kqueue, where information about the number of bytes in the socket buffer is returned by the kevent() call. With other event methods rev->available is now set to -1 when the socket is ready for reading. Later in ngx_recv() and ngx_recv_chain(), if full buffer is received, real number of bytes in the socket buffer is retrieved using ioctl(FIONREAD). Reading more than this number of bytes ensures that even with edge-triggered event methods the event will be triggered again, so it is safe to stop processing of the socket and switch to other connections. Using ioctl(FIONREAD) only after reading a full buffer is an optimization. With this approach we only call ioctl(FIONREAD) when there are at least two recv()/readv() calls.
Diffstat (limited to 'auto')
-rw-r--r--auto/unix12
1 files changed, 12 insertions, 0 deletions
diff --git a/auto/unix b/auto/unix
index 43d3b25a5..ff9697a4e 100644
--- a/auto/unix
+++ b/auto/unix
@@ -943,6 +943,18 @@ ngx_feature_test="int i = FIONBIO; printf(\"%d\", i)"
. auto/feature
+ngx_feature="ioctl(FIONREAD)"
+ngx_feature_name="NGX_HAVE_FIONREAD"
+ngx_feature_run=no
+ngx_feature_incs="#include <sys/ioctl.h>
+ #include <stdio.h>
+ $NGX_INCLUDE_SYS_FILIO_H"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="int i = FIONREAD; printf(\"%d\", i)"
+. auto/feature
+
+
ngx_feature="struct tm.tm_gmtoff"
ngx_feature_name="NGX_HAVE_GMTOFF"
ngx_feature_run=no