]> git.kaiwu.me - nginx.git/commitdiff
Restored ngx_event_aio_t layout for debug logging.
authorMaxim Dounin <mdounin@mdounin.ru>
Thu, 10 Aug 2017 19:21:22 +0000 (22:21 +0300)
committerMaxim Dounin <mdounin@mdounin.ru>
Thu, 10 Aug 2017 19:21:22 +0000 (22:21 +0300)
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

index 053bd16f8ceeee88b4123c0b26be224ff761d91d..19fec681bbf5520e413933a01fb4d91e50308fad 100644 (file)
@@ -152,12 +152,12 @@ struct ngx_event_aio_s {
     ngx_event_handler_pt       handler;
     ngx_file_t                *file;
 
+    ngx_fd_t                   fd;
+
 #if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT)
     ssize_t                  (*preload_handler)(ngx_buf_t *file);
 #endif
 
-    ngx_fd_t                   fd;
-
 #if (NGX_HAVE_EVENTFD)
     int64_t                    res;
 #endif