// $Id$
//
-// Copyright (C) 2009
+// Copyright (C) 2009
// 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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+// http://senf.berlios.de/license.html
//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on,
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V.
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+// Stefan Bund <g0dil@berlios.de>
/** \file
\brief TimerSource non-inline non-template implementation */
// Custom includes
#include "IdleEvent.hh"
-#ifdef HAVE_TIMERFD
-#include <sys/timerfd.h>
+#ifdef HAVE_TIMERFD_CREATE
+#include TIMERFD_H_PATH
#endif
+#include "senf/Utils/IgnoreValue.hh"
//#include "TimerSource.mpp"
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::scheduler::detail::TimerSource
prefix_ senf::scheduler::detail::TimerSource::~TimerSource()
{}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::scheduler::detail::POSIXTimerSource
prefix_ senf::scheduler::detail::POSIXTimerSource::POSIXTimerSource()
{
if (pipe(timerPipe_) < 0)
SENF_THROW_SYSTEM_EXCEPTION("pipe()");
- senf::scheduler::detail::FdManager::instance().set(
- timerPipe_[0], detail::FdManager::EV_READ, this);
-
+ FdManager::instance().set( timerPipe_[0], FdManager::EV_READ, this);
+
sigemptyset(&sigSet_);
sigaddset(&sigSet_, SIGALRM);
sigprocmask(SIG_BLOCK, &sigSet_, 0);
timer_delete(timerId_);
::signal(SIGALRM, SIG_IGN);
sigprocmask(SIG_UNBLOCK, &sigSet_, 0);
- senf::scheduler::detail::FdManager::instance().remove(timerPipe_[0]);
+ FdManager::instance().remove(timerPipe_[0]);
close(timerPipe_[0]);
close(timerPipe_[1]);
}
if (siginfo->si_value.sival_ptr == 0)
return;
static char data = '\xD0';
- write(static_cast<POSIXTimerSource*>(siginfo->si_value.sival_ptr)->timerPipe_[1],
- &data, sizeof(data));
+ // If the write fails there's not much we can do anyways ...
+ senf::IGNORE( write(static_cast<POSIXTimerSource*>(siginfo->si_value.sival_ptr)->timerPipe_[1],
+ &data, sizeof(data)) );
}
prefix_ void senf::scheduler::detail::POSIXTimerSource::signal(int events)
{
char data;
- read(timerPipe_[0], &data, sizeof(data));
+ // This should never fail since we are reading a single character from a signaled
+ // filedescriptor
+ senf::IGNORE( read(timerPipe_[0], &data, sizeof(data)) );
timeoutEnabled_ = false;
}
SENF_THROW_SYSTEM_EXCEPTION("timer_settime()");
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::scheduler::detail::PollTimerSource
prefix_ void senf::scheduler::detail::PollTimerSource::timeout(ClockService::clock_type timeout)
prefix_ void senf::scheduler::detail::PollTimerSource::disable()
{}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::scheduler::detail::TimerFDTimerSource
-#ifdef HAVE_TIMERFD
+#ifdef HAVE_TIMERFD_CREATE
prefix_ senf::scheduler::detail::TimerFDTimerSource::TimerFDTimerSource()
: timerfd_ (-1), timeoutEnabled_ (false), timeout_ (0)
{
timerfd_ = timerfd_create(CLOCK_MONOTONIC, 0);
if (timerfd_ < 0)
SENF_THROW_SYSTEM_EXCEPTION("timerfd_create()");
- senf::scheduler::detail::FdManager::instance().set(
- timerfd_, detail::FdManager::EV_READ, this);
+ FdManager::instance().set( timerfd_, FdManager::EV_READ, this);
}
prefix_ senf::scheduler::detail::TimerFDTimerSource::~TimerFDTimerSource()
{
- senf::scheduler::detail::FdManager::instance().remove(timerfd_);
+ FdManager::instance().remove(timerfd_);
close(timerfd_);
}
prefix_ void senf::scheduler::detail::TimerFDTimerSource::signal(int events)
{
uint64_t expirations (0);
- read(timerfd_, &expirations, sizeof(expirations));
+ // We ignore the return value since we ignore the value read anyways
+ senf::IGNORE( read(timerfd_, &expirations, sizeof(expirations)) );
}
prefix_ void senf::scheduler::detail::TimerFDTimerSource::reschedule()
}
#endif
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
//#include "TimerSource.mpp"
-\f
+
// Local Variables:
// mode: c++
// fill-column: 100
projects / senf.git / blobdiff