switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Scheduler / SignalEvent.cc

diff --git a/senf/Scheduler/SignalEvent.cc b/senf/Scheduler/SignalEvent.cc
index a521bd8..6884851 100644 (file)
--- a/senf/Scheduler/SignalEvent.cc
+++ b/senf/Scheduler/SignalEvent.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // 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 SignalDispatcher non-inline non-template implementation */
@@ -27,12 +32,13 @@
 #include "SignalEvent.ih"
 
 // Custom includes
-#include "../Utils/senfassert.hh"
-#include "../Utils/signalnames.hh"
+#include <senf/Utils/senfassert.hh>
+#include <senf/Utils/signalnames.hh>
+#include "senf/Utils/IgnoreValue.hh"
 
 //#include "SignalEvent.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::scheduler::detail::SignalDispatcher::SignalDispatcher()
     : blocked_ (true)
@@ -59,7 +65,7 @@ prefix_ void senf::scheduler::detail::SignalDispatcher::add(SignalEvent & event)
 {
     SignalSet::iterator i (handlers_.find(event));
     if (i != handlers_.end())
-        throw DuplicateSignalRegistrationException() 
+        throw DuplicateSignalRegistrationException()
             << " for signal " << signalName(event.signal_) << " (" << event.signal_ << ")";
 
     handlers_.insert(event);
@@ -109,14 +115,15 @@ prefix_ void senf::scheduler::detail::SignalDispatcher::signal(int events)
     i->setRunnable();
 }
 
-prefix_ void senf::scheduler::detail::SignalDispatcher::sigHandler(int signal, ::siginfo_t * siginfo,
-                                                           void *)
+prefix_ void senf::scheduler::detail::SignalDispatcher::sigHandler(int signal,
+                                                                   ::siginfo_t * siginfo,
+                                                                   void *)
 {
-    SENF_ASSERT( alive() );
+    SENF_ASSERT( alive(), "Internal failure: Destroyed signal handler called" );
     // The manpage says, si_signo is unused in linux so we set it here
-    siginfo->si_signo = signal; 
+    siginfo->si_signo = signal;
     // We can't do much on error anyway so we ignore errors here
-    write(instance().sigPipe_[1], siginfo, sizeof(*siginfo));
+    senf::IGNORE( write(instance().sigPipe_[1], siginfo, sizeof(*siginfo)) );
 }
 
 prefix_ void senf::scheduler::SignalEvent::v_run()
@@ -136,11 +143,11 @@ prefix_ std::string senf::scheduler::SignalEvent::v_info()
     return "";
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "SignalEvent.mpp"
 
-\f
+
 // Local Variables:
 // mode: c++
 // fill-column: 100