X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FEvents.cci;h=3800f201af2f1f986e7f691bf53eceae5415786c;hb=d5a72d0b3f6fee56dba6de1c54cafb448ebe3457;hp=600fc37c8ae7690580bc23d898be4191eb2bb856;hpb=550a30f99f2edbe72434c1b5f2a225320d0ef4ca;p=senf.git diff --git a/PPI/Events.cci b/PPI/Events.cci index 600fc37..3800f20 100644 --- a/PPI/Events.cci +++ b/PPI/Events.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 @@ -24,7 +24,7 @@ \brief Events inline non-template implementation */ // Custom includes -#include +#include <../Utils/senfassert.hh> #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// @@ -40,21 +40,11 @@ prefix_ bool senf::ppi::EventDescriptor::enabled() return enabled_; } -prefix_ void senf::ppi::EventDescriptor::enabled(bool v) -{ - BOOST_ASSERT(v_isRegistered()); - if (v && ! enabled_) - v_enable(); - else if (! v && enabled_) - v_disable(); - enabled_ = v; -} - //////////////////////////////////////// // protected members prefix_ senf::ppi::EventDescriptor::EventDescriptor() - : enabled_(false) + : enabled_(false), throttled_(false) {} //////////////////////////////////////// @@ -62,6 +52,7 @@ prefix_ senf::ppi::EventDescriptor::EventDescriptor() prefix_ void senf::ppi::EventDescriptor::notifyThrottle() { + throttled_ = true; enabled(false); }