Changeset 5747 for code/trunk

Timestamp:

Sep 19, 2009, 11:17:51 PM (15 years ago)

Author:

rgrieder

Message:

Added Exception::handleMessage() (copy from Game::getExceptionMessage) function that returns the exception message (if retrievable) when catching with "…"
and adjusted some exception handlers.

Location:

code/trunk/src

Files:

• Orxonox.cc (modified) (2 diffs)
• libraries/core/Core.cc (modified) (3 diffs)
• libraries/core/Game.cc (modified) (7 diffs)
• libraries/core/Game.h (modified) (1 diff)
• libraries/core/GraphicsManager.cc (modified) (1 diff)
• libraries/core/IRC.cc (modified) (3 diffs)
• libraries/core/Loader.cc (modified) (1 diff)
• libraries/core/TclBind.cc (modified) (5 diffs)
• libraries/core/TclThreadManager.cc (modified) (2 diffs)
• libraries/core/XMLPort.h (modified) (1 diff)
• libraries/core/input/InputDevice.h (modified) (2 diffs)
• libraries/core/input/InputManager.cc (modified) (2 diffs)
• libraries/tools/ResourceLocation.cc (modified) (1 diff)
• libraries/util/CMakeLists.txt (modified) (1 diff)
• libraries/util/Exception.cc (modified) (2 diffs)
• libraries/util/Exception.h (modified) (1 diff)
• orxonox/graphics/ParticleEmitter.cc (modified) (1 diff)
• orxonox/worldentities/BigExplosion.cc (modified) (4 diffs)
• orxonox/worldentities/ExplosionChunk.cc (modified) (1 diff)

code/trunk/src/Orxonox.cc

@@ -45 +45 @@
 
 #include "util/Debug.h"
+#include "util/Exception.h"
 #include "orxonox/Main.h"
 
@@ -67 +68 @@
 #endif
     }
-    catch (const std::exception& ex)
-    {
-        COUT(0) << "Orxonox failed to initialise: " << ex.what() << std::endl;
-        COUT(0) << "Terminating program." << std::endl;
-        return 1;
-    }
     catch (...)
     {
-        COUT(0) << "Orxonox failed to initialise: " << std::endl;
+        COUT(0) << "Orxonox failed to initialise: " << orxonox::Exception::handleMessage() << std::endl;
         COUT(0) << "Terminating program." << std::endl;
         return 1;

code/trunk/src/libraries/core/Core.cc

@@ -284 +284 @@
                             DynLibManager::getInstance().load(librarypath.string());
                         }
-                        catch (const std::exception& e)
-                        {
-                            COUT(1) << "Couldn't load module \"" << librarypath.string() << "\": " << e.what() << std::endl;
-                        }
                         catch (...)
                         {
-                            COUT(1) << "Couldn't load module \"" << librarypath.string() << "\"" << std::endl;
+                            COUT(1) << "Couldn't load module \"" << librarypath.string() << "\": " << Exception::handleMessage() << std::endl;
                         }
                     }
@@ -298 +294 @@
             }
         }
-        catch (const std::exception& e)
-        {
-            COUT(1) << "An error occurred while loading modules: " << e.what() << std::endl;
-        }
         catch (...)
         {
-            COUT(1) << "An error occurred while loading modules." << std::endl;
+            COUT(1) << "An error occurred while loading modules: " << Exception::handleMessage() << std::endl;
         }
 
