IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Threads: task pointer stored in ngx_file_t.

Browse Source 
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:
Maxim Dounin
2016-03-18 06:43:52 +03:00
parent 931ce7f02a
commit ac78b26324
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/os/unix/ngx_files.c
View File

@@ -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;

4
src/os/unix/ngx_files.h
View File

@@ -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