diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-03-18 06:43:52 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-03-18 06:43:52 +0300 |
| commit | ac78b26324a348ebdd108de0c022729b671549fb (patch) | |
| tree | 606691334fa0d164469073bacb4c132c86a2f4d3 /src/os/unix/ngx_files.h | |
| parent | 931ce7f02a9c55987ef9a7128882097b89a36540 (diff) | |
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.
Diffstat (limited to 'src/os/unix/ngx_files.h')
| -rw-r--r-- | src/os/unix/ngx_files.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index 6081b003f..88b2f81cc 100644 --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -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 |