comparison src/core/ngx_buf.h @ 6733:adc2414856b1

Modules compatibility: compatibility with NGX_THREADS. With this change it is now possible to load modules compiled without the "--with-threads" configure option into nginx binary compiled with it, and vice versa (if a module does not use thread-specific functions), assuming both use the "--with-compat" option.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 10 Oct 2016 18:44:17 +0300
parents e8d4c9e9682a
children 0c572ed91b36
comparison
equal deleted inserted replaced
6732:57148b755320 6733:adc2414856b1
86 unsigned sendfile:1; 86 unsigned sendfile:1;
87 unsigned directio:1; 87 unsigned directio:1;
88 unsigned unaligned:1; 88 unsigned unaligned:1;
89 unsigned need_in_memory:1; 89 unsigned need_in_memory:1;
90 unsigned need_in_temp:1; 90 unsigned need_in_temp:1;
91 #if (NGX_HAVE_FILE_AIO || NGX_THREADS)
92 unsigned aio:1; 91 unsigned aio:1;
93 #endif
94 92
95 #if (NGX_HAVE_FILE_AIO) 93 #if (NGX_HAVE_FILE_AIO)
96 ngx_output_chain_aio_pt aio_handler; 94 ngx_output_chain_aio_pt aio_handler;
97 #if (NGX_HAVE_AIO_SENDFILE) 95 #if (NGX_HAVE_AIO_SENDFILE)
98 ssize_t (*aio_preload)(ngx_buf_t *file); 96 ssize_t (*aio_preload)(ngx_buf_t *file);
99 #endif 97 #endif
100 #endif 98 #endif
101 99
102 #if (NGX_THREADS) 100 #if (NGX_THREADS || NGX_COMPAT)
103 ngx_int_t (*thread_handler)(ngx_thread_task_t *task, 101 ngx_int_t (*thread_handler)(ngx_thread_task_t *task,
104 ngx_file_t *file); 102 ngx_file_t *file);
105 ngx_thread_task_t *thread_task; 103 ngx_thread_task_t *thread_task;
106 #endif 104 #endif
107 105