Browse Source
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2754 152afb58-edef-0310-8abb-c4023f1b3aa9svn/tags/lighttpd-1.4.27
11 changed files with 335 additions and 47 deletions
@ -0,0 +1,70 @@ |
|||
|
|||
SET(LIBEV_PATH "" CACHE PATH "Base path for include/ev.h and lib/libev*") |
|||
SET(LIBEV_INCLUDE_PATH "" CACHE PATH "Include path for ev.h") |
|||
SET(LIBEV_LIBDIR "" CACHE PATH "Path containing libev") |
|||
|
|||
IF(LIBEV_PATH) |
|||
SET(LIBEV_INCLUDE_PATH "${LIBEV_PATH}/include" CACHE PATH "Include path for ev.h" FORCE) |
|||
SET(LIBEV_LIBDIR "${LIBEV_PATH}/lib" CACHE PATH "Path containing libev" FORCE) |
|||
ENDIF(LIBEV_PATH) |
|||
|
|||
IF(LIBEV_INCLUDE_PATH) |
|||
INCLUDE_DIRECTORIES(${LIBEV_INCLUDE_PATH}) |
|||
ENDIF(LIBEV_INCLUDE_PATH) |
|||
|
|||
# Use cached result |
|||
IF(NOT LIBEV_FOUND) |
|||
UNSET(HAVE_EV_H) |
|||
UNSET(HAVE_LIBEV) |
|||
UNSET(HAVE_EV_H CACHE) |
|||
UNSET(HAVE_LIBEV CACHE) |
|||
UNSET(LIBEV_CFLAGS) |
|||
UNSET(LIBEV_LDFLAGS) |
|||
|
|||
IF(LIBEV_INCLUDE_PATH OR LIBEV_LIBDIR) |
|||
SET(CMAKE_REQUIRED_INCLUDES ${LIBEV_INCLUDE_PATH}) |
|||
# MESSAGE(STATUS "Looking for ev.h in ${CMAKE_REQUIRED_INCLUDES}") |
|||
CHECK_INCLUDE_FILES(ev.h HAVE_EV_H) |
|||
IF(HAVE_EV_H) |
|||
# MESSAGE(STATUS "Looking for lib ev in ${LIBEV_LIBDIR}") |
|||
CHECK_LIBRARY_EXISTS(ev ev_loop "${LIBEV_LIBDIR}" HAVE_LIBEV) |
|||
IF(HAVE_LIBEV) |
|||
SET(LIBEV_CFLAGS "" CACHE INTERNAL "") |
|||
SET(LIBEV_LDFLAGS "-L${LIBEV_LIBDIR} -lev" CACHE INTERNAL "") |
|||
SET(LIBEV_FOUND TRUE CACHE INTERNAL "Found libev" FORCE) |
|||
ELSE(HAVE_LIBEV) |
|||
MESSAGE(STATUS "Couldn't find lib ev in ${LIBEV_LIBDIR}") |
|||
ENDIF(HAVE_LIBEV) |
|||
ELSE(HAVE_EV_H) |
|||
MESSAGE(STATUS "Couldn't find <ev.h> in ${LIBEV_INCLUDE_PATH}") |
|||
ENDIF(HAVE_EV_H) |
|||
ELSE(LIBEV_INCLUDE_PATH OR LIBEV_LIBDIR) |
|||
pkg_check_modules(LIBEV libev) |
|||
IF(NOT LIBEV_FOUND) |
|||
# MESSAGE(STATUS "Looking for ev.h in ${CMAKE_REQUIRED_INCLUDES}") |
|||
CHECK_INCLUDE_FILES(ev.h HAVE_EV_H) |
|||
IF(HAVE_EV_H) |
|||
# MESSAGE(STATUS "Looking for lib ev") |
|||
CHECK_LIBRARY_EXISTS(ev ev_loop "" HAVE_LIBEV) |
|||
IF(HAVE_LIBEV) |
|||
SET(LIBEV_CFLAGS "" CACHE INTERNAL "") |
|||
SET(LIBEV_LDFLAGS "-lev" CACHE INTERNAL "") |
|||
SET(LIBEV_FOUND TRUE CACHE INTERNAL "Found libev" FORCE) |
|||
ELSE(HAVE_LIBEV) |
|||
MESSAGE(STATUS "Couldn't find lib ev") |
|||
ENDIF(HAVE_LIBEV) |
|||
ELSE(HAVE_EV_H) |
|||
MESSAGE(STATUS "Couldn't find <ev.h>") |
|||
ENDIF(HAVE_EV_H) |
|||
ENDIF(NOT LIBEV_FOUND) |
|||
ENDIF(LIBEV_INCLUDE_PATH OR LIBEV_LIBDIR) |
|||
|
|||
ENDIF(NOT LIBEV_FOUND) |
|||
|
|||
IF(NOT LIBEV_FOUND) |
|||
IF(LibEV_FIND_REQUIRED) |
|||
MESSAGE(FATAL_ERROR "Could not find libev") |
|||
ENDIF(LibEV_FIND_REQUIRED) |
|||
ENDIF(NOT LIBEV_FOUND) |
|||
|
|||
MARK_AS_ADVANCED(LIBEV_PATH LIBEV_INCLUDE_PATH LIBEV_LIBDIR) |
|||
@ -0,0 +1,168 @@ |
|||
#include "fdevent.h" |
|||
#include "buffer.h" |
|||
#include "log.h" |
|||
|
|||
#include <assert.h> |
|||
|
|||
#ifdef USE_LIBEV |
|||
static void io_watcher_cb(struct ev_loop *loop, ev_io *w, int revents) { |
|||
fdevents *ev = w->data; |
|||
fdnode *fdn = ev->fdarray[w->fd]; |
|||
int r = 0; |
|||
UNUSED(loop); |
|||
|
|||
if (revents & EV_READ) r |= FDEVENT_IN; |
|||
if (revents & EV_WRITE) r |= FDEVENT_OUT; |
|||
if (revents & EV_ERROR) r |= FDEVENT_ERR; |
|||
|
|||
switch (r = (*fdn->handler)(ev->srv, fdn->ctx, r)) { |
|||
case HANDLER_FINISHED: |
|||
case HANDLER_GO_ON: |
|||
case HANDLER_WAIT_FOR_EVENT: |
|||
case HANDLER_WAIT_FOR_FD: |
|||
break; |
|||
case HANDLER_ERROR: |
|||
/* should never happen */ |
|||
SEGFAULT(); |
|||
break; |
|||
default: |
|||
log_error_write(ev->srv, __FILE__, __LINE__, "d", r); |
|||
break; |
|||
} |
|||
} |
|||
|
|||
static void fdevent_libev_free(fdevents *ev) { |
|||
UNUSED(ev); |
|||
} |
|||
|
|||
static int fdevent_libev_event_del(fdevents *ev, int fde_ndx, int fd) { |
|||
fdnode *fdn; |
|||
ev_io *watcher; |
|||
|
|||
if (-1 == fde_ndx) return -1; |
|||
|
|||
fdn = ev->fdarray[fd]; |
|||
watcher = fdn->handler_ctx; |
|||
|
|||
if (!watcher) return -1; |
|||
|
|||
ev_io_stop(ev->libev_loop, watcher); |
|||
free(watcher); |
|||
fdn->handler_ctx = NULL; |
|||
|
|||
return -1; |
|||
} |
|||
|
|||
static int fdevent_libev_event_add(fdevents *ev, int fde_ndx, int fd, int events) { |
|||
fdnode *fdn = ev->fdarray[fd]; |
|||
ev_io *watcher = fdn->handler_ctx; |
|||
int ev_events = 0; |
|||
UNUSED(fde_ndx); |
|||
|
|||
if (events & FDEVENT_IN) ev_events |= EV_READ; |
|||
if (events & FDEVENT_OUT) ev_events |= EV_WRITE; |
|||
|
|||
if (!watcher) { |
|||
fdn->handler_ctx = watcher = calloc(1, sizeof(ev_io)); |
|||
assert(watcher); |
|||
|
|||
ev_io_init(watcher, io_watcher_cb, fd, ev_events); |
|||
watcher->data = ev; |
|||
ev_io_start(ev->libev_loop, watcher); |
|||
} else { |
|||
if ((watcher->events & ev_events) != ev_events) { |
|||
ev_io_stop(ev->libev_loop, watcher); |
|||
ev_io_set(watcher, watcher->fd, watcher->events | ev_events); |
|||
ev_io_start(ev->libev_loop, watcher); |
|||
} |
|||
} |
|||
|
|||
return fd; |
|||
} |
|||
|
|||
static void timeout_watcher_cb(struct ev_loop *loop, ev_timer *w, int revents) { |
|||
UNUSED(loop); |
|||
UNUSED(w); |
|||
UNUSED(revents); |
|||
} |
|||
|
|||
|
|||
static int fdevent_libev_poll(fdevents *ev, int timeout_ms) { |
|||
ev_timer timeout_watcher; |
|||
|
|||
ev_init(&timeout_watcher, timeout_watcher_cb); |
|||
ev_timer_set(&timeout_watcher, ((ev_tstamp) timeout_ms)/1000.0, 0.0); |
|||
ev_timer_start(ev->libev_loop, &timeout_watcher); |
|||
|
|||
ev_loop(ev->libev_loop, EVLOOP_ONESHOT); |
|||
|
|||
ev_timer_stop(ev->libev_loop, &timeout_watcher); |
|||
|
|||
return 0; |
|||
} |
|||
|
|||
static int fdevent_libev_event_get_revent(fdevents *ev, size_t ndx) { |
|||
UNUSED(ev); |
|||
UNUSED(ndx); |
|||
|
|||
return 0; |
|||
} |
|||
|
|||
static int fdevent_libev_event_get_fd(fdevents *ev, size_t ndx) { |
|||
UNUSED(ev); |
|||
UNUSED(ndx); |
|||
|
|||
return -1; |
|||
} |
|||
|
|||
static int fdevent_libev_event_next_fdndx(fdevents *ev, int ndx) { |
|||
UNUSED(ev); |
|||
UNUSED(ndx); |
|||
|
|||
return -1; |
|||
} |
|||
|
|||
static int fdevent_libev_reset(fdevents *ev) { |
|||
UNUSED(ev); |
|||
|
|||
ev_default_fork(); |
|||
|
|||
return 0; |
|||
} |
|||
|
|||
int fdevent_libev_init(fdevents *ev) { |
|||
ev->type = FDEVENT_HANDLER_LIBEV; |
|||
#define SET(x) \ |
|||
ev->x = fdevent_libev_##x; |
|||
|
|||
SET(free); |
|||
SET(poll); |
|||
SET(reset); |
|||
|
|||
SET(event_del); |
|||
SET(event_add); |
|||
|
|||
SET(event_next_fdndx); |
|||
SET(event_get_fd); |
|||
SET(event_get_revent); |
|||
|
|||
if (NULL == (ev->libev_loop = ev_default_loop(0))) { |
|||
log_error_write(ev->srv, __FILE__, __LINE__, "S", |
|||
"ev_default_loop failed , try to set server.event-handler = \"poll\" or \"select\""); |
|||
|
|||
return -1; |
|||
} |
|||
|
|||
return 0; |
|||
} |
|||
|
|||
#else |
|||
int fdevent_libev_init(fdevents *ev) { |
|||
UNUSED(ev); |
|||
|
|||
log_error_write(ev->srv, __FILE__, __LINE__, "S", |
|||
"libev not supported, try to set server.event-handler = \"poll\" or \"select\""); |
|||
|
|||
return -1; |
|||
} |
|||
#endif |
|||
Loading…
Reference in new issue