///////////////////////////////cc.p////////////////////////////////////////
prefix_ senf::Scheduler::Scheduler()
- : timerIdCounter_(0), epollFd_ (epoll_create(EPollInitialSize)), terminate_(false),
+ : files_(0), timerIdCounter_(0), epollFd_ (epoll_create(EPollInitialSize)), terminate_(false),
eventTime_(0), eventEarly_(ClockService::milliseconds(11)), eventAdjust_(0)
{
if (epollFd_<0)
ev.events = i->second.epollMask();
ev.data.fd = fd;
- if (epoll_ctl(epollFd_, action, fd, &ev)<0)
- throw SystemException(errno);
+ 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_;
+ }
+ else
+ throwErrno("::epoll_ctl()");
+ }
}
prefix_ void senf::Scheduler::do_remove(int fd, int eventMask)
ev.data.fd = fd;
int action (EPOLL_CTL_MOD);
+ bool file (i->second.file);
if (ev.events==0) {
action = EPOLL_CTL_DEL;
fdTable_.erase(i);
}
- if (epoll_ctl(epollFd_, action, fd, &ev)<0)
- throw SystemException(errno);
+ if (! file && epoll_ctl(epollFd_, action, fd, &ev) < 0)
+ throwErrno("::epoll_ctl()");
+ if (file)
+ -- files_;
}
prefix_ void senf::Scheduler::registerSigHandlers()
// queue. Since signals are only unblocked during epoll_wait, we even wouldn't need to
// synchronize access to that queue any further.
- ::write(instance().sigpipe_[1], siginfo, sizeof(siginfo));
+ ::write(instance().sigpipe_[1], siginfo, sizeof(*siginfo));
// We ignore errors. The file handle is set to non-blocking IO. If any failure occurs (pipe
// full), the signal will be dropped. That's like kernel signal handling which may also drop
}
int timeout (-1);
- if (timerQueue_.empty()) {
- if (fdTable_.empty())
- break;
- }
+ if (files_ > 0)
+ timeout = 0;
else {
- ClockService::clock_type delta (
- (timerQueue_.top()->second.timeout - eventTime_ + eventAdjust_)/1000000UL);
- timeout = delta < 0 ? 0 : delta;
+ if (timerQueue_.empty()) {
+ if (fdTable_.empty())
+ break;
+ }
+ else {
+ ClockService::clock_type delta (
+ (timerQueue_.top()->second.timeout - eventTime_ + eventAdjust_)/1000000UL);
+ timeout = delta < 0 ? 0 : delta;
+ }
}
///\todo Handle more than one epoll_event per call
// Check the signal queue
if (ev.data.fd == sigpipe_[0]) {
::siginfo_t siginfo;
- if (::read(sigpipe_[0], &siginfo, sizeof(siginfo)) < int(sizeof(siginfo)))
+ if (::read(sigpipe_[0], &siginfo, sizeof(siginfo)) < int(sizeof(siginfo))) {
// We ignore truncated records which may only occur if the signal
// queue became filled up
+ SENF_LOG((senf::log::IMPORTANT)("Truncated signal record!"));
continue;
+ }
if (siginfo.si_signo < int(sigHandlers_.size()) && sigHandlers_[siginfo.si_signo])
sigHandlers_[siginfo.si_signo]();
continue;
}
- FdTable::iterator i = fdTable_.find(ev.data.fd);
- BOOST_ASSERT (i != fdTable_.end() );
- EventSpec spec (i->second);
+ 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);
- unsigned extraFlags (0);
- if (ev.events & EPOLLHUP) extraFlags |= EV_HUP;
- if (ev.events & EPOLLERR) extraFlags |= EV_ERR;
-
- if (ev.events & EPOLLIN) {
- BOOST_ASSERT(spec.cb_read);
- spec.cb_read(EventId(EV_READ | extraFlags));
- }
- else if (ev.events & EPOLLPRI) {
- BOOST_ASSERT(spec.cb_prio);
- spec.cb_prio(EventId(EV_PRIO | extraFlags));
- }
- else if (ev.events & EPOLLOUT) {
- BOOST_ASSERT(spec.cb_write);
- spec.cb_write(EventId(EV_WRITE | extraFlags));
- }
- else {
- // This branch is only taken, if HUP or ERR is signaled but none of IN/OUT/PRI.
- // In this case we will signal all registered callbacks. The callbacks must be
- // prepared to be called multiple times if they are registered to more than
- // one event.
- if (spec.cb_write)
- spec.cb_write(EventId(extraFlags));
- if (spec.cb_prio)
- spec.cb_prio(EventId(extraFlags));
- if (spec.cb_read)
- spec.cb_read(EventId(extraFlags));
+ if (! (spec.file || i->first == ev.data.fd))
+ continue;
+
+ if (events & EPOLLHUP) extraFlags |= EV_HUP;
+ if (events & EPOLLERR) extraFlags |= EV_ERR;
+
+ if (events & EPOLLIN) {
+ BOOST_ASSERT(spec.cb_read);
+ spec.cb_read(EventId(EV_READ | extraFlags));
+ }
+ else if (events & EPOLLPRI) {
+ BOOST_ASSERT(spec.cb_prio);
+ spec.cb_prio(EventId(EV_PRIO | extraFlags));
+ }
+ else if (events & EPOLLOUT) {
+ BOOST_ASSERT(spec.cb_write);
+ spec.cb_write(EventId(EV_WRITE | extraFlags));
+ }
+ else {
+ // This branch is only taken, if HUP or ERR is signaled but none of IN/OUT/PRI.
+ // In this case we will signal all registered callbacks. The callbacks must be
+ // prepared to be called multiple times if they are registered to more than
+ // one event.
+ if (spec.cb_write)
+ spec.cb_write(EventId(extraFlags));
+ if (spec.cb_prio)
+ spec.cb_prio(EventId(extraFlags));
+ if (spec.cb_read)
+ spec.cb_read(EventId(extraFlags));
+ }
}
}
}
projects / senf.git / blobdiff