Changeset 1247 for code/branches/console/src/core/TclThreadManager.h

Timestamp:

May 8, 2008, 1:46:05 AM (17 years ago)

Author:

landauf

Message:

several changes in TclThreadManager but couldn't yet fix the bug

File:

• code/branches/console/src/core/TclThreadManager.h (modified) (4 diffs)

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

@@ -45 +45 @@
     struct TclThread
     {
+        unsigned int threadID_;
         Tcl::interpreter* interpreter_;
         boost::thread* thread_;
-        boost::try_mutex* mutex_;
+        boost::mutex* evalMutex_;
+        boost::mutex* stateMutex_;
+        enum State
+        {
+            Ready,
+            Busy,
+            Finished,
+            Error
+        }* state_;
     };
 
@@ -60 +69 @@
             static void execute(unsigned int threadID, const std::string& command);
             static std::string query(unsigned int threadID, const std::string& command);
+            static void status();
+            static void dump(unsigned int threadID);
 
+            static std::string tcl_query(int id, Tcl::object const &args);
             static void tcl_execute(Tcl::object const &args);
-            static std::string tcl_orxonox(Tcl::object const &args);
 
             Tcl::interpreter* createTclInterpreter(unsigned int threadID) const;
             bool createTclThread();
             bool destroyTclThread(unsigned int threadID);
+
+            void setState(TclThread* tclThread, TclThread::State state);
+            TclThread::State getState(TclThread* tclThread);
 
             void pushCommandBack(const std::string& command);
@@ -85 +99 @@
 
             bool isReady_;
+            bool isQuerying_;
+            unsigned int queryID_;
 
             unsigned int IDcount_;
-            std::map<unsigned int, TclThread> threads_;
-            std::map<unsigned int, std::queue<std::string> > threadQueues_;
+            std::map<unsigned int, TclThread*> threads_;
+            std::map<unsigned int, std::pair<std::queue<std::string>, boost::condition*> > threadQueues_;
             std::queue<std::string> orxonoxQueue_;
 
-            boost::mutex orxonoxQueueMutex_;
-            boost::mutex threadQueuesMutex_;
-            boost::mutex threadsMutex_;
-            boost::mutex orxonoxEvalMutex_;
+            boost::try_mutex orxonoxQueueMutex_;
+            boost::try_mutex threadQueuesMutex_;
+            boost::try_mutex threadsMutex_;
+            boost::try_mutex orxonoxStateMutex_;
+            boost::try_mutex orxonoxQueryMutex_;
 
             boost::condition orxonoxQueueCondition_;
@@ -100 +117 @@
     };
 
-    _CoreExport void tclThreadLoop(Tcl::interpreter* interpreter, boost::try_mutex* mutex, unsigned int threadID);
+    _CoreExport void tclThreadLoop(TclThread* tclThread);
 }