Changeset 7440 in orxonox.OLD for trunk/src

Timestamp:

Apr 29, 2006, 2:56:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Signal-Handler-Branche back to the TRUNK

Location:

trunk/src

Files:

• lib/network/network_socket.cc (modified) (1 diff)
• orxonox.cc (modified) (3 diffs)
• util/Makefile.am (modified) (2 diffs)
• util/signal_handler.cc (copied) (copied from branches/signals/src/util/signal_handler.cc)
• util/signal_handler.h (copied) (copied from branches/signals/src/util/signal_handler.h) (1 diff)

trunk/src/lib/network/network_socket.cc

@@ -120 +120 @@
 void NetworkSocket::connectToServer(IPaddress ip)
 {
+  //HACK this will cause segfault
+#warning remove this
+  int * a;
+  *a = 99;
   //check if not already connected or listening
   if (tcpSocket)

trunk/src/orxonox.cc

@@ -34 +34 @@
 #include "parser/ini_parser/ini_parser.h"
 #include "util/loading/game_loader.h"
+#include "util/signal_handler.h"
 
 //ENGINES
@@ -84 +85 @@
 REGISTER_ARG_ARG(  _, music_volume, "audio", "Music-Volume", "Sets music volume", "vol" );
 REGISTER_ARG_ARG(  _, effects_volume, "audio", "Effects-Volume", "Sets effects volume", "vol" );
+
+#ifndef __WIN32__
+REGISTER_ARG_FLAG( _, start_gdb_on_signal, "misc", "start-gdb", "Start gdb on signal", "1");
+REGISTER_ARG_FLAG( _, write_bt_to_file, "misc", "bt-to-file", "Write backtrace to file", "1");
+#endif
 
 /**
@@ -429 +435 @@
   }
 
+  if ( Preferences::getInstance()->getString("misc", "start-gdb", "0") == "1" )
+  {
+    SignalHandler::getInstance()->doCatch( argv[0], GDB_RUN_IN_FOREGROUND );
+  }
+  else if ( Preferences::getInstance()->getString("misc", "bt-to-file", "1") == "1" )
+  {      SignalHandler::getInstance()->doCatch( argv[0], GDB_RUN_WRITE_TO_FILE );
+    
+  }
+  
   if( Preferences::getInstance()->getString("game", "showGui", "") == "1" )
     showGui = true;

trunk/src/util/Makefile.am

@@ -12 +12 @@
                         multiplayer_team_deathmatch.cc \
                         singleplayer_shootemup.cc \
+                        signal_handler.cc \
                         \
                         animation/animation3d.cc \
@@ -30 +31 @@
                         multiplayer_team_deathmatch.h \
                         singleplayer_shootemup.h \
+                        signal_handler.h \
                         \
                         animation/animation3d.h \

trunk/src/util/signal_handler.h

@@ -57 +57 @@
 class SignalHandler
 {
+ public:
   inline static SignalHandler* getInstance() {};
   void doCatch( std::string appName, GdbRunType type = GDB_RUN_WRITE_TO_FILE ) {};