@@ -398 +390 @@
         catch (...)
         {
-            COUT(0) << "An exception occurred during 'new GraphicsManager' while "
-                    << "another exception was being handled. This will lead to undefined behaviour!" << std::endl
+            COUT(0) << "An exception occurred during 'unloadGraphics':" << Exception::handleMessage() << std::endl
+                    << "Another exception might be being handled which may lead to undefined behaviour!" << std::endl
                     << "Terminating the program." << std::endl;
             abort();

code/trunk/src/libraries/core/Game.cc

@@ -37 +37 @@
 #include <exception>
 #include <boost/weak_ptr.hpp>
-#include <CEGUIExceptions.h>
 
 #include "util/Debug.h"
@@ -204 +203 @@
             catch (...)
             {
-                COUT(0) << "An exception occurred in the Core preUpdate: " << Game::getExceptionMessage() << std::endl;
+                COUT(0) << "An exception occurred in the Core preUpdate: " << Exception::handleMessage() << std::endl;
                 COUT(0) << "This should really never happen! Closing the program." << std::endl;
                 this->stop();
@@ -218 +217 @@
             catch (...)
             {
-            COUT(0) << "An exception occurred in the Core postUpdate: " << Game::getExceptionMessage() << std::endl;
-            COUT(0) << "This should really never happen! Closing the program." << std::endl;
+                COUT(0) << "An exception occurred in the Core postUpdate: " << Exception::handleMessage() << std::endl;
+                COUT(0) << "This should really never happen! Closing the program." << std::endl;
                 this->stop();
                 break;
@@ -254 +253 @@
                 catch (...)
                 {
-                    COUT(1) << "Error: Loading GameState '" << requestedStateNode->name_ << "' failed: " << Game::getExceptionMessage() << std::endl;
+                    COUT(1) << "Error: Loading GameState '" << requestedStateNode->name_ << "' failed: " << Exception::handleMessage() << std::endl;
                     // All scheduled operations have now been rendered inert --> flush them and issue a warning
                     if (this->requestedStateNodes_.size() > 1)
@@ -285 +284 @@
             catch (...)
             {
-                COUT(1) << "An exception occurred while updating '" << (*it)->getName() << "': " << Game::getExceptionMessage() << std::endl;
+                COUT(1) << "An exception occurred while updating '" << (*it)->getName() << "': " << Exception::handleMessage() << std::endl;
                 COUT(1) << "This should really never happen!" << std::endl;
                 COUT(1) << "Unloading all GameStates depending on the one that crashed." << std::endl;
@@ -593 +592 @@
         catch (...)
         {
-            COUT(2) << "Warning: Unloading GameState '" << name << "' threw an exception: " << Game::getExceptionMessage() << std::endl;
+            COUT(2) << "Warning: Unloading GameState '" << name << "' threw an exception: " << Exception::handleMessage() << std::endl;
             COUT(2) << "         There might be potential resource leaks involved! To avoid this, improve exception-safety." << std::endl;
         }
@@ -608 +607 @@
     }
 
-    /*static*/ std::string Game::getExceptionMessage()
-    {
-        std::string exceptionMessage;
-        try
-        {
-            // rethrow
-            throw;
-        }
-        catch (const std::exception& ex)
-        {
-            return ex.what();
-        }
-        catch (const CEGUI::Exception& ex)
-        {
-#if CEGUI_VERSION_MAJOR == 0 && CEGUI_VERSION_MINOR < 6
-            return GeneralException(ex.getMessage().c_str()).getDescription();
-#else
-            return GeneralException(ex.getMessage().c_str(), ex.getLine(),
-                ex.getFileName().c_str(), ex.getName().c_str()).getDescription();
-#endif
-        }
-        catch (...)
-        {
-            return "Unknown exception";
-        }
-    }
-
     std::map<std::string, shared_ptr<Game::GameStateFactory> > Game::GameStateFactory::factories_s;
 

code/trunk/src/libraries/core/Game.h

@@ -155 +155 @@
         // ScopeGuard helper function
         void resetChangingState() { this->bChangingState_ = false; }
-        /**
-        @brief
-            Retrieves information from an exception caught with "..."
-        @remarks
-            Never ever call this function without an exception in the stack!
-        */
-        static std::string getExceptionMessage();
 
         scoped_ptr<Clock>                  gameClock_;

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -172 +172 @@
         // scripts for the 1.6 version and then remove the inserted "particle_system"
         // keyword. But we need to supply these new scripts as well, which is why
-        // there is an extra Ogre::Archive dealing with in the memory.
+        // there is an extra Ogre::Archive dealing with it in the memory.
         using namespace Ogre;
         ArchiveManager::getSingleton().addArchiveFactory(memoryArchiveFactory_.get());

code/trunk/src/libraries/core/IRC.cc

@@ -32 +32 @@
 
 #include "util/Convert.h"
+#include "util/Exception.h"
 #include "ConsoleCommand.h"
 #include "CoreIncludes.h"
@@ -64 +65 @@
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl (IRC) error: " << e.what();   }
-        catch (std::exception const &e)
-        {   COUT(1) << "Error while initializing Tcl (IRC): " << e.what();   }
+        catch (...)
+        {   COUT(1) << "Error while initializing Tcl (IRC): " << Exception::handleMessage();   }
 
         this->nickname_ = "orx" + multi_cast<std::string>(static_cast<unsigned int>(rand()));
@@ -94 +95 @@
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl (IRC) error: " << e.what();   }
-        catch (std::exception const &e)
-        {   COUT(1) << "Error while executing Tcl (IRC): " << e.what();   }
+        catch (...)
+        {   COUT(1) << "Error while executing Tcl (IRC): " << Exception::handleMessage();   }
 
         return false;

code/trunk/src/libraries/core/Loader.cc

@@ -187 +187 @@
             return false;
         }
-        catch (std::exception& ex)
+        catch (...)
         {
             COUT(1) << std::endl;
             COUT(1) << "An error occurred in Loader.cc while loading " << file->getFilename() << ":" << std::endl;
-            COUT(1) << ex.what() << std::endl;
-            COUT(1) << "Loading aborted." << std::endl;
-            return false;
-        }
-        catch (...)
-        {
-            COUT(1) << std::endl;
-            COUT(1) << "An unknown error occurred in Loader.cc while loading " << file->getFilename() << ":" << std::endl;
+            COUT(1) << Exception::handleMessage() << std::endl;
             COUT(1) << "Loading aborted." << std::endl;
             return false;

code/trunk/src/libraries/core/TclBind.cc

@@ -35 +35 @@
 #include "SpecialConfig.h"
 #include "util/Debug.h"
+#include "util/Exception.h"
 #include "util/StringUtils.h"
 #include "CommandExecutor.h"
@@ -92 +93 @@
             catch (Tcl::tcl_error const &e)
             {   COUT(1) << "Tcl error while creating Tcl-interpreter: " << e.what() << std::endl;   }
-            catch (std::exception const &e)
-            {   COUT(1) << "Error while creating Tcl-interpreter: " << e.what() << std::endl;   }
             catch (...)
-            {   COUT(1) << "Error while creating Tcl-interpreter." << std::endl;   }
+            {   COUT(1) << "Error while creating Tcl-interpreter: " << Exception::handleMessage() << std::endl;   }
         }
     }
@@ -115 +114 @@
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl error while creating Tcl-interpreter: " << e.what() << std::endl; COUT(1) << "Error: Tcl isn't properly initialized. Orxonox might possibly not work like that." << std::endl;   }
-        catch (std::exception const &e)
-        {   COUT(1) << "Error while creating Tcl-interpreter: " << e.what() << std::endl; COUT(1) << "Error: Tcl isn't properly initialized. Orxonox might possibly not work like that." << std::endl;   }
         catch (...)
-        {   COUT(1) << "Error while creating Tcl-interpreter." << std::endl; COUT(1) << "Error: Tcl isn't properly initialized. Orxonox might possibly not work like that." << std::endl;   }
+        {   COUT(1) << "Error while creating Tcl-interpreter: " << Exception::handleMessage() << std::endl; COUT(1) << "Error: Tcl isn't properly initialized. Orxonox might possibly not work like that." << std::endl;   }
 
         return interpreter;
@@ -178 +175 @@
             catch (Tcl::tcl_error const &e)
             {   COUT(1) << "tcl> Error: " << e.what() << std::endl;   }
-            catch (std::exception const &e)
-            {   COUT(1) << "Error while executing Tcl: " << e.what() << std::endl;   }
+            catch (...)
+            {   COUT(1) << "Error while executing Tcl: " << Exception::handleMessage() << std::endl;   }
         }
 
@@ -199 +196 @@
         catch (Tcl::tcl_error const &e)
         {   COUT(1) << "Tcl error: " << e.what() << std::endl;   }
-        catch (std::exception const &e)
-        {   COUT(1) << "Error while executing Tcl: " << e.what() << std::endl;   }
+        catch (...)
+        {   COUT(1) << "Error while executing Tcl: " << Exception::handleMessage() << std::endl;   }
 
         return false;

code/trunk/src/libraries/core/TclThreadManager.cc

@@ -37 +37 @@
 
 #include "util/Convert.h"
+#include "util/Exception.h"
 #include "Clock.h"
 #include "CommandExecutor.h"
@@ -285 +286 @@
         catch (const Tcl::tcl_error& e)
         {   bundle->interpreter_ = 0; COUT(1) << "Tcl error while creating Tcl-interpreter (" << id_string << "): " << e.what() << std::endl;   }
-        catch (const std::exception& e)
-        {   bundle->interpreter_ = 0; COUT(1) << "Error while creating Tcl-interpreter (" << id_string << "): " << e.what() << std::endl;   }
         catch (...)
-        {   bundle->interpreter_ = 0; COUT(1) << "An error occurred while creating a new Tcl-interpreter (" << id_string << ")" << std::endl;   }
+        {   bundle->interpreter_ = 0; COUT(1) << "Error while creating Tcl-interpreter (" << id_string << "): " << Exception::handleMessage() << std::endl;   }
     }
 

