Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nginx-0.0.2-2004-02-11-10:19:26 import

Browse source
This commit is contained in:
Igor Sysoev 2004-02-11 07:19:26 +00:00
parent b1c248122c
commit 9ce8a4a22e
7 changed files with 37 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
auto/os/linux
View file

@ -21,7 +21,6 @@ ngx_func_test="int efd = 0, fd = 1, n;
if [ $ngx_found = yes ]; then if [ $ngx_found = yes ]; then
have=HAVE_EPOLL . auto/have have=HAVE_EPOLL . auto/have
have=HAVE_CLEAR_EVENT . auto/have
CORE_SRCS="$CORE_SRCS $EPOLL_SRCS" CORE_SRCS="$CORE_SRCS $EPOLL_SRCS"
EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE" EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE"
EVENT_FOUND=YES EVENT_FOUND=YES

99
src/event/modules/ngx_epoll_module.c
View file

@ -111,8 +111,8 @@ ngx_event_module_t ngx_epoll_module_ctx = {
ngx_epoll_del_event, /* delete an event */ ngx_epoll_del_event, /* delete an event */
ngx_epoll_add_event, /* enable an event */ ngx_epoll_add_event, /* enable an event */
ngx_epoll_del_event, /* disable an event */ ngx_epoll_del_event, /* disable an event */
NULL, /* add an connection */ ngx_epoll_add_connection, /* add an connection */
NULL, /* delete an connection */ ngx_epoll_del_connection, /* delete an connection */
ngx_epoll_process_events, /* process the events */ ngx_epoll_process_events, /* process the events */
ngx_epoll_init, /* init the events */ ngx_epoll_init, /* init the events */
ngx_epoll_done, /* done the events */ ngx_epoll_done, /* done the events */
@ -167,11 +167,7 @@ static int ngx_epoll_init(ngx_cycle_t *cycle)
ngx_event_actions = ngx_epoll_module_ctx.actions; ngx_event_actions = ngx_epoll_module_ctx.actions;
#if (HAVE_CLEAR_EVENT) ngx_event_flags = NGX_USE_EDGE_EVENT;
ngx_event_flags = NGX_USE_CLEAR_EVENT;
#else
ngx_event_flags = NGX_USE_LEVEL_EVENT;
#endif
return NGX_OK; return NGX_OK;
} }
@ -195,53 +191,33 @@ static void ngx_epoll_done(ngx_cycle_t *cycle)
static int ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags) static int ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags)
{ {
int op, prev;
ngx_event_t *e;
ngx_connection_t *c;
struct epoll_event ee; struct epoll_event ee;
ngx_connection_t *c;
c = ev->data; c = ev->data;
#if (NGX_READ_EVENT != EPOLLIN) || (NGX_WRITE_EVENT != EPOLLOUT)
if (event == NGX_READ_EVENT) { if (event == NGX_READ_EVENT) {
e = c->write;
prev = EPOLLOUT;
#if (NGX_READ_EVENT != EPOLLIN)
event = EPOLLIN; event = EPOLLIN;
#endif
} else { } else {
e = c->read;
prev = EPOLLIN;
#if (NGX_WRITE_EVENT != EPOLLOUT)
event = EPOLLOUT; event = EPOLLOUT;
}
#endif #endif
}
if (e->active) { ee.events = event|EPOLLET;
op = EPOLL_CTL_MOD; ee.data.ptr = (void *) ((uintptr_t) c | c->read->instance);
event |= prev;
} else { ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
op = EPOLL_CTL_ADD; "epoll add event: fd:%d ev:%08X", c->fd, ee.events);
}
ee.events = event | flags; if (epoll_ctl(ep, EPOLL_CTL_ADD, c->fd, &ee) == -1) {
ee.data.ptr = (void *) ((uintptr_t) c | ev->instance); ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
"epoll_ctl(EPOLL_CTL_MOD, %d) failed", c->fd);
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
"epoll add event: fd:%d op:%d ev:%08X",
c->fd, op, ee.events);
if (epoll_ctl(ep, op, c->fd, &ee) == -1) {
ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
"epoll_ctl(%d, %d) failed", op, c->fd);
return NGX_ERROR; return NGX_ERROR;
} }
ev->active = 1; ev->active = 1;
#if 0
ev->oneshot = (flags & NGX_ONESHOT_EVENT) ? 1 : 0;
#endif
return NGX_OK; return NGX_OK;
} }
@ -249,51 +225,20 @@ static int ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags)
static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags) static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
{ {
int op, prev;
ngx_event_t *e;
ngx_connection_t *c;
struct epoll_event ee; struct epoll_event ee;
ngx_connection_t *c;
/*
* when the file descriptor is closed the epoll automatically deletes
* it from its queue so we do not need to delete explicity the event
* before the closing the file descriptor.
*/
if (flags & NGX_CLOSE_EVENT) {
ev->active = 0;
return NGX_OK;
}
c = ev->data; c = ev->data;
if (event == NGX_READ_EVENT) { ee.events = 0;
e = c->write; ee.data.ptr = NULL;
prev = EPOLLOUT;
} else { ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
e = c->read; "epoll del event: fd:%d", c->fd);
prev = EPOLLIN;
}
if (e->active) { if (epoll_ctl(ep, EPOLL_CTL_DEL, c->fd, &ee) == -1) {
op = EPOLL_CTL_MOD; ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
ee.events = prev | flags; "epoll_ctl(EPOLL_CTL_MOD, %d) failed", c->fd);
ee.data.ptr = (void *) ((uintptr_t) c | ev->instance);
} else {
op = EPOLL_CTL_DEL;
ee.events = 0;
ee.data.ptr = NULL;
}
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
"epoll del event: fd:%d op:%d ev:%08X",
c->fd, op, ee.events);
if (epoll_ctl(ep, op, c->fd, &ee) == -1) {
ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
"epoll_ctl(%d, %d) failed", op, c->fd);
return NGX_ERROR; return NGX_ERROR;
} }
@ -303,7 +248,6 @@ static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
} }
#if 0
static int ngx_epoll_add_connection(ngx_connection_t *c) static int ngx_epoll_add_connection(ngx_connection_t *c)
{ {
struct epoll_event ee; struct epoll_event ee;
@ -334,7 +278,6 @@ static int ngx_epoll_del_connection(ngx_connection_t *c)
return NGX_OK; return NGX_OK;
} }
#endif
int ngx_epoll_process_events(ngx_log_t *log) int ngx_epoll_process_events(ngx_log_t *log)

