Mercurial > hg > nginx-quic
view auto/cc/owc @ 6440:248aa2757332
Fixed timeouts with threaded sendfile() and subrequests.
If a write event happens after sendfile() but before we've got the
sendfile results in the main thread, this write event will be ignored.
And if no more events will happen, the connection will hang.
Removing the events works in the simple cases, but not always, as
in some cases events are added back by an unrelated code. E.g.,
the upstream module adds write event in the ngx_http_upstream_init()
to track client aborts.
Fix is to use wev->complete instead. It is now set to 0 before
a sendfile() task is posted, and it is set to 1 once a write event
happens. If on completion of the sendfile() task wev->complete is 1,
we know that an event happened while we were executing sendfile(), and
the socket is still ready for writing even if sendfile() did not sent
all the data or returned EAGAIN.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 18 Mar 2016 05:04:45 +0300 |
parents | 670ceaba03d8 |
children | b7b7f3a0cc28 |
line wrap: on
line source
# Copyright (C) Igor Sysoev # Copyright (C) Nginx, Inc. # Open Watcom C 1.0, 1.2, 1.3 # optimizations # maximize speed CFLAGS="$CFLAGS -ot" # reorder instructions for best pipeline usage CFLAGS="$CFLAGS -op" # inline intrinsic functions CFLAGS="$CFLAGS -oi" # inline expansion CFLAGS="$CFLAGS -oe" # disable stack checking calls CFLAGS="$CFLAGS -s" case $CPU in pentium) # optimize for Pentium and Athlon # register-based arguments passing conventions CPU_OPT="-5r" # stack-based arguments passing conventions #CPU_OPT="-5s" ;; pentiumpro) # optimize for Pentium Pro, Pentium II and Pentium III # register-based arguments passing conventions CPU_OPT="-6r" # stack-based arguments passing conventions #CPU_OPT="-6s" ;; esac CFLAGS="$CFLAGS $CPU_OPT" # warnings # maximum level CFLAGS="$CFLAGS -wx" #CFLAGS="$CFLAGS -w3" # stop on warning CFLAGS="$CFLAGS -we" # built target is NT CFLAGS="$CFLAGS -bt=nt" # multithreaded CFLAGS="$CFLAGS -bm" # debug CFLAGS="$CFLAGS -d2" # quiet CFLAGS="$CFLAGS -zq" # Open Watcom C 1.2 have=NGX_HAVE_C99_VARIADIC_MACROS . auto/have # the precompiled headers #CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" #NGX_PCH="$NGX_OBJS/ngx_config.pch" #NGX_BUILD_PCH="-fhq=$NGX_OBJS/ngx_config.pch" #NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch" # the link flags, built target is NT GUI mode application #CORE_LINK="$CORE_LINK -l=nt_win" # the resource file NGX_RCC="wrc \$(CORE_INCS) -fo=$NGX_OBJS/nginx.res " NGX_RCC="$NGX_RCC $NGX_WIN32_RC $NGX_OBJS/nginx.exe" ngx_include_opt="-i=" ngx_objout="-fo" ngx_binout="-fe=" ngx_objext="obj" ngx_binext=".exe" ngx_regex_dirsep='\\' ngx_dirsep="\\" ngx_long_start=' ' ngx_long_end=' ' ngx_long_regex_cont=' \&\ ' ngx_long_cont=' & ' ngx_regex_cont=' \&\ ' ngx_cont=' & ' ngx_tab=' & '