// $Id$
//
// Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Stefan Bund <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
/** \file
\brief Scheduler non-inline non-template implementation
- \idea Implement signal handling (See source for more discussion
- about this)
-
\idea Multithreading support: To support multithreading, the
static member Scheduler::instance() must return a thread-local
value (that is Scheduler::instance() must allocate one Scheduler
//#include "Scheduler.ih"
// Custom includes
+#include "../Utils/senfassert.hh"
#include <errno.h>
#include <sys/epoll.h>
#include <unistd.h>
#include <fcntl.h>
#include "../Utils/Exception.hh"
+#include "../Utils/Backtrace.hh"
static const int EPollInitialSize = 16;
eventTime_(0), eventEarly_(ClockService::milliseconds(11)), eventAdjust_(0)
{
if (epollFd_<0)
- throw SystemException(errno);
+ SENF_THROW_SYSTEM_EXCEPTION("::epoll_create()");
if (::pipe(sigpipe_) < 0)
- throw SystemException(errno);
+ SENF_THROW_SYSTEM_EXCEPTION("::pipe()");
int flags (::fcntl(sigpipe_[1],F_GETFL));
if (flags < 0)
- throw SystemException(errno);
+ SENF_THROW_SYSTEM_EXCEPTION("::fcntl(F_GETFL)");
flags |= O_NONBLOCK;
if (::fcntl(sigpipe_[1], F_SETFL, flags) < 0)
- throw SystemException(errno);
+ SENF_THROW_SYSTEM_EXCEPTION("::fcntl(F_SETFL)");
::epoll_event ev;
::memset(&ev, 0, sizeof(ev));
ev.events = EV_READ;
ev.data.fd = sigpipe_[0];
if (::epoll_ctl(epollFd_, EPOLL_CTL_ADD, sigpipe_[0], &ev) < 0)
- throw SystemException(errno);
+ SENF_THROW_SYSTEM_EXCEPTION("::epoll_ctl(EPOLL_CTL_ADD)");
}
prefix_ void senf::Scheduler::registerSignal(unsigned signal, SimpleCallback const & cb)
prefix_ void senf::Scheduler::do_add(int fd, FdCallback const & cb, int eventMask)
{
+ if (eventMask == 0)
+ return;
+
FdTable::iterator i (fdTable_.find(fd));
int action (EPOLL_CTL_MOD);
if (i == fdTable_.end()) {
action = EPOLL_CTL_ADD;
i = fdTable_.insert(std::make_pair(fd, EventSpec())).first;
}
+ else if (i->second.epollMask() == 0) {
+ action = EPOLL_CTL_ADD;
+ fdErase_.erase( std::remove(fdErase_.begin(), fdErase_.end(), unsigned(fd)),
+ fdErase_.end() );
+ }
if (eventMask & EV_READ) i->second.cb_read = cb;
if (eventMask & EV_PRIO) i->second.cb_prio = cb;
ev.events = i->second.epollMask();
ev.data.fd = fd;
- if (! i->second.file && epoll_ctl(epollFd_, action, fd, &ev) < 0) {
- if (errno == EPERM) {
- // Argh ... epoll does not support ordinary files :-( :-(
- i->second.file = true;
- ++ files_;
+ for (;;) {
+ if ( (!i->second.file) && (epoll_ctl(epollFd_, action, fd, &ev) < 0) ) {
+ switch (errno) {
+ case EPERM :
+ // Argh ... epoll does not support ordinary files :-( :-(
+ i->second.file = true;
+ ++ files_;
+ return;
+ case ENOENT :
+ action = EPOLL_CTL_ADD;
+ break;
+ default:
+ SENF_THROW_SYSTEM_EXCEPTION("::epoll_ctl()");
+ }
}
else
- throwErrno("::epoll_ctl()");
+ return;
}
}
prefix_ void senf::Scheduler::do_remove(int fd, int eventMask)
{
+ if (eventMask == 0)
+ return;
+
FdTable::iterator i (fdTable_.find(fd));
if (i == fdTable_.end())
return;
fdErase_.push_back(fd);
}
- if (! file && epoll_ctl(epollFd_, action, fd, &ev) < 0)
- throwErrno("::epoll_ctl()");
+ if (! file && epoll_ctl(epollFd_, action, fd, &ev) < 0 && errno != ENOENT)
+ SENF_THROW_SYSTEM_EXCEPTION("::epoll_ctl()");
if (file)
-- files_;
}
if (signal == SIGCHLD)
sa.sa_flags |= SA_NOCLDSTOP;
if (::sigaction(signal, &sa, 0) < 0)
- throw SystemException(errno);
+ SENF_THROW_SYSTEM_EXCEPTION("::sigaction()");
}
}
}
///\todo Handle more than one epoll_event per call
struct epoll_event ev;
- ::sigprocmask(SIG_UNBLOCK, &sigset_, 0);
- int events (epoll_wait(epollFd_, &ev, 1, timeout));
- ::sigprocmask(SIG_BLOCK, &sigset_, 0);
+ if (::sigprocmask(SIG_UNBLOCK, &sigset_, 0) < 0)
+ SENF_THROW_SYSTEM_EXCEPTION("::sigprocmask(SIG_UNBLOCK)");
+ int events (::epoll_wait(epollFd_, &ev, 1, timeout));
+ if (::sigprocmask(SIG_BLOCK, &sigset_, 0) < 0)
+ SENF_THROW_SYSTEM_EXCEPTION("::sigprocmask(SIG_BLOCK)");
if (events<0)
if (errno != EINTR)
- throw SystemException(errno);
+ SENF_THROW_SYSTEM_EXCEPTION("::epoll_wait()");
eventTime_ = ClockService::now();
if (mask & EPOLLERR) extraFlags |= EV_ERR;
if (mask & EPOLLIN) {
- BOOST_ASSERT(spec.cb_read);
+ SENF_ASSERT(spec.cb_read);
spec.cb_read(EventId(EV_READ | extraFlags));
}
else if (mask & EPOLLPRI) {
- BOOST_ASSERT(spec.cb_prio);
+ SENF_ASSERT(spec.cb_prio);
spec.cb_prio(EventId(EV_PRIO | extraFlags));
}
else if (mask & EPOLLOUT) {
- BOOST_ASSERT(spec.cb_write);
+ SENF_ASSERT(spec.cb_write);
spec.cb_write(EventId(EV_WRITE | extraFlags));
}
else {
///////////////////////////////////////////////////////////////////////////
// senf::SchedulerLogTimeSource
-prefix_ boost::posix_time::ptime senf::SchedulerLogTimeSource::operator()()
+prefix_ senf::log::time_type senf::SchedulerLogTimeSource::operator()()
const
{
- return ClockService::abstime(Scheduler::instance().eventTime());
+ return Scheduler::instance().eventTime();
}
///////////////////////////////cc.e////////////////////////////////////////
projects / senf.git / blobdiff