code/trunk/src/libraries/core/XMLPort.h

@@ -591 +591 @@
                                                     throw ex;
                                                 }
-                                                catch (std::exception& ex)
+                                                catch (...)
                                                 {
                                                     COUT(1) << "An error occurred while loading object:" << std::endl;
-                                                    COUT(1) << ex.what() << std::endl;
-                                                }
-                                                catch (...)
-                                                {
-                                                    COUT(1) << "An unknown error occurred while loading object." << std::endl;
+                                                    COUT(1) << Exception::handleMessage() << std::endl;
                                                 }
                                             }

code/trunk/src/libraries/core/input/InputDevice.h

@@ -42 +42 @@
 
 #include "util/Debug.h"
+#include "util/Exception.h"
 #include "core/Clock.h"
 #include "InputState.h"
@@ -145 +146 @@
             catch (...)
             {
-                COUT(1) << this->getClassName() << " destruction failed! Potential resource leak!" << std::endl;
+                COUT(1) << this->getClassName() << " destruction failed: " << Exception::handleMessage() << std::endl
+                        << "    Potential resource leak!" << std::endl;
             }
         }

code/trunk/src/libraries/core/input/InputManager.cc

@@ -330 +330 @@
             catch (...)
             {
-                CCOUT(1) << className << " destruction failed! Potential resource leak!" << std::endl;
+                COUT(1) << className << " destruction failed: " << Exception::handleMessage() << std::endl
+                        << "    Potential resource leak!" << std::endl;
             }
         }
