2004-04-05 04:32:09 +08:00
|
|
|
|
2004-09-28 16:34:51 +08:00
|
|
|
/*
|
2004-09-30 00:00:49 +08:00
|
|
|
* Copyright (C) Igor Sysoev
|
2004-09-28 16:34:51 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2004-04-05 04:32:09 +08:00
|
|
|
#include <ngx_config.h>
|
|
|
|
#include <ngx_core.h>
|
|
|
|
#include <ngx_event.h>
|
|
|
|
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
ngx_thread_volatile ngx_event_t *ngx_posted_accept_events;
|
2004-04-05 04:32:09 +08:00
|
|
|
ngx_thread_volatile ngx_event_t *ngx_posted_events;
|
2004-06-28 02:01:57 +08:00
|
|
|
|
2004-04-05 04:32:09 +08:00
|
|
|
#if (NGX_THREADS)
|
|
|
|
ngx_mutex_t *ngx_posted_events_mutex;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
void
|
|
|
|
ngx_event_process_posted(ngx_cycle_t *cycle,
|
|
|
|
ngx_thread_volatile ngx_event_t **posted)
|
2004-04-05 04:32:09 +08:00
|
|
|
{
|
|
|
|
ngx_event_t *ev;
|
|
|
|
|
|
|
|
for ( ;; ) {
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
ev = (ngx_event_t *) *posted;
|
2004-04-05 04:32:09 +08:00
|
|
|
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"posted event %p", ev);
|
2004-04-05 04:32:09 +08:00
|
|
|
|
|
|
|
if (ev == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-07-02 23:54:34 +08:00
|
|
|
ngx_delete_posted_event(ev);
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
ev->handler(ev);
|
2004-04-05 04:32:09 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-11 22:07:14 +08:00
|
|
|
#if (NGX_THREADS) && !(NGX_WIN32)
|
2004-04-05 04:32:09 +08:00
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
void
|
|
|
|
ngx_wakeup_worker_thread(ngx_cycle_t *cycle)
|
2004-07-05 14:55:54 +08:00
|
|
|
{
|
2004-07-05 23:08:23 +08:00
|
|
|
ngx_int_t i;
|
2005-03-19 20:38:37 +08:00
|
|
|
#if 0
|
2004-07-05 23:08:23 +08:00
|
|
|
ngx_uint_t busy;
|
|
|
|
ngx_event_t *ev;
|
|
|
|
|
|
|
|
busy = 1;
|
|
|
|
|
|
|
|
if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (ev = (ngx_event_t *) ngx_posted_events; ev; ev = ev->next) {
|
|
|
|
if (*(ev->lock) == 0) {
|
|
|
|
busy = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ngx_mutex_unlock(ngx_posted_events_mutex);
|
|
|
|
|
|
|
|
if (busy) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2004-07-05 14:55:54 +08:00
|
|
|
|
|
|
|
for (i = 0; i < ngx_threads_n; i++) {
|
|
|
|
if (ngx_threads[i].state == NGX_THREAD_FREE) {
|
|
|
|
ngx_cond_signal(ngx_threads[i].cv);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
ngx_int_t
|
|
|
|
ngx_event_thread_process_posted(ngx_cycle_t *cycle)
|
2004-04-05 04:32:09 +08:00
|
|
|
{
|
2004-07-02 23:54:34 +08:00
|
|
|
ngx_event_t *ev;
|
2004-04-05 04:32:09 +08:00
|
|
|
|
2004-06-28 02:01:57 +08:00
|
|
|
for ( ;; ) {
|
|
|
|
|
|
|
|
ev = (ngx_event_t *) ngx_posted_events;
|
|
|
|
|
|
|
|
for ( ;; ) {
|
|
|
|
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"posted event %p", ev);
|
2004-06-28 02:01:57 +08:00
|
|
|
|
|
|
|
if (ev == NULL) {
|
|
|
|
return NGX_OK;
|
|
|
|
}
|
|
|
|
|
2004-06-29 00:05:02 +08:00
|
|
|
if (ngx_trylock(ev->lock) == 0) {
|
2004-06-28 02:01:57 +08:00
|
|
|
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"posted event %p is busy", ev);
|
2004-06-28 02:01:57 +08:00
|
|
|
|
|
|
|
ev = ev->next;
|
|
|
|
continue;
|
|
|
|
}
|
2004-04-05 04:32:09 +08:00
|
|
|
|
2004-07-07 14:15:04 +08:00
|
|
|
if (ev->lock != ev->own_lock) {
|
|
|
|
if (*(ev->own_lock)) {
|
|
|
|
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"the own lock of the posted event %p is busy", ev);
|
2004-07-07 14:15:04 +08:00
|
|
|
ngx_unlock(ev->lock);
|
|
|
|
ev = ev->next;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
*(ev->own_lock) = 1;
|
|
|
|
}
|
|
|
|
|
2004-07-02 23:54:34 +08:00
|
|
|
ngx_delete_posted_event(ev);
|
2004-06-28 02:01:57 +08:00
|
|
|
|
2004-07-02 13:47:00 +08:00
|
|
|
ev->locked = 1;
|
2004-06-28 02:01:57 +08:00
|
|
|
|
2004-07-02 23:54:34 +08:00
|
|
|
ev->ready |= ev->posted_ready;
|
|
|
|
ev->timedout |= ev->posted_timedout;
|
|
|
|
ev->pending_eof |= ev->posted_eof;
|
2004-11-26 00:17:31 +08:00
|
|
|
#if (NGX_HAVE_KQUEUE)
|
2004-07-02 23:54:34 +08:00
|
|
|
ev->kq_errno |= ev->posted_errno;
|
|
|
|
#endif
|
2004-07-05 23:08:23 +08:00
|
|
|
if (ev->posted_available) {
|
|
|
|
ev->available = ev->posted_available;
|
|
|
|
}
|
2004-07-02 23:54:34 +08:00
|
|
|
|
|
|
|
ev->posted_ready = 0;
|
|
|
|
ev->posted_timedout = 0;
|
|
|
|
ev->posted_eof = 0;
|
2004-11-26 00:17:31 +08:00
|
|
|
#if (NGX_HAVE_KQUEUE)
|
2004-07-02 23:54:34 +08:00
|
|
|
ev->posted_errno = 0;
|
2004-07-02 13:47:00 +08:00
|
|
|
#endif
|
2004-07-05 23:08:23 +08:00
|
|
|
ev->posted_available = 0;
|
2004-06-28 02:01:57 +08:00
|
|
|
|
2004-07-02 13:47:00 +08:00
|
|
|
ngx_mutex_unlock(ngx_posted_events_mutex);
|
2004-06-28 02:01:57 +08:00
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
ev->handler(ev);
|
2004-06-28 02:01:57 +08:00
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
ngx_mutex_lock(ngx_posted_events_mutex);
|
2004-06-28 02:01:57 +08:00
|
|
|
|
2004-07-02 13:47:00 +08:00
|
|
|
if (ev->locked) {
|
|
|
|
ngx_unlock(ev->lock);
|
2004-07-07 14:15:04 +08:00
|
|
|
|
|
|
|
if (ev->lock != ev->own_lock) {
|
|
|
|
ngx_unlock(ev->own_lock);
|
|
|
|
}
|
2004-07-02 13:47:00 +08:00
|
|
|
}
|
|
|
|
|
2004-07-07 00:12:16 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"posted event %p is done", ev);
|
2004-07-07 00:12:16 +08:00
|
|
|
|
2004-06-28 02:01:57 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2004-04-05 04:32:09 +08:00
|
|
|
}
|
|
|
|
|
2004-07-05 14:55:54 +08:00
|
|
|
#else
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
void
|
|
|
|
ngx_wakeup_worker_thread(ngx_cycle_t *cycle)
|
2004-07-05 14:55:54 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2004-04-05 04:32:09 +08:00
|
|
|
#endif
|