Changeset 1792 for code/trunk/src/core/Shell.cc

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.

File:

• code/trunk/src/core/Shell.cc (modified) (3 diffs)

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;
     }