diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-10-19 12:33:58 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-10-19 12:33:58 +0000 |
| commit | c2068d08f097383b8eac508117e6d405627e6cef (patch) | |
| tree | 06ca21df58481e97289a566f42703102c0b6583c /src/event/ngx_event_posted.h | |
| parent | 8743f92a1acd46c0a4b0df2bf6a80fc1b110affb (diff) | |
| download | nginx-c2068d08f097383b8eac508117e6d405627e6cef.tar.gz nginx-c2068d08f097383b8eac508117e6d405627e6cef.tar.bz2 | |
nginx-0.3.3-RELEASE importrelease-0.3.3
*) Change: the "bl" and "af" parameters of the "listen" directive was
renamed to the "backlog" and "accept_filter".
*) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen"
directive.
*) Change: the "$msec" log parameter does not require now the
additional the gettimeofday() system call.
*) Feature: the -t switch now tests the "listen" directives.
*) Bugfix: if the invalid address was specified in the "listen"
directive, then after the -HUP signal nginx left an open socket in
the CLOSED state.
*) Bugfix: the mime type may be incorrectly set to default value for
index file with variable in the name; the bug had appeared in 0.3.0.
*) Feature: the "timer_resolution" directive.
*) Feature: the millisecond "$upstream_response_time" log parameter.
*) Bugfix: a temporary file with client request body now is removed
just after the response header was transferred to a client.
*) Bugfix: OpenSSL 0.9.6 compatibility.
*) Bugfix: the SSL certificate and key file paths could not be relative.
*) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in
the ngx_imap_ssl_module.
*) Bugfix: the "ssl_protocols" directive allowed to specify the single
protocol only.
Diffstat (limited to 'src/event/ngx_event_posted.h')
| -rw-r--r-- | src/event/ngx_event_posted.h | 67 |
1 files changed, 43 insertions, 24 deletions
diff --git a/src/event/ngx_event_posted.h b/src/event/ngx_event_posted.h index 86100af94..f9c55e5a3 100644 --- a/src/event/ngx_event_posted.h +++ b/src/event/ngx_event_posted.h @@ -13,43 +13,62 @@ #include <ngx_event.h> -#define ngx_post_event(ev) \ - if (ev->prev == NULL) { \ - ev->next = (ngx_event_t *) ngx_posted_events; \ - ev->prev = (ngx_event_t **) &ngx_posted_events; \ - ngx_posted_events = ev; \ - if (ev->next) { \ - ev->next->prev = &ev->next; \ - } \ - 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); \ - } +#if (NGX_THREADS) +extern ngx_mutex_t *ngx_posted_events_mutex; +#endif -#define ngx_delete_posted_event(ev) \ - *(ev->prev) = ev->next; \ + +#define ngx_locked_post_event(ev, queue) \ + \ + if (ev->prev == NULL) { \ + ev->next = (ngx_event_t *) *queue; \ + ev->prev = (ngx_event_t **) queue; \ + *queue = ev; \ + \ if (ev->next) { \ - ev->next->prev = ev->prev; \ + ev->next->prev = &ev->next; \ } \ - ev->prev = NULL; \ + \ + 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, \ - "delete posted event %p", ev); + "update posted event %p", ev); \ + } +#define ngx_post_event(ev, queue) \ + \ + ngx_mutex_lock(ngx_posted_events_mutex); \ + ngx_locked_post_event(ev, queue); \ + ngx_mutex_unlock(ngx_posted_events_mutex); -void ngx_event_process_posted(ngx_cycle_t *cycle); -void ngx_wakeup_worker_thread(ngx_cycle_t *cycle); -extern ngx_thread_volatile ngx_event_t *ngx_posted_events; +#define ngx_delete_posted_event(ev) \ + \ + *(ev->prev) = ev->next; \ + \ + if (ev->next) { \ + ev->next->prev = ev->prev; \ + } \ + \ + ev->prev = NULL; \ + 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_thread_volatile ngx_event_t **posted); +void ngx_wakeup_worker_thread(ngx_cycle_t *cycle); + #if (NGX_THREADS) ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle); - -extern ngx_mutex_t *ngx_posted_events_mutex; #endif +extern ngx_thread_volatile ngx_event_t *ngx_posted_accept_events; +extern ngx_thread_volatile ngx_event_t *ngx_posted_events; + + #endif /* _NGX_EVENT_POSTED_H_INCLUDED_ */ |