[nginx] Restored ngx_event_aio_t layout for debug logging.

Maxim Dounin mdounin at mdounin.ru
Thu Aug 10 19:22:13 UTC 2017

details:   http://hg.nginx.org/nginx/rev/371da6a7021b
changeset: 7089:371da6a7021b
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Thu Aug 10 22:21:22 2017 +0300
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.


 src/event/ngx_event.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -152,12 +152,12 @@ struct ngx_event_aio_s {
     ngx_event_handler_pt       handler;
     ngx_file_t                *file;
+    ngx_fd_t                   fd;
     ssize_t                  (*preload_handler)(ngx_buf_t *file);
-    ngx_fd_t                   fd;
     int64_t                    res;

More information about the nginx-devel mailing list