Changeset 1792 for code/trunk/src

Timestamp:

Sep 16, 2008, 8:45:13 PM (16 years ago)

Author:

rgrieder

Message:

Changed initialisation of TclThreadManager, TclBind and Shell to match the simple singleton concept (runtime assert in the c'tor).
That simplifies things a lot. The instances now 'belong' to GSRoot.

Location:

code/trunk/src

Files:

• core/IRC.cc (modified) (1 diff)
• core/Shell.cc (modified) (3 diffs)
• core/Shell.h (modified) (4 diffs)
• core/TclBind.cc (modified) (3 diffs)
• core/TclBind.h (modified) (2 diffs)
• core/TclThreadManager.cc (modified) (4 diffs)
• core/TclThreadManager.h (modified) (3 diffs)
• orxonox/gamestates/GSRoot.cc (modified) (6 diffs)
• orxonox/gamestates/GSRoot.h (modified) (1 diff)

code/trunk/src/core/IRC.cc

@@ -27 +27 @@
  */
 
+#include "IRC.h"
+
 #include <boost/thread/thread.hpp>
-
-#include "IRC.h"
 #include "ConsoleCommand.h"
 #include "TclThreadManager.h"

code/trunk/src/core/Shell.cc

@@ -50 +50 @@
     SetConsoleCommandShortcut(OutputHandler, debug);
 
+    Shell* Shell::singletonRef_s = 0;
+
     Shell::Shell()
     {
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
+
+        int level = Core::getSoftDebugLevel(OutputHandler::LD_Shell);
+        Core::setSoftDebugLevel(OutputHandler::LD_Shell, -1);
+
         RegisterRootObject(Shell);
 
@@ -70 +78 @@
 
         this->setConfigValues();
+
+        Core::setSoftDebugLevel(OutputHandler::LD_Shell, level);
     }
 
@@ -76 +86 @@
         if (this->inputBuffer_)
             delete this->inputBuffer_;
-    }
-
-    Shell& Shell::createShell()
-    {
-        int level = Core::getSoftDebugLevel(OutputHandler::LD_Shell);
-        Core::setSoftDebugLevel(OutputHandler::LD_Shell, -1);
-        static Shell instance;
-        Core::setSoftDebugLevel(OutputHandler::LD_Shell, level);
-        return instance;
-    }
-
-    Shell& Shell::getInstance()
-    {
-        static Shell& instance = createShell();
-        return instance;
+        singletonRef_s = 0;
     }
 

code/trunk/src/core/Shell.h

@@ -30 +30 @@
 #define _Shell_H__
 
+#include "CorePrereqs.h"
+
 #include <list>
 #include <vector>
-
-#include "CorePrereqs.h"
 
 #include "OrxonoxClass.h"
@@ -60 +60 @@
     {
         public:
-            static Shell& getInstance();
-            static Shell& createShell();
+            Shell();
+            virtual ~Shell();
+
+            static Shell& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
             static void clearShell();
@@ -104 +106 @@
 
         private:
-            Shell();
             Shell(const Shell& other);
-            virtual ~Shell();
 
             void configureInputBuffer();
@@ -142 +142 @@
             unsigned int historyOffset_;
             bool bAddOutputLevel_;
+
+            static Shell* singletonRef_s;
     };
 }

code/trunk/src/core/TclBind.cc

@@ -27 +27 @@
  */
 
+#include "TclBind.h"
+
 #include <iostream>
 #include <string>
-
 #include "ConsoleCommand.h"
 #include "CommandExecutor.h"
 #include "TclThreadManager.h"
-#include "TclBind.h"
 #include "util/Debug.h"
 #include "util/String.h"
@@ -42 +42 @@
     SetConsoleCommandShortcut(TclBind, bgerror);
 
-    TclBind::TclBind()
+    TclBind* TclBind::singletonRef_s = 0;
+
+    TclBind::TclBind(const std::string& datapath)
     {
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
         this->interpreter_ = 0;
         this->bSetTclLibPath_ = false;
+        this->setDataPath(datapath);
     }
 
@@ -52 +57 @@
         if (this->interpreter_)
             delete this->interpreter_;
-    }
-
-    TclBind& TclBind::getInstance()
-    {
-        static TclBind instance;
-        return instance;
+        singletonRef_s = 0;
     }
 

code/trunk/src/core/TclBind.h

