//
// Copyright (C) 2007
// 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 ClockService inline non-template implementation */
#include <senf/Utils/Exception.hh>
#define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef SENF_DEBUG
+# define SENF_CLOCKTYPEVAL(clock) (clock).value()
+#else
+# define SENF_CLOCKTYPEVAL(clock) (clock)
+#endif
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::ClockService
prefix_ senf::ClockService::clock_type senf::ClockService::now()
struct timespec spec;
if (clock_gettime(CLOCK_MONOTONIC, &spec) < 0)
SENF_THROW_SYSTEM_EXCEPTION("clock_gettime()");
- return spec.tv_sec * 1000000000LL + spec.tv_nsec;
+ return clock_type(spec.tv_sec * 1000000000LL + spec.tv_nsec);
}
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// private members
+namespace senf { namespace scheduler { ClockService::clock_type now(); } }
+
prefix_ senf::ClockService::clock_type senf::ClockService::clock_m(abstime_type time)
{
- if (now() - baseClock_ > 1000000000ll)
+ if (scheduler::now() - baseClock_ > clock_type(1000000000ll))
restart_m();
boost::posix_time::time_duration delta (time - baseAbstime_);
return baseClock_ + clock_type( delta.ticks() )
{
if (clock == 0)
return abstime_type();
- if (now() - baseClock_ > 1000000000ll)
+ if (scheduler::now() - baseClock_ > clock_type(1000000000ll))
restart_m();
#ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
- return baseAbstime_ + boost::posix_time::nanoseconds(clock-baseClock_);
+ return baseAbstime_ + boost::posix_time::nanoseconds(
+ SENF_CLOCKTYPEVAL( clock-baseClock_));
#else
- return baseAbstime_ + boost::posix_time::microseconds((clock-baseClock_+500)/1000);
+ return baseAbstime_ + boost::posix_time::microseconds(
+ SENF_CLOCKTYPEVAL( (clock-baseClock_+clock_type(500))/1000));
#endif
}
prefix_ senf::ClockService::reltime_type senf::ClockService::reltime(clock_type clock)
{
#ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
- return boost::posix_time::nanoseconds(clock);
+ return boost::posix_time::nanoseconds(
+ SENF_CLOCKTYPEVAL( clock));
#else
- return boost::posix_time::microseconds((clock+500)/1000);
+ return boost::posix_time::microseconds(
+ SENF_CLOCKTYPEVAL( (clock + clock_type(500))/1000));
#endif
}
prefix_ senf::ClockService::clock_type senf::ClockService::nanoseconds(int64_type v)
{
- return v;
+ return clock_type(v);
}
prefix_ senf::ClockService::clock_type senf::ClockService::microseconds(int64_type v)
return v * hours(24);
}
-prefix_ senf::ClockService::clock_type senf::ClockService::in_nanoseconds(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_nanoseconds(clock_type v)
{
- return v;
+ return SENF_CLOCKTYPEVAL( v);
}
-prefix_ senf::ClockService::clock_type senf::ClockService::in_microseconds(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_microseconds(clock_type v)
{
- return v / nanoseconds(1000);
+ return SENF_CLOCKTYPEVAL( v / nanoseconds(1000));
}
-prefix_ senf::ClockService::clock_type senf::ClockService::in_milliseconds(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_milliseconds(clock_type v)
{
- return v / microseconds(1000);
+ return SENF_CLOCKTYPEVAL( v / microseconds(1000));
}
-prefix_ senf::ClockService::clock_type senf::ClockService::in_seconds(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_seconds(clock_type v)
{
- return v / milliseconds(1000);
+ return SENF_CLOCKTYPEVAL( v / milliseconds(1000));
}
-prefix_ senf::ClockService::clock_type senf::ClockService::in_minutes(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_minutes(clock_type v)
{
- return v / seconds(60);
+ return SENF_CLOCKTYPEVAL( v / seconds(60));
}
-prefix_ senf::ClockService::clock_type senf::ClockService::in_hours(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_hours(clock_type v)
{
- return v / minutes(60);
+ return SENF_CLOCKTYPEVAL( v / minutes(60));
}
-prefix_ senf::ClockService::clock_type senf::ClockService::in_days(int64_type v)
+prefix_ senf::ClockService::int64_type senf::ClockService::in_days(clock_type v)
{
- return v / hours(24);
+ return SENF_CLOCKTYPEVAL( v / hours(24));
}
prefix_ senf::ClockService::clock_type senf::ClockService::from_timeval(timeval const & time)
{
- return from_time_t(time.tv_sec) + ClockService::microseconds(time.tv_usec);
+ return from_time_t(time.tv_sec) + microseconds(time.tv_usec);
}
prefix_ void senf::ClockService::restart()
instance().restart_m();
}
-///////////////////////////////cci.e///////////////////////////////////////
+#undef SENF_CLOCKTYPEVAL
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f
projects / senf.git / blobdiff