// $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>
eventTime_(0), eventEarly_(ClockService::milliseconds(11)), eventAdjust_(0)
{
if (epollFd_<0)
- throw SystemException(errno);
+ throwErrno();
if (::pipe(sigpipe_) < 0)
- throw SystemException(errno);
+ throwErrno();
int flags (::fcntl(sigpipe_[1],F_GETFL));
if (flags < 0)
- throw SystemException(errno);
+ throwErrno();
flags |= O_NONBLOCK;
if (::fcntl(sigpipe_[1], F_SETFL, flags) < 0)
- throw SystemException(errno);
+ throwErrno();
::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);
+ throwErrno();
}
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;
}
+ 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;
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;
bool file (i->second.file);
if (ev.events==0) {
action = EPOLL_CTL_DEL;
- fdTable_.erase(i);
+ fdErase_.push_back(fd);
}
if (! file && epoll_ctl(epollFd_, action, fd, &ev) < 0)
prefix_ void senf::Scheduler::registerSigHandlers()
{
- for (unsigned signal; signal < sigHandlers_.size(); ++signal)
+ for (unsigned signal (1); signal < sigHandlers_.size(); ++signal) {
if (sigHandlers_[signal]) {
struct ::sigaction sa;
sa.sa_sigaction = & Scheduler::sigHandler;
if (signal == SIGCHLD)
sa.sa_flags |= SA_NOCLDSTOP;
if (::sigaction(signal, &sa, 0) < 0)
- throw SystemException(errno);
+ throwErrno();
}
+ }
}
prefix_ void senf::Scheduler::sigHandler(int signal, ::siginfo_t * siginfo, void *)
timerQueue_.pop();
}
+ for (FdEraseList::iterator i (fdErase_.begin()); i != fdErase_.end(); ++i)
+ fdTable_.erase(*i);
+ fdErase_.clear();
+
int timeout (-1);
if (files_ > 0)
timeout = 0;
if (events<0)
if (errno != EINTR)
- throw SystemException(errno);
+ throwErrno();
eventTime_ = ClockService::now();
timerMap_.erase(i);
}
- if (events <= 0)
- continue;
-
// Check the signal queue
- if (ev.data.fd == sigpipe_[0]) {
+ if (events > 0 && ev.data.fd == sigpipe_[0]) {
::siginfo_t siginfo;
if (::read(sigpipe_[0], &siginfo, sizeof(siginfo)) < int(sizeof(siginfo))) {
// We ignore truncated records which may only occur if the signal
}
for (FdTable::iterator i = fdTable_.begin(); i != fdTable_.end(); ++i) {
- EventSpec spec (i->second);
- unsigned extraFlags (0);
- unsigned events (spec.file ? spec.epollMask() : ev.events);
+ EventSpec & spec (i->second);
- if (! (spec.file || i->first == ev.data.fd))
+ if (! (spec.file || (events > 0 && i->first == ev.data.fd)))
continue;
- if (events & EPOLLHUP) extraFlags |= EV_HUP;
- if (events & EPOLLERR) extraFlags |= EV_ERR;
+ unsigned extraFlags (0);
+ unsigned mask (spec.file ? spec.epollMask() : ev.events);
+
+ if (mask & EPOLLHUP) extraFlags |= EV_HUP;
+ if (mask & EPOLLERR) extraFlags |= EV_ERR;
- if (events & EPOLLIN) {
- BOOST_ASSERT(spec.cb_read);
+ if (mask & EPOLLIN) {
+ SENF_ASSERT(spec.cb_read);
spec.cb_read(EventId(EV_READ | extraFlags));
}
- else if (events & EPOLLPRI) {
- BOOST_ASSERT(spec.cb_prio);
+ else if (mask & EPOLLPRI) {
+ SENF_ASSERT(spec.cb_prio);
spec.cb_prio(EventId(EV_PRIO | extraFlags));
}
- else if (events & EPOLLOUT) {
- BOOST_ASSERT(spec.cb_write);
+ else if (mask & EPOLLOUT) {
+ SENF_ASSERT(spec.cb_write);
spec.cb_write(EventId(EV_WRITE | extraFlags));
}
else {