@@ -39 +39 @@
     {
         public:
-            static TclBind& getInstance();
+            TclBind(const std::string& datapath);
+            ~TclBind();
+
+            static TclBind& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
             static std::string tcl(const std::string& tclcode);
@@ -56 +59 @@
 
         private:
-            TclBind();
             TclBind(const TclBind& other);
-            ~TclBind();
 
             Tcl::interpreter* interpreter_;
             std::string tclLibPath_;
             bool bSetTclLibPath_;
+
+            static TclBind* singletonRef_s;
     };
 }

code/trunk/src/core/TclThreadManager.cc

@@ -27 +27 @@
  */
 
+#include "TclThreadManager.h"
+
 #include <iostream>
 #include <string>
-
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>
-
 #include <OgreTimer.h>
 
@@ -39 +39 @@
 #include "CommandExecutor.h"
 #include "TclBind.h"
-#include "TclThreadManager.h"
 #include "util/Debug.h"
 #include "util/Convert.h"
@@ -59 +58 @@
     SetConsoleCommand(TclThreadManager, flush,   false).argumentCompleter(0, autocompletion::tclthreads());
 
-    TclThreadManager::TclThreadManager()
+    TclThreadManager* TclThreadManager::singletonRef_s = 0;
+
+    TclThreadManager::TclThreadManager(Tcl::interpreter* interpreter)
     {
         RegisterRootObject(TclThreadManager);
+
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
 
         this->threadCounter_ = 0;
         this->orxonoxInterpreterBundle_.id_ = 0;
-        this->orxonoxInterpreterBundle_.interpreter_ = TclBind::getInstance().getTclInterpreter();
+        this->orxonoxInterpreterBundle_.interpreter_ = interpreter;
 #if (BOOST_VERSION >= 103500)
         this->threadID_ = boost::this_thread::get_id();
@@ -84 +88 @@
         }
         this->destroy(threadID);
-    }
-
-    TclThreadManager& TclThreadManager::getInstance()
-    {
-        static TclThreadManager instance;
-        return instance;
+
+        singletonRef_s = 0;
     }
 

code/trunk/src/core/TclThreadManager.h

@@ -73 +73 @@
 
         public:
-            static TclThreadManager& getInstance();
+            TclThreadManager(Tcl::interpreter* interpreter);
+            ~TclThreadManager();
+
+            static TclThreadManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
             static unsigned int create();
@@ -92 +95 @@
 
         private:
-            TclThreadManager();
             TclThreadManager(const TclThreadManager& other);
-            ~TclThreadManager();
 
             static void tcl_execute(Tcl::object const &args);
@@ -130 +131 @@
             boost::thread threadID_;
 #endif
+
+            static TclThreadManager* singletonRef_s;
     };
 

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -33 +33 @@
 #include <OgreRoot.h>
 
-//#include "util/SubString.h"
 #include "util/Exception.h"
 #include "util/Debug.h"
@@ -42 +41 @@
 #include "core/ConsoleCommand.h"
 #include "core/CommandLine.h"
+#include "core/Shell.h"
 #include "core/TclBind.h"
 #include "core/TclThreadManager.h"
@@ -73 +73 @@
         , ogreLogger_(0)
         , graphicsEngine_(0)
+        , tclBind_(0)
+        , tclThreadManager_(0)
+        , shell_(0)
     {
         RegisterRootObject(GSRoot);
@@ -120 +123 @@
 
         // initialise TCL
-        TclBind::getInstance().setDataPath(Settings::getDataPath());
-        TclThreadManager::getInstance();
+        this->tclBind_ = new TclBind(Settings::getDataPath());
+        this->tclThreadManager_ = new TclThreadManager(tclBind_->getTclInterpreter());
+
+        // create a shell
+        this->shell_ = new Shell();
 
         setupOgre();
@@ -149 +155 @@
     void GSRoot::leave()
     {
+        // TODO: remove and destroy console commands
+
         delete graphicsEngine_;
 
@@ -160 +168 @@
 #endif
 
+        delete this->shell_;
+        delete this->tclThreadManager_;
+        delete this->tclBind_;
+
         delete settings_;
 
-        // TODO: remove and destroy console commands
     }
 

code/trunk/src/orxonox/gamestates/GSRoot.h

@@ -65 +65 @@
         Ogre::LogManager*     ogreLogger_;
         GraphicsEngine*       graphicsEngine_;   //!< Interface to Ogre
+        TclBind*              tclBind_;
+        TclThreadManager*     tclThreadManager_;
+        Shell*                shell_;
 
         std::string           ogreConfigFile_;        //!< ogre config file name