Changeset 9347 in orxonox.OLD for branches/proxy/src/util

Timestamp:

Jul 20, 2006, 11:43:27 AM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: merged the proxy.old back again, and it seems to work.

Merged with command
svn merge -r9247:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy.old .

no conflicts

Location:

branches/proxy/src/util

Files:

• Makefile.am (modified) (3 diffs)
• game_rules.cc (modified) (1 diff)
• multiplayer_team_deathmatch.cc (modified) (7 diffs)
• network_stats_widget.cc (copied) (copied from branches/proxy.old/src/util/network_stats_widget.cc)
• network_stats_widget.h (copied) (copied from branches/proxy.old/src/util/network_stats_widget.h)
• signal_handler.cc (modified) (10 diffs)
• signal_handler.h (modified) (3 diffs)

branches/proxy/src/util/Makefile.am

@@ -14 +14 @@
                         singleplayer_shootemup.cc \
                         \
+                        \
+                        \
                         mission_goal.cc\
                         kill_target.cc\
@@ -24 +26 @@
                         animation/animation_player.cc \
                         \
-                        track/pilot_node.cc
+                        track/pilot_node.cc \
+                        \
+                        network_stats_widget.cc
 
 #                       track/track_manager.cc \
@@ -50 +54 @@
                         animation/t_animation.h \
                         \
-                        track/pilot_node.h
+                        track/pilot_node.h \
+                        \
+                        network_stats_widget.h
+
 
 #                       track/track_manager.h \

branches/proxy/src/util/game_rules.cc

@@ -88 +88 @@
 void GameRules::registerKill(const Kill& kill)
 {
-  if ( !SharedNetworkData::getInstance()->isGameServer() )
+  if ( !SharedNetworkData::getInstance()->isMasterServer() )
     return;
 

branches/proxy/src/util/multiplayer_team_deathmatch.cc

@@ -204 +204 @@
   assignPlayable();
 
-  if ( !SharedNetworkData::getInstance()->isGameServer() )
+  if ( !SharedNetworkData::getInstance()->isMasterServer() )
     return;
 
@@ -214 +214 @@
     this->killList.erase( this->killList.begin() );
   }
-  
+
 
 
@@ -268 +268 @@
 void MultiplayerTeamDeathmatch::checkGameRules()
 {
-  if ( !SharedNetworkData::getInstance()->isGameServer() )
+  if ( !SharedNetworkData::getInstance()->isMasterServer() )
     return;
 
@@ -320 +320 @@
       return "maps/male_fiend.pcx";
   }
-  
+
   return "";
 }
@@ -330 +330 @@
     return 10.0f;
   }
-  
+
   return 1.0f;
 }
@@ -680 +680 @@
   char st[10];
   int i = 0;
-  
+
   i = 2;
   for ( TeamScoreList::const_iterator it = scoreList[0].begin(); it != scoreList[0].end(); it++ )
@@ -719 +719 @@
     return;
   }
-  
+
   int killerUserId = killer->getOwner();
   int victimUserId = victim->getOwner();
-  
+
   PRINTF(0)("%d %d %x %x %s %s\n", killerUserId, victimUserId, killer, victim, killer->getClassName(), victim->getClassName());
 
   PlayerStats & victimStats = *PlayerStats::getStats( victimUserId );
   PlayerStats & killerStats = *PlayerStats::getStats( killerUserId );
-  
+
   if ( killerStats.getPlayable() != killer || victimStats.getPlayable() != victim )
   {

branches/proxy/src/util/signal_handler.cc

@@ -27 +27 @@
 }
 
-void SignalHandler::doCatch( std::string appName )
+/**
+ * register signal handlers for SIGSEGV and SIGABRT
+ * @param appName path to executable eg argv[0]
+ * @param fileName filename to append backtrace to
+ */
+void SignalHandler::doCatch( const std::string & appName, const std::string & fileName )
 {
   this->appName = appName;
+  this->fileName = fileName;
+  
+  // make sure doCatch is only called once without calling dontCatch
+  assert( sigRecList.size() == 0 );
 
   catchSignal( SIGSEGV );
@@ -35 +44 @@
 }
 
+/**
+ * restore previous signal handlers
+ */
 void SignalHandler::dontCatch()
 {
@@ -45 +57 @@
 }
 
+/**
+ * catch signal sig
+ * @param sig signal to catch
+ */
 void SignalHandler::catchSignal( int sig )
 {
@@ -58 +74 @@
 }
 
+/**
+ * sigHandler is called when receiving signals
+ * @param sig 
+ */
 void SignalHandler::sigHandler( int sig )
 {
@@ -167 +187 @@
         )
           charsFound++;
+    else
+      charsFound = 0;
 
     if ( charsFound == 6 )
@@ -183 +205 @@
   write( sigPipe[1], &someData, sizeof(someData) );
 
-  write( gdbIn[1], "bt\nq\n", 5 );
+  write( gdbIn[1], "bt\nk\nq\n", 7 );
 
   
@@ -202 +224 @@
         )
           charsFound++;
+    else
+      charsFound = 0;
 
     if ( charsFound == 6 )
@@ -210 +234 @@
     }
 
-    if ( promptFound == 2 )
+    if ( promptFound == 3 )
     {
       break;
@@ -240 +264 @@
   bt.insert(0, timeString);
   
-  FILE * f = fopen( GDB_BT_FILE, "a" );
+  FILE * f = fopen( getInstance()->fileName.c_str(), "a" );
 
   if ( !f )
   {
-    perror("could not append to " GDB_BT_FILE);
+    perror( ( std::string( "could not append to " ) + getInstance()->fileName ).c_str() );
     exit(EXIT_FAILURE);
   }
@@ -250 +274 @@
   if ( fwrite( bt.c_str(), 1, bt.length(), f ) != bt.length() )
   {
-    printf("could not write %d byte to " GDB_BT_FILE, bt.length());
+    printf( ( std::string("could not write %d byte to ") + getInstance()->fileName ).c_str(), bt.length());
     exit(EXIT_FAILURE);
   }

branches/proxy/src/util/signal_handler.h

@@ -9 +9 @@
 #include <list>
 #include <string>
-
-
-#define GDB_BT_FILE "orxonox.backtrace"
 
 typedef int (*SignalCallback)( void * someData );
@@ -44 +41 @@
     void registerCallback( SignalCallback cb, void * someData );
 
-    void doCatch( std::string appName );
+    void doCatch( const std::string & appName, const std::string & fileName );
     void dontCatch();
 
@@ -58 +55 @@
 
     std::string appName;
+    std::string fileName;
 };