X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FIOEvent.cc;h=ea70efcddad888bc753130ee89459422b65b0f3e;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=c39d57a1f93c4b9e2d4e90cf36458eac98fef08b;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git diff --git a/PPI/IOEvent.cc b/PPI/IOEvent.cc index c39d57a..ea70efc 100644 --- a/PPI/IOEvent.cc +++ b/PPI/IOEvent.cc @@ -28,7 +28,6 @@ // Custom includes #include "../Utils/senfassert.hh" -#include //#include "IOEvent.mpp" #define prefix_ @@ -42,18 +41,19 @@ prefix_ void senf::ppi::IOEvent::v_enable() { - Scheduler::instance().add(fd_, boost::bind(&IOEvent::cb,this,_1), - Scheduler::EventId(events_)); + if (fd_ != -1) + event_.enable(); } prefix_ void senf::ppi::IOEvent::v_disable() { - Scheduler::instance().remove(fd_, Scheduler::EventId(events_)); + if (fd_ != -1) + event_.disable(); } -prefix_ void senf::ppi::IOEvent::cb(Scheduler::EventId event) +prefix_ void senf::ppi::IOEvent::cb(int event) { - if ((event & ~events_) != 0) { + if ((event & ~event_.events()) != 0) { if (event & Err) throw ErrorException(); else if (event & Hup)