ngx_epoll_del_event, /* delete an event */
ngx_epoll_add_event, /* enable an event */
ngx_epoll_del_event, /* disable an event */
- NULL, /* add an connection */
- NULL, /* delete an connection */
+ ngx_epoll_add_connection, /* add an connection */
+ ngx_epoll_del_connection, /* delete an connection */
ngx_epoll_process_events, /* process the events */
ngx_epoll_init, /* init the events */
ngx_epoll_done, /* done the events */
ngx_event_actions = ngx_epoll_module_ctx.actions;
-#if (HAVE_CLEAR_EVENT)
- ngx_event_flags = NGX_USE_CLEAR_EVENT;
-#else
- ngx_event_flags = NGX_USE_LEVEL_EVENT;
-#endif
+ ngx_event_flags = NGX_USE_EDGE_EVENT;
return NGX_OK;
}
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;
+ ngx_connection_t *c;
c = ev->data;
+#if (NGX_READ_EVENT != EPOLLIN) || (NGX_WRITE_EVENT != EPOLLOUT)
if (event == NGX_READ_EVENT) {
- e = c->write;
- prev = EPOLLOUT;
-#if (NGX_READ_EVENT != EPOLLIN)
event = EPOLLIN;
-#endif
} else {
- e = c->read;
- prev = EPOLLIN;
-#if (NGX_WRITE_EVENT != EPOLLOUT)
event = EPOLLOUT;
-#endif
- }
-
- if (e->active) {
- op = EPOLL_CTL_MOD;
- event |= prev;
-
- } else {
- op = EPOLL_CTL_ADD;
}
+#endif
- ee.events = event | flags;
- ee.data.ptr = (void *) ((uintptr_t) c | ev->instance);
+ ee.events = event|EPOLLET;
+ ee.data.ptr = (void *) ((uintptr_t) c | c->read->instance);
- ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
- "epoll add event: fd:%d op:%d ev:%08X",
- c->fd, op, ee.events);
+ ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+ "epoll add event: fd:%d ev:%08X", c->fd, 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);
+ if (epoll_ctl(ep, EPOLL_CTL_ADD, c->fd, &ee) == -1) {
+ ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
+ "epoll_ctl(EPOLL_CTL_MOD, %d) failed", c->fd);
return NGX_ERROR;
}
ev->active = 1;
-#if 0
- ev->oneshot = (flags & NGX_ONESHOT_EVENT) ? 1 : 0;
-#endif
return NGX_OK;
}
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;
-
- /*
- * 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;
- }
+ ngx_connection_t *c;
c = ev->data;
- if (event == NGX_READ_EVENT) {
- e = c->write;
- prev = EPOLLOUT;
+ ee.events = 0;
+ ee.data.ptr = NULL;
- } else {
- e = c->read;
- prev = EPOLLIN;
- }
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+ "epoll del event: fd:%d", c->fd);
- if (e->active) {
- op = EPOLL_CTL_MOD;
- ee.events = prev | flags;
- 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);
+ if (epoll_ctl(ep, EPOLL_CTL_DEL, c->fd, &ee) == -1) {
+ ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
+ "epoll_ctl(EPOLL_CTL_MOD, %d) failed", c->fd);
return NGX_ERROR;
}
}
-#if 0
static int ngx_epoll_add_connection(ngx_connection_t *c)
{
struct epoll_event ee;
return NGX_OK;
}
-#endif
int ngx_epoll_process_events(ngx_log_t *log)
/*
* 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
/*
* 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
/*
- * The event filter notifies only the changes and an initial level -
- * kqueue, epoll.
+ * The event filter notifies only the changes and an initial level - kqueue.
*/
#define NGX_USE_CLEAR_EVENT 0x00000004
/*
* 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_DISABLE_EVENT EV_DISABLE
-#elif (HAVE_DEVPOLL)
+#elif (HAVE_POLL)
#define NGX_READ_EVENT POLLIN
#define NGX_WRITE_EVENT POLLOUT
#define NGX_LEVEL_EVENT 0
+#define NGX_ONESHOT_EVENT 1
-#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_DEVPOLL)
#define NGX_READ_EVENT POLLIN
#define NGX_WRITE_EVENT POLLOUT
#define NGX_LEVEL_EVENT 0
-#define NGX_ONESHOT_EVENT 1
#else /* select */
+++ /dev/null
-
-#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;
-}
projects / nginx.git / commitdiff