Changeset 8228 in orxonox.OLD for trunk/src/util

Timestamp:

Jun 8, 2006, 11:19:08 AM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk with command: svn merge branches/network trunk -r8150:HEAD

Location:

trunk/src/util

Files:

• signal_handler.cc (modified) (3 diffs)
• signal_handler.h (modified) (5 diffs)

trunk/src/util/signal_handler.cc

@@ -17 +17 @@
 #include <assert.h>
 
+SignalHandler * SignalHandler::singletonRef = NULL;
+
 #ifndef __WIN32__
-
-SignalHandler * SignalHandler::singletonRef = NULL;
 
 SignalHandler::SignalHandler()
@@ -59 +59 @@
 void SignalHandler::sigHandler( int sig )
 {
+  for ( SignalCallbackList::iterator it = SignalHandler::getInstance()->callbackList.begin(); it != SignalHandler::getInstance()->callbackList.end(); it++  )
+  {
+    (*(it->cb))( it->someData );
+  }
+  
   std::string sigName = "UNKNOWN";
 
@@ -113 +118 @@
 }
 
+void SignalHandler::registerCallback( SignalCallback cb, void * someData )
+{
+  SignalCallbackRec rec;
+  rec.cb = cb;
+  rec.someData = someData;
+  
+  callbackList.push_back(rec);
+}
+
 #endif /* __WIN32__ */

trunk/src/util/signal_handler.h

@@ -17 +17 @@
 };
 
+typedef bool (*SignalCallback)( void * someData );
 
 #ifndef __WIN32__
@@ -27 +28 @@
 };
 
+struct SignalCallbackRec
+{
+  SignalCallback cb;
+  void * someData;
+};
+
 
 typedef std::list<SignalRec> SignalRecList;
+typedef std::list<SignalCallbackRec> SignalCallbackList;
 
 class SignalHandler
@@ -35 +43 @@
     SignalHandler();
   public:
-    inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler();
-      return SignalHandler::singletonRef; }
+    inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; }
+      
+    void registerCallback( SignalCallback cb, void * someData );
 
     void doCatch( std::string appName, GdbRunType type = GDB_RUN_WRITE_TO_FILE );
@@ -46 +55 @@
     void catchSignal( int sig );
     SignalRecList sigRecList;
+    
+    SignalCallbackList callbackList;
 
     static SignalHandler * singletonRef;
@@ -58 +69 @@
 {
  public:
-  inline static SignalHandler* getInstance() {};
+   inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; };
   void doCatch( std::string appName, GdbRunType type = GDB_RUN_WRITE_TO_FILE ) {};
   void dontCatch() {};
+  void registerCallback( SignalCallback cb, void * someData ) {};
 };
 #endif