2
src/event/modules/ngx_kqueue_module.c
View file

@ -254,7 +254,7 @@ static int ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
} }
/* /*
* when the file descriptor is closed the kqueue automatically deletes * when the file descriptor is closed a kqueue automatically deletes
* its filters so we do not need to delete explicity the event * its filters so we do not need to delete explicity the event
* before the closing the file descriptor. * before the closing the file descriptor.
*/ */

38
src/event/ngx_event.h
View file

@ -176,19 +176,18 @@ extern ngx_event_actions_t ngx_event_actions;
/* /*
* The event filter requires to read/write the whole data - * The event filter requires to read/write the whole data -
* select, poll, /dev/poll, kqueue, epoll. * select, poll, /dev/poll, kqueue.
*/ */
#define NGX_USE_LEVEL_EVENT 0x00000001 #define NGX_USE_LEVEL_EVENT 0x00000001
/* /*
* The event filter is deleted after a notification without an additional * The event filter is deleted after a notification without an additional
* syscall - select, poll, kqueue, epoll. * syscall - select, poll, kqueue.
*/ */
#define NGX_USE_ONESHOT_EVENT 0x00000002 #define NGX_USE_ONESHOT_EVENT 0x00000002
/* /*
* The event filter notifies only the changes and an initial level - * The event filter notifies only the changes and an initial level - kqueue.
* kqueue, epoll.
*/ */
#define NGX_USE_CLEAR_EVENT 0x00000004 #define NGX_USE_CLEAR_EVENT 0x00000004
@ -206,7 +205,7 @@ extern ngx_event_actions_t ngx_event_actions;
/* /*
* The event filter notifies only the changes (the edges) * The event filter notifies only the changes (the edges)
* but not an initial level - early epoll patches. * but not an initial level - epoll.
*/ */
#define NGX_USE_EDGE_EVENT 0x00000020 #define NGX_USE_EDGE_EVENT 0x00000020
@ -276,27 +275,6 @@ extern ngx_event_actions_t ngx_event_actions;
#define NGX_DISABLE_EVENT EV_DISABLE #define NGX_DISABLE_EVENT EV_DISABLE
#elif (HAVE_DEVPOLL)
#define NGX_READ_EVENT POLLIN
#define NGX_WRITE_EVENT POLLOUT
#define NGX_LEVEL_EVENT 0
#elif (HAVE_EPOLL)
#define NGX_READ_EVENT EPOLLIN
#define NGX_WRITE_EVENT EPOLLOUT
#define NGX_LEVEL_EVENT 0
#define NGX_CLEAR_EVENT EPOLLET
#define NGX_ONESHOT_EVENT 0x70000000
#if 0
#define NGX_ONESHOT_EVENT EPOLLONESHOT
#endif
#elif (HAVE_POLL) #elif (HAVE_POLL)
#define NGX_READ_EVENT POLLIN #define NGX_READ_EVENT POLLIN
@ -306,6 +284,14 @@ extern ngx_event_actions_t ngx_event_actions;
#define NGX_ONESHOT_EVENT 1 #define NGX_ONESHOT_EVENT 1
#elif (HAVE_DEVPOLL)
#define NGX_READ_EVENT POLLIN
#define NGX_WRITE_EVENT POLLOUT
#define NGX_LEVEL_EVENT 0
#else /* select */ #else /* select */
#define NGX_READ_EVENT 0 #define NGX_READ_EVENT 0

