X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cc;h=f7509bcb28f4999f1a4b7dd5ff0de250a4048751;hb=3e42ecb22121f2e6df86b27bea73f890384a4ee4;hp=75ed7f8d72b25b0dacb556523830c7ae30d72d14;hpb=c5ab87643518405aa5171ed4602f7234873a4900;p=senf.git

diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc
index 75ed7f8..f7509bc 100644
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -20,7 +20,20 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// TODO: Implement signal handling
+/** \file
+    \brief Scheduler non-inline non-template implementation
+
+    \idea Implement signal handling (See source for more discussion
+    about this) 
+
+    \idea Multithreading support: To support multithreading, the
+    static member Scheduler::instance() must return a thread-local
+    value (that is Scheduler::instance() must allocate one Scheduler
+    instance per thread). Another possibility would be to distribute
+    the async load unto several threads (one scheduler for multiple
+    threads)
+ */
+
 // Here a basic concept of how to add signal support to the scheduler:
 //
 // Every signal to be reported by the scheduler will be asigned a
@@ -52,17 +65,12 @@
 // You should use sigaction to register the signal handlers and define
 // a sa_mask so all Scheduler-registered signals are automatically
 // *blocked* whenever one of the signals is called (including the
-// called signal!). This ensures, that no two signals can be delivered
-// on top of each other. And of course any signal registered with the
-// scheduler must be blocked as soon as it is registered with the
-// scheduler.
-
-// TODO: Multithreading support
-// To support multithreading, the static member Scheduler::instance()
-// must return a thread-local value (that is Scheduler::instance()
-// must allocate one Scheduler instance per thread)
-
-// Definition of non-inline non-template functions
+// called signal!) (This also means, we will have to re-register all
+// signals if we change the registration of some signal since the
+// sa_mask changes). This ensures, that no two signals can be
+// delivered on top of each other. And of course any signal registered
+// with the scheduler must be blocked as soon as it is registered with
+// the scheduler.
 
 #include "Scheduler.hh"
 //#include "Scheduler.ih"
@@ -78,25 +86,25 @@ static const int EPollInitialSize = 16;
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ satcom::lib::Scheduler::Scheduler & satcom::lib::Scheduler::instance()
+prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
 {
     static Scheduler instance;
     return instance;
 }
 
-prefix_ void satcom::lib::Scheduler::timeout(unsigned long timeout, TimerCallback const & cb)
+prefix_ void senf::Scheduler::timeout(unsigned long timeout, TimerCallback const & cb)
 {
     timerQueue_.push(TimerSpec(now()+1000*timeout,cb));
 }
 
-prefix_ satcom::lib::Scheduler::Scheduler()
+prefix_ senf::Scheduler::Scheduler()
     : epollFd_(epoll_create(EPollInitialSize))
 {
     if (epollFd_<0)
         throw SystemException(errno);
 }
 
-prefix_ void satcom::lib::Scheduler::do_add(int fd, SimpleCallback const & cb, int eventMask)
+prefix_ void senf::Scheduler::do_add(int fd, SimpleCallback const & cb, int eventMask)
 {
     FdTable::iterator i (fdTable_.find(fd));
     int action (EPOLL_CTL_MOD);
@@ -120,7 +128,7 @@ prefix_ void satcom::lib::Scheduler::do_add(int fd, SimpleCallback const & cb, i
         throw SystemException(errno);
 }
 
-prefix_ void satcom::lib::Scheduler::do_remove(int fd, int eventMask)
+prefix_ void senf::Scheduler::do_remove(int fd, int eventMask)
 {
     FdTable::iterator i (fdTable_.find(fd));
     if (i == fdTable_.end()) 
@@ -148,7 +156,7 @@ prefix_ void satcom::lib::Scheduler::do_remove(int fd, int eventMask)
 }
 
 
-prefix_ int satcom::lib::Scheduler::EventSpec::epollMask()
+prefix_ int senf::Scheduler::EventSpec::epollMask()
     const
 {
     int mask (0);
@@ -160,7 +168,7 @@ prefix_ int satcom::lib::Scheduler::EventSpec::epollMask()
     return mask;
 }
 
-prefix_ void satcom::lib::Scheduler::process()
+prefix_ void senf::Scheduler::process()
 {
     terminate_ = false;
     while (! terminate_) {
@@ -204,6 +212,10 @@ prefix_ void satcom::lib::Scheduler::process()
 	    if (spec.cb_hup)
 		spec.cb_hup(EV_HUP);
 	    else if (ev.events & EPOLLERR) {
+		/** \fixme This is stupid, if cb_write and cb_read are
+		    the same. The same below. We really have to
+		    exactly define sane semantics of what to do on
+		    EPOLLHUP and EPOLLERR. */
 		if (spec.cb_write) spec.cb_write(EV_HUP);
 		if (spec.cb_read) spec.cb_read(EV_HUP);
 	    }
@@ -226,5 +238,5 @@ prefix_ void satcom::lib::Scheduler::process()
 
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
 // End: