Mercurial > hg > nginx
comparison src/event/ngx_event.h @ 7089:371da6a7021b
Restored ngx_event_aio_t layout for debug logging.
The "fd" field should be after 3 pointers for ngx_event_ident() to use it.
This was broken by ccad84a174e0. While it does not seem to be currently used
for aio-related events, it should be a good idea to preserve the correct
layout nevertheless.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Thu, 10 Aug 2017 22:21:22 +0300 |
| parents | 0c572ed91b36 |
| children | 88a624c9b491 |
comparison
equal
deleted
inserted
replaced
| 7088:f684178faec9 | 7089:371da6a7021b |
|---|---|
| 150 struct ngx_event_aio_s { | 150 struct ngx_event_aio_s { |
| 151 void *data; | 151 void *data; |
| 152 ngx_event_handler_pt handler; | 152 ngx_event_handler_pt handler; |
| 153 ngx_file_t *file; | 153 ngx_file_t *file; |
| 154 | 154 |
| 155 ngx_fd_t fd; | |
| 156 | |
| 155 #if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT) | 157 #if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT) |
| 156 ssize_t (*preload_handler)(ngx_buf_t *file); | 158 ssize_t (*preload_handler)(ngx_buf_t *file); |
| 157 #endif | 159 #endif |
| 158 | |
| 159 ngx_fd_t fd; | |
| 160 | 160 |
| 161 #if (NGX_HAVE_EVENTFD) | 161 #if (NGX_HAVE_EVENTFD) |
| 162 int64_t res; | 162 int64_t res; |
| 163 #endif | 163 #endif |
| 164 | 164 |