41
src/event/ngx_event_close.c
View file

@ -1,41 +0,0 @@
#include <ngx_config.h>
#include <ngx_core.h>
#include <ngx_types.h>
#include <ngx_connection.h>
#include <ngx_event.h>
#include <ngx_event_timer.h>
#include <ngx_event_close.h>
int ngx_event_close_connection(ngx_event_t *ev)
{
int rc;
ngx_connection_t *c = (ngx_connection_t *) ev->data;
ngx_log_debug(c->log, "close connection: %d" _ c->fd);
ngx_assert((c->fd != -1), return NGX_ERROR, c->log,
"ngx_event_close: already closed");
if (c->read->timer_set) {
ngx_del_timer(c->read);
}
if (c->write->timer_set) {
ngx_del_timer(c->write);
}
ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
if ((rc = ngx_close_socket(c->fd)) == -1)
ngx_log_error(NGX_LOG_ALERT, c->log, ngx_socket_errno,
"ngx_event_close: close failed");
c->fd = -1;
ngx_destroy_pool(c->pool);
return rc;
}

10
src/event/ngx_event_close.h
View file

@ -1,10 +0,0 @@
#ifndef _NGX_EVENT_CLOSE_H_INCLUDED_
#define _NGX_EVENT_CLOSE_H_INCLUDED_
#include <ngx_event.h>
int ngx_event_close_connection(ngx_event_t *ev);
#endif /* _NGX_EVENT_CLOSE_H_INCLUDED_ */

6
src/http/ngx_http_request.c
View file

@ -84,7 +84,7 @@ void ngx_http_init_connection(ngx_connection_t *c)
rev = c->read; rev = c->read;
rev->event_handler = ngx_http_init_request; rev->event_handler = ngx_http_init_request;
/* STUB: epoll edge */ c->write->event_handler = ngx_http_empty_handler; /* STUB: epoll */ c->write->event_handler = ngx_http_empty_handler;
if (rev->ready) { if (rev->ready) {
/* deferred accept, aio, iocp, epoll */ /* deferred accept, aio, iocp, epoll */
@ -1180,8 +1180,6 @@ static void ngx_http_set_keepalive(ngx_http_request_t *r)
} }
h = c->buffer; h = c->buffer;
wev = c->write;
wev->event_handler = ngx_http_empty_handler;
if (h->pos < h->last) { if (h->pos < h->last) {
@ -1216,6 +1214,8 @@ static void ngx_http_set_keepalive(ngx_http_request_t *r)
h->pos = h->last = h->start; h->pos = h->last = h->start;
rev->event_handler = ngx_http_keepalive_handler; rev->event_handler = ngx_http_keepalive_handler;
wev = c->write;
wev->event_handler = ngx_http_empty_handler;
if (wev->active) { if (wev->active) {
if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) {