X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FEventManager.cci;h=d88db89176053d81864295d1bd3ea1b19dae8ceb;hb=82e8df5de8b11448423388632e8602ad97bc7885;hp=0829b388ff95867464c42a8d5595699ffe0ea07c;hpb=b8a3977542aaf217ac472e5266abd0fcffb4f95f;p=senf.git diff --git a/PPI/EventManager.cci b/PPI/EventManager.cci index 0829b38..d88db89 100644 --- a/PPI/EventManager.cci +++ b/PPI/EventManager.cci @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -26,6 +26,7 @@ //#include "EventManager.ih" // Custom includes +#include "../Scheduler/Scheduler.hh" #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// @@ -39,7 +40,12 @@ prefix_ senf::ppi::EventManager & senf::ppi::EventManager::instance() return manager; } -prefix_ senf::ClockService::clock_type senf::ppi::EventManager::eventTime() +prefix_ senf::ClockService::clock_type senf::ppi::EventManager::now() +{ + return scheduler::now(); +} + +prefix_ senf::ClockService::clock_type senf::ppi::EventManager::time() { return eventTime_; }