mirror of
https://github.com/nginx/nginx.git
synced 2025-06-06 00:42:40 +08:00
Threads: task pointer stored in ngx_file_t.
This simplifies the interface of the ngx_thread_read() function. Additionally, most of the thread operations now explicitly set file->thread_task, file->thread_handler and file->thread_ctx, to facilitate use of thread operations in other places. (Potential problems remain with sendfile in threads though - it uses file->thread_handler as set in ngx_output_chain(), and it should not be overwritten to an incompatible one.) In collaboration with Valentin Bartenev.
This commit is contained in:
parent
931ce7f02a
commit
ac78b26324
@ -27,6 +27,7 @@ struct ngx_file_s {
|
||||
ngx_int_t (*thread_handler)(ngx_thread_task_t *task,
|
||||
ngx_file_t *file);
|
||||
void *thread_ctx;
|
||||
ngx_thread_task_t *thread_task;
|
||||
#endif
|
||||
|
||||
#if (NGX_HAVE_FILE_AIO)
|
||||
|
@ -577,10 +577,15 @@ ngx_output_chain_copy_buf(ngx_output_chain_ctx_t *ctx)
|
||||
} else
|
||||
#endif
|
||||
#if (NGX_THREADS)
|
||||
if (src->file->thread_handler) {
|
||||
n = ngx_thread_read(&ctx->thread_task, src->file, dst->pos,
|
||||
(size_t) size, src->file_pos, ctx->pool);
|
||||
if (ctx->thread_handler) {
|
||||
src->file->thread_task = ctx->thread_task;
|
||||
src->file->thread_handler = ctx->thread_handler;
|
||||
src->file->thread_ctx = ctx->filter_ctx;
|
||||
|
||||
n = ngx_thread_read(src->file, dst->pos, (size_t) size,
|
||||
src->file_pos, ctx->pool);
|
||||
if (n == NGX_AGAIN) {
|
||||
ctx->thread_task = src->file->thread_task;
|
||||
return NGX_AGAIN;
|
||||
}
|
||||
|
||||
|
@ -691,12 +691,13 @@ ngx_http_file_cache_aio_read(ngx_http_request_t *r, ngx_http_cache_t *c)
|
||||
#if (NGX_THREADS)
|
||||
|
||||
if (clcf->aio == NGX_HTTP_AIO_THREADS) {
|
||||
c->file.thread_task = c->thread_task;
|
||||
c->file.thread_handler = ngx_http_cache_thread_handler;
|
||||
c->file.thread_ctx = r;
|
||||
|
||||
n = ngx_thread_read(&c->thread_task, &c->file, c->buf->pos,
|
||||
c->body_start, 0, r->pool);
|
||||
n = ngx_thread_read(&c->file, c->buf->pos, c->body_start, 0, r->pool);
|
||||
|
||||
c->thread_task = c->file.thread_task;
|
||||
c->reading = (n == NGX_AGAIN);
|
||||
|
||||
return n;
|
||||
|
@ -88,8 +88,8 @@ typedef struct {
|
||||
|
||||
|
||||
ssize_t
|
||||
ngx_thread_read(ngx_thread_task_t **taskp, ngx_file_t *file, u_char *buf,
|
||||
size_t size, off_t offset, ngx_pool_t *pool)
|
||||
ngx_thread_read(ngx_file_t *file, u_char *buf, size_t size, off_t offset,
|
||||
ngx_pool_t *pool)
|
||||
{
|
||||
ngx_thread_task_t *task;
|
||||
ngx_thread_read_ctx_t *ctx;
|
||||
@ -98,7 +98,7 @@ ngx_thread_read(ngx_thread_task_t **taskp, ngx_file_t *file, u_char *buf,
|
||||
"thread read: %d, %p, %uz, %O",
|
||||
file->fd, buf, size, offset);
|
||||
|
||||
task = *taskp;
|
||||
task = file->thread_task;
|
||||
|
||||
if (task == NULL) {
|
||||
task = ngx_thread_task_alloc(pool, sizeof(ngx_thread_read_ctx_t));
|
||||
@ -108,7 +108,7 @@ ngx_thread_read(ngx_thread_task_t **taskp, ngx_file_t *file, u_char *buf,
|
||||
|
||||
task->handler = ngx_thread_read_handler;
|
||||
|
||||
*taskp = task;
|
||||
file->thread_task = task;
|
||||
}
|
||||
|
||||
ctx = task->ctx;
|
||||
|
@ -385,8 +385,8 @@ extern ngx_uint_t ngx_file_aio;
|
||||
#endif
|
||||
|
||||
#if (NGX_THREADS)
|
||||
ssize_t ngx_thread_read(ngx_thread_task_t **taskp, ngx_file_t *file,
|
||||
u_char *buf, size_t size, off_t offset, ngx_pool_t *pool);
|
||||
ssize_t ngx_thread_read(ngx_file_t *file, u_char *buf, size_t size,
|
||||
off_t offset, ngx_pool_t *pool);
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user