mirror of
https://github.com/nginx/nginx.git
synced 2025-08-06 06:46:16 +08:00
fb34316d68
Previous change 1ce3f01a4355 incorrectly introduced processing of the ngx_posted_next_events queue at the end of operation, effectively making posted next events a nop, since at the end of an event loop iteration the queue is always empty. Correct approach is to move events to the ngx_posted_events queue at an iteration start, as it was done previously. Further, in some cases the c->read event might be already in the ngx_posted_events queue, and calling ngx_post_event() with the ngx_posted_next_events queue won't do anything. To make sure the event will be correctly placed into the ngx_posted_next_events queue we now check if it is already posted.
51 lines
1.9 KiB
C
51 lines
1.9 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
* Copyright (C) Nginx, Inc.
|
|
*/
|
|
|
|
|
|
#ifndef _NGX_EVENT_POSTED_H_INCLUDED_
|
|
#define _NGX_EVENT_POSTED_H_INCLUDED_
|
|
|
|
|
|
#include <ngx_config.h>
|
|
#include <ngx_core.h>
|
|
#include <ngx_event.h>
|
|
|
|
|
|
#define ngx_post_event(ev, q) \
|
|
\
|
|
if (!(ev)->posted) { \
|
|
(ev)->posted = 1; \
|
|
ngx_queue_insert_tail(q, &(ev)->queue); \
|
|
\
|
|
ngx_log_debug1(NGX_LOG_DEBUG_CORE, (ev)->log, 0, "post event %p", ev);\
|
|
\
|
|
} else { \
|
|
ngx_log_debug1(NGX_LOG_DEBUG_CORE, (ev)->log, 0, \
|
|
"update posted event %p", ev); \
|
|
}
|
|
|
|
|
|
#define ngx_delete_posted_event(ev) \
|
|
\
|
|
(ev)->posted = 0; \
|
|
ngx_queue_remove(&(ev)->queue); \
|
|
\
|
|
ngx_log_debug1(NGX_LOG_DEBUG_CORE, (ev)->log, 0, \
|
|
"delete posted event %p", ev);
|
|
|
|
|
|
|
|
void ngx_event_process_posted(ngx_cycle_t *cycle, ngx_queue_t *posted);
|
|
void ngx_event_move_posted_next(ngx_cycle_t *cycle);
|
|
|
|
|
|
extern ngx_queue_t ngx_posted_accept_events;
|
|
extern ngx_queue_t ngx_posted_next_events;
|
|
extern ngx_queue_t ngx_posted_events;
|
|
|
|
|
|
#endif /* _NGX_EVENT_POSTED_H_INCLUDED_ */
|