Changeset 1276 for code/branches/console/src

Timestamp:

May 15, 2008, 1:05:58 AM (17 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.

Location:

code/branches/console/src

Files:

• core/CMakeLists.txt (modified) (1 diff)
• core/CommandExecutor.cc (modified) (2 diffs)
• core/CorePrereqs.h (modified) (3 diffs)
• core/IRC.cc (added)
• core/IRC.h (added)
• core/TclBind.cc (modified) (4 diffs)
• core/TclThreadManager.cc (modified) (7 diffs)
• core/TclThreadManager.h (modified) (2 diffs)
• util/String.cc (modified) (1 diff)
• util/String.h (modified) (1 diff)

code/branches/console/src/core/CMakeLists.txt

@@ -28 +28 @@
   TclBind.cc
   TclThreadManager.cc
+  IRC.cc
 )
 

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

@@ -100 +100 @@
     {
         if (newline)
-            std::cout << text << std::endl;
+            COUT(0) << text << std::endl;
         else
-            std::cout << text;
+            COUT(0) << text;
     }
 
@@ -412 +412 @@
         if (evaluation.bEvaluatedParams_ && evaluation.evaluatedExecutor_)
         {
-std::cout << "CE_execute (evaluation): " << evaluation.evaluatedExecutor_->getName() << " " << evaluation.param_[0] << " " << evaluation.param_[1] << " " << evaluation.param_[2] << " " << evaluation.param_[3] << " " << evaluation.param_[4] << std::endl;
+            COUT(4) << "CE_execute (evaluation): " << evaluation.evaluatedExecutor_->getName() << " " << evaluation.param_[0] << " " << evaluation.param_[1] << " " << evaluation.param_[2] << " " << evaluation.param_[3] << " " << evaluation.param_[4] << std::endl;
             (*evaluation.evaluatedExecutor_)(evaluation.param_[0], evaluation.param_[1], evaluation.param_[2], evaluation.param_[3], evaluation.param_[4]);
             return true;
         }
 
-std::cout << "CE_execute: " << evaluation.processedCommand_ << "\n";
+        COUT(4) << "CE_execute: " << evaluation.processedCommand_ << "\n";
         switch (evaluation.state_)
         {

code/branches/console/src/core/CorePrereqs.h

@@ -119 +119 @@
   class InputHandlerGUI;
   class InputManager;
+  class IRC;
   template <class T>
   class Iterator;
@@ -135 +136 @@
   class ObjectListElement;
   class OrxonoxClass;
+  class OutputBuffer;
   class OutputHandler;
   class Shell;
@@ -140 +142 @@
   class SubclassIdentifier;
   class TclBind;
+  struct TclInterpreterBundle;
   class Tickable;
   template <class T, class O>

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

@@ -35 +35 @@
 #include "TclThreadManager.h"
 #include "TclBind.h"
+#include "util/String.h"
 
 namespace orxonox
@@ -104 +105 @@
     std::string TclBind::tcl_query(Tcl::object const &args)
     {
-std::cout << "Tcl_query: args: " << args.get() << std::endl;
-        std::string command = args.get();
+        COUT(4) << "Tcl_query: " << args.get() << std::endl;
 
-        while (command.size() >= 2 && command[0] == '{' && command[command.size() - 1] == '}')
-            command = command.substr(1, command.size() - 2);
+        std::string command = stripEnclosingBraces(args.get());
 
         if (!CommandExecutor::execute(command, false))
@@ -121 +120 @@
     void TclBind::tcl_execute(Tcl::object const &args)
     {
-std::cout << "Tcl_execute: args: " << args.get() << std::endl;
-        std::string command = args.get();
-
-        while (command.size() >= 2 && command[0] == '{' && command[command.size() - 1] == '}')
-            command = command.substr(1, command.size() - 2);
+        COUT(4) << "Tcl_execute: " << args.get() << std::endl;
+        std::string command = stripEnclosingBraces(args.get());
 
         if (!CommandExecutor::execute(command, false))
@@ -150 +146 @@
     void TclBind::bgerror(std::string error)
     {
-        while (error.size() >= 2 && error[0] == '{' && error[error.size() - 1] == '}')
-            error = error.substr(1, error.size() - 2);
-
-        COUT(1) << "Tcl background error: " << error << std::endl;
+        COUT(1) << "Tcl background error: " << stripEnclosingBraces(error) << std::endl;
     }
 

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

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

@@ -73 +73 @@
 
             static unsigned int create();
+            static unsigned int createID(unsigned int threadID);
             static void destroy(unsigned int threadID);
             static void execute(unsigned int threadID, const std::string& command);
@@ -89 +90 @@
             std::string dumpList(const std::list<unsigned int>& list);
             void error(const std::string& error);
+            void debug(const std::string& error);
 
             void pushCommandToQueue(const std::string& command);

code/branches/console/src/util/String.cc

@@ -185 +185 @@
     else
         return str;
+}
+
+/**
+    @brief Removes enclosing {braces}.
+    @param str The string to strip
+    @return The striped string
+*/
+std::string stripEnclosingBraces(const std::string& str)
+{
+    std::string output = str;
+
+    while (output.size() >= 2 && output[0] == '{' && output[output.size() - 1] == '}')
+        output = output.substr(1, output.size() - 2);
+
+    return output;
 }
 

code/branches/console/src/util/String.h

@@ -47 +47 @@
 
 _UtilExport std::string  stripEnclosingQuotes(const std::string& str);
+_UtilExport std::string  stripEnclosingBraces(const std::string& str);
 
 _UtilExport bool         isEmpty(const std::string& str);