Changeset 1276 for code/branches/console/src/core/TclThreadManager.cc

Timestamp:

May 15, 2008, 1:05:58 AM (16 years ago)

Author:

landauf

Message:

someone likes to chat? well, I do. here's a new IRC client. it connects directly into our irc.datacore.ch / #orxonox channel with a random nickname. use the "say text" command to write text into the channel. there are some more commands without a shortcut, type "IRC" and tab.
please update your media directory.

for some reason, irc-client and telnet-remote don't work together. please use only one feature at the same time. I'm not sure if it's a bug in TCL or in my TclThreadManager class. The problem also occurs with irc or telnet in parallel with another busy tcl-thread… strange thing.

File:

• code/branches/console/src/core/TclThreadManager.cc (modified) (7 diffs)

code/branches/console/src/core/TclThreadManager.cc

@@ -58 +58 @@
     ConsoleCommand(TclThreadManager, flush,     AccessLevel::None, false);
 
-    TclThreadManager* instance = &TclThreadManager::getInstance();
+    TclThreadManager* instance_tclthreadmanager = &TclThreadManager::getInstance();
 
     TclThreadManager::TclThreadManager()
@@ -92 +92 @@
         COUT(0) << "Created new Tcl-interpreter with ID " << TclThreadManager::getInstance().threadCounter_ << std::endl;
         return TclThreadManager::getInstance().threadCounter_;
+    }
+
+    unsigned int TclThreadManager::createID(unsigned int threadID)
+    {
+        unsigned int temp = TclThreadManager::getInstance().threadCounter_;
+        TclThreadManager::getInstance().threadCounter_ = threadID - 1;
+        TclThreadManager::create();
+        TclThreadManager::getInstance().threadCounter_ = temp;
+        return threadID;
     }
 
@@ -136 +145 @@
     void TclThreadManager::execute(unsigned int threadID, const std::string& _command)
     {
-        std::string command = _command;
-        while (command.size() >= 2 && command[0] == '{' && command[command.size() - 1] == '}')
-            command = command.substr(1, command.size() - 2);
-
+        std::string command = stripEnclosingBraces(_command);
 
         if (threadID == 0)
@@ -237 +243 @@
     void TclThreadManager::tcl_execute(Tcl::object const &args)
     {
-        std::string command = args.get();
-        while (command.size() >= 2 && command[0] == '{' && command[command.size() - 1] == '}')
-            command = command.substr(1, command.size() - 2);
-
-        TclThreadManager::getInstance().pushCommandToQueue(command);
+        TclThreadManager::getInstance().pushCommandToQueue(stripEnclosingBraces(args.get()));
     }
 
     std::string TclThreadManager::tcl_query(int querierID, Tcl::object const &args)
     {
-        std::string command = args.get();
-        while (command.size() >= 2 && command[0] == '{' && command[command.size() - 1] == '}')
-            command = command.substr(1, command.size() - 2);
-
-        return TclThreadManager::getInstance().evalQuery((unsigned int)querierID, command);
+        return TclThreadManager::getInstance().evalQuery((unsigned int)querierID, stripEnclosingBraces(args.get()));
     }
 
     std::string TclThreadManager::tcl_crossquery(int querierID, int threadID, Tcl::object const &args)
     {
-        std::string command = args.get();
-        while (command.size() >= 2 && command[0] == '{' && command[command.size() - 1] == '}')
-            command = command.substr(1, command.size() - 2);
-
-        return TclThreadManager::getInstance().evalQuery((unsigned int)querierID, (unsigned int)threadID, command);
+        return TclThreadManager::getInstance().evalQuery((unsigned int)querierID, (unsigned int)threadID, stripEnclosingBraces(args.get()));
     }
 
@@ -349 +343 @@
 
         this->forceCommandToFrontOfQueue("error " + error);
+    }
+
+    void TclThreadManager::debug(const std::string& error)
+    {
+        if (boost::this_thread::get_id() != this->threadID_)
+        {
+            boost::mutex::scoped_lock queue_lock(this->orxonoxInterpreterBundle_.queueMutex_);
+            if (this->orxonoxInterpreterBundle_.queue_.size() >= TCLTHREADMANAGER_MAX_QUEUE_LENGTH)
+            {
+                boost::this_thread::yield();
+                return;
+            }
+        }
+
+        this->forceCommandToFrontOfQueue("debug " + error);
     }
 
@@ -506 +515 @@
                     if (successfullyLocked)
                     {
+                        this->debug("TclThread_query: " + command);
                         try
                         {   output = (std::string)target->interpreter_->eval(command);   }
@@ -566 +576 @@
     void tclThread(TclInterpreterBundle* interpreterBundle, std::string command)
     {
-std::cout << "tclthreadm executes " << command << std::endl;
+        TclThreadManager::getInstance().debug("TclThread_execute: " + command);
         boost::mutex::scoped_lock interpreter_lock(interpreterBundle->interpreterMutex_);
         try