@@ -342 +343 @@
         catch (...)
         {
-            CCOUT(1) << "OIS::InputManager destruction failed! Potential resource leak!" << std::endl;
+            COUT(1) << "OIS::InputManager destruction failed" << Exception::handleMessage() << std::endl
+                    << "    Potential resource leak!" << std::endl;
         }
         oisInputManager_ = NULL;

code/trunk/src/libraries/tools/ResourceLocation.cc

@@ -97 +97 @@
                 this->getPath(), this->getResourceGroup());
         }
-        catch (const std::exception& ex)
+        catch (...)
         {
-            COUT(1) << "Removing of a ResourceLocation failed: " << ex.what() << std::endl;
+            COUT(1) << "Removing of a ResourceLocation failed: " << Exception::handleMessage() << std::endl;
         }
     }

code/trunk/src/libraries/util/CMakeLists.txt

@@ -74 +74 @@
     "UTIL_SHARED_BUILD"
   LINK_LIBRARIES
+    ${CEGUI_LIBRARY}
     ${OGRE_LIBRARY}
   SOURCE_FILES

code/trunk/src/libraries/util/Exception.cc

@@ -34 +34 @@
 
 #include "Exception.h"
+#include <CEGUIExceptions.h>
 
 namespace orxonox
@@ -93 +94 @@
         return getDescription().c_str();
     }
+
+    /*static*/ std::string Exception::handleMessage()
+    {
+        try
+        {
+            // rethrow
+            throw;
+        }
+        catch (const std::exception& ex)
+        {
+            return ex.what();
+        }
+        catch (const CEGUI::Exception& ex)
+        {
+#if CEGUI_VERSION_MAJOR == 0 && CEGUI_VERSION_MINOR < 6
+            return GeneralException(ex.getMessage().c_str()).getDescription();
+#else
+            return GeneralException(ex.getMessage().c_str(), ex.getLine(),
+                ex.getFileName().c_str(), ex.getName().c_str()).getDescription();
+#endif
+        }
+        catch (...)
+        {
+            return "Unknown exception";
+        }
+    }
 }

code/trunk/src/libraries/util/Exception.h

@@ -83 +83 @@
         virtual const std::string& getFilename()        const { return this->filename_; }
 
+        /**
+        @brief
+            Retrieves information from an exception caught with "..."
+            Works for std::exception and CEGUI::Exception
+        @remarks
+            Never ever call this function without an exception in the stack!
+        */
+        static std::string handleMessage();
+
     protected:
         std::string description_;             //!< User typed text about why the exception occurred

code/trunk/src/orxonox/graphics/ParticleEmitter.cc

@@ -110 +110 @@
             {
                 this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), this->source_, this->LOD_);
-                this->attachOgreObject(this->particles_->getParticleSystem());
-                this->particles_->setVisible(this->isVisible());
-                this->particles_->setEnabled(this->isActive());
             }
             catch (...)
             {
-                COUT(1) << "Error: Couln't load particle effect \"" << this->source_ << "\"" << std::endl;
-                this->particles_ = 0;
+                COUT(1) << "Error: Couln't load particle effect \"" << this->source_ << "\" because:" << std::endl
+                        << Exception::handleMessage() << std::endl;
             }
+            this->attachOgreObject(this->particles_->getParticleSystem());
+            this->particles_->setVisible(this->isVisible());
+            this->particles_->setEnabled(this->isActive());
         }
     }

code/trunk/src/orxonox/worldentities/BigExplosion.cc

@@ -74 +74 @@
             catch (...)
             {
-                COUT(1) << "Error: Couln't load particle effect in BigExplosion." << std::endl;
+                COUT(1) << "Error: Couln't load particle effect in BigExplosion: " << Exception::handleMessage() << std::endl;
                 this->initZero();
             }
@@ -97 +97 @@
     void BigExplosion::init()
     {
-        Identifier* idDE1 = Class(MovableEntity);
-        BaseObject* oDE1 = idDE1->fabricate(this);
-        this->debrisEntity1_ = orxonox_cast<MovableEntity*>(oDE1);
-
-        Identifier* idDE2 = Class(MovableEntity);
-        BaseObject* oDE2 = idDE2->fabricate(this);
-        this->debrisEntity2_ = orxonox_cast<MovableEntity*>(oDE2);
-
-        Identifier* idDE3 = Class(MovableEntity);
-        BaseObject* oDE3 = idDE3 ->fabricate(this);
-        this->debrisEntity3_ = orxonox_cast<MovableEntity*>(oDE3);
-
-        Identifier* idDE4 = Class(MovableEntity);
-        BaseObject* oDE4 = idDE4->fabricate(this);
-        this->debrisEntity4_ = orxonox_cast<MovableEntity*>(oDE4);
-
-        Identifier* idD1 = Class(Model);
-        BaseObject* oD1 = idD1->fabricate(this);
-        this->debris1_ = orxonox_cast<Model*>(oD1);
-
-        Identifier* idD2 = Class(Model);
-        BaseObject* oD2 = idD2->fabricate(this);
-        this->debris2_ = orxonox_cast<Model*>(oD2);
-
-        Identifier* idD3 = Class(Model);
-        BaseObject* oD3 = idD3->fabricate(this);
-        this->debris3_ = orxonox_cast<Model*>(oD3);
-
-        Identifier* idD4 = Class(Model);
-        BaseObject* oD4 = idD4->fabricate(this);
-        this->debris4_ = orxonox_cast<Model*>(oD4);
-
-        Identifier* id6 = Class(StaticEntity);
-        BaseObject* object4 = id6->fabricate(this);
-        this->explosion_ = orxonox_cast<StaticEntity*>(object4);
+        this->debrisEntity1_ = new MovableEntity(this);
+        this->debrisEntity2_ = new MovableEntity(this);
+        this->debrisEntity3_ = new MovableEntity(this);
+        this->debrisEntity4_ = new MovableEntity(this);
+
+        this->debris1_ = new Model(this);
+        this->debris2_ = new Model(this);
+        this->debris3_ = new Model(this);
+        this->debris4_ = new Model(this);
+
+        this->explosion_ = new StaticEntity(this);
 
         this->debrisSmoke1_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/smoke7", this->LOD_);
@@ -200 +176 @@
         for(int i=0;i<10;i++)
         {
-            Identifier* idf1 = Class(Model);
-            BaseObject* obj1 = idf1->fabricate(this);
-            Model* part1 = orxonox_cast<Model*>(obj1);
-
-
-            Identifier* idf2 = Class(Model);
-            BaseObject* obj2 = idf2->fabricate(this);
-            Model* part2 = orxonox_cast<Model*>(obj2);
-
-            Identifier* idf3 = Class(MovableEntity);
-            BaseObject* obj3 = idf3->fabricate(this);
-            MovableEntity* partEntity1 = orxonox_cast<MovableEntity*>(obj3);
-
-            Identifier* idf4 = Class(MovableEntity);
-            BaseObject* obj4 = idf4->fabricate(this);
-            MovableEntity* partEntity2 = orxonox_cast<MovableEntity*>(obj4);
+            Model* part1 = new Model(this);
+            Model* part2 = new Model(this);
+
+            MovableEntity* partEntity1 = new MovableEntity(this);
+            MovableEntity* partEntity2 = new MovableEntity(this);
 
             partEntity1->setVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(10,100));
@@ -227 +192 @@
             part1->setMeshSource("SmallPart1.mesh");
             part2->setMeshSource("SmallPart2.mesh");
-
 
             partEntity1->attach(part1);

code/trunk/src/orxonox/worldentities/ExplosionChunk.cc

@@ -61 +61 @@
             catch (...)
             {
-                COUT(1) << "Error: Couln't load particle effect in ExplosionChunk." << std::endl;
+                COUT(1) << "Error: Couln't load particle effect in ExplosionChunk: " << Exception::handleMessage() << std::endl;
                 this->fire_ = 0;
                 this->smoke_ = 0;