comparison src/core/ngx_buf.h @ 7985:ec2e6893caaa

Simplified sendfile(SF_NODISKIO) usage. Starting with FreeBSD 11, there is no need to use AIO operations to preload data into cache for sendfile(SF_NODISKIO) to work. Instead, sendfile() handles non-blocking loading data from disk by itself. It still can, however, return EBUSY if a page is already being loaded (for example, by a different process). If this happens, we now post an event for the next event loop iteration, so sendfile() is retried "after a short period", as manpage recommends. The limit of the number of EBUSY tolerated without any progress is preserved, but now it does not result in an alert, since on an idle system event loop iteration might be very short and EBUSY can happen many times in a row. Instead, SF_NODISKIO is simply disabled for one call once the limit is reached. With this change, sendfile(SF_NODISKIO) is now used automatically as long as sendfile() is enabled, and no longer requires "aio on;".
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 27 Dec 2021 19:48:33 +0300
parents 2f9214713666
children
comparison
equal deleted inserted replaced
7984:ae992b5a27b2 7985:ec2e6893caaa
88 unsigned need_in_temp:1; 88 unsigned need_in_temp:1;
89 unsigned aio:1; 89 unsigned aio:1;
90 90
91 #if (NGX_HAVE_FILE_AIO || NGX_COMPAT) 91 #if (NGX_HAVE_FILE_AIO || NGX_COMPAT)
92 ngx_output_chain_aio_pt aio_handler; 92 ngx_output_chain_aio_pt aio_handler;
93 #if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
94 ssize_t (*aio_preload)(ngx_buf_t *file);
95 #endif
96 #endif 93 #endif
97 94
98 #if (NGX_THREADS || NGX_COMPAT) 95 #if (NGX_THREADS || NGX_COMPAT)
99 ngx_int_t (*thread_handler)(ngx_thread_task_t *task, 96 ngx_int_t (*thread_handler)(ngx_thread_task_t *task,
100 ngx_file_t *file); 97 ngx_file_t *file);