Changeset 1337

Timestamp:

May 20, 2008, 7:08:57 PM (16 years ago)

Author:

landauf

Message:

TclThreadManager should now work with old and new versions of boost.
tested with 1_33_1, 1_34_1, 1_35_0

Location:

code/branches/console

Files:

• cmake/FindBoost.cmake (modified) (2 diffs)
• src/core/TclThreadManager.cc (modified) (13 diffs)
• src/core/TclThreadManager.h (modified) (2 diffs)

code/branches/console/cmake/FindBoost.cmake

@@ -116 +116 @@
   SET(Boost_INCLUDE_DIR
 #    ../libs/boost_1_33_1
-    ../libs/boost_1_35_0
+    ../libs/boost_1_34_1
+#    ../libs/boost_1_35_0
   )
 ELSE(WIN32)
@@ -192 +193 @@
   gcc-1_33_1
   gcc-mt-1_33_1
+  mgw34-mt-1_34_1
   mgw34-mt-1_35
 )

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

@@ -67 +67 @@
         this->orxonoxInterpreterBundle_.id_ = 0;
         this->orxonoxInterpreterBundle_.interpreter_ = TclBind::getInstance().getTclInterpreter();
+#if (BOOST_VERSION >= 103500)
         this->threadID_ = boost::this_thread::get_id();
+#else
+        //
+#endif
     }
 
@@ -119 +123 @@
                     {
                         boost::mutex::scoped_lock bundles_lock(TclThreadManager::getInstance().bundlesMutex_);
-                        boost::mutex::scoped_lock interpreter_lock(bundle->interpreterMutex_, boost::defer_lock_t());
+#if (BOOST_VERSION >= 103500)
+                        boost::mutex::scoped_try_lock interpreter_lock(bundle->interpreterMutex_);
+#else
+                        boost::try_mutex::scoped_try_lock interpreter_lock(bundle->interpreterMutex_);
+#endif
                         try
                         {
@@ -125 +133 @@
                             {
                                 TclThreadManager::getInstance().orxonoxEvalCondition_.notify_one();
+#if (BOOST_VERSION >= 103500)
                                 boost::this_thread::yield();
+#else
+                                boost::thread::yield();
+#endif
                             }
                         } catch (...) {}
@@ -136 +148 @@
 
                 TclThreadManager::getInstance().orxonoxEvalCondition_.notify_one();
+#if (BOOST_VERSION >= 103500)
                 boost::this_thread::yield();
+#else
+                boost::thread::yield();
+#endif
             }
 
@@ -183 +199 @@
             output += "\t\t";
             {
-                boost::mutex::scoped_lock interpreter_lock((*it).second->interpreterMutex_, boost::defer_lock_t());
+#if (BOOST_VERSION >= 103500)
+                boost::mutex::scoped_try_lock interpreter_lock((*it).second->interpreterMutex_);
+#else
+                boost::try_mutex::scoped_try_lock interpreter_lock((*it).second->interpreterMutex_);
+#endif
                 if (interpreter_lock.try_lock())
                     output += "ready";
@@ -332 +352 @@
     void TclThreadManager::error(const std::string& error)
     {
+#if (BOOST_VERSION >= 103500)
         if (boost::this_thread::get_id() != this->threadID_)
+#else
+        if (boost::thread() != this->threadID_)
+#endif
         {
             boost::mutex::scoped_lock queue_lock(this->orxonoxInterpreterBundle_.queueMutex_);
             if (this->orxonoxInterpreterBundle_.queue_.size() >= TCLTHREADMANAGER_MAX_QUEUE_LENGTH)
             {
+#if (BOOST_VERSION >= 103500)
                 boost::this_thread::yield();
+#else
+                boost::thread::yield();
+#endif
                 return;
             }
@@ -347 +375 @@
     void TclThreadManager::debug(const std::string& error)
     {
+#if (BOOST_VERSION >= 103500)
         if (boost::this_thread::get_id() != this->threadID_)
+#else
+        if (boost::thread() != this->threadID_)
+#endif
         {
             boost::mutex::scoped_lock queue_lock(this->orxonoxInterpreterBundle_.queueMutex_);
             if (this->orxonoxInterpreterBundle_.queue_.size() >= TCLTHREADMANAGER_MAX_QUEUE_LENGTH)
             {
+#if (BOOST_VERSION >= 103500)
                 boost::this_thread::yield();
+#else
+                boost::thread::yield();
+#endif
                 return;
             }
@@ -461 +497 @@
             if (this->updateQueriersList(querier, &this->orxonoxInterpreterBundle_))
             {
+#if (BOOST_VERSION >= 103500)
                 boost::mutex::scoped_lock interpreter_lock(this->orxonoxInterpreterBundle_.interpreterMutex_);
+#else
+                boost::try_mutex::scoped_lock interpreter_lock(this->orxonoxInterpreterBundle_.interpreterMutex_);
+#endif
                 this->orxonoxEvalCondition_.wait(interpreter_lock);
 
@@ -498 +538 @@
                 if (this->updateQueriersList(querier, target))
                 {
-                    boost::mutex::scoped_lock interpreter_lock(target->interpreterMutex_, boost::defer_lock_t());
+#if (BOOST_VERSION >= 103500)
+                    boost::mutex::scoped_try_lock interpreter_lock(target->interpreterMutex_);
+#else
+                    boost::try_mutex::scoped_try_lock interpreter_lock(target->interpreterMutex_);
+#endif
                     bool successfullyLocked = false;
                     try
@@ -507 +551 @@
                         {
                             while (!interpreter_lock.try_lock())
+                            {
+#if (BOOST_VERSION >= 103500)
                                 boost::this_thread::yield();
+#else
+                                boost::thread::yield();
+#endif
+                            }
 
                             successfullyLocked = true;
@@ -540 +590 @@
         {
             this->orxonoxEvalCondition_.notify_one();
+#if (BOOST_VERSION >= 103500)
             boost::this_thread::yield();
+#else
+            boost::thread::yield();
+#endif
         }
 
@@ -562 +616 @@
 
         {
+#if (BOOST_VERSION >= 103500)
             boost::mutex::scoped_lock interpreter_lock(this->orxonoxInterpreterBundle_.interpreterMutex_);
+#else
+            boost::try_mutex::scoped_lock interpreter_lock(this->orxonoxInterpreterBundle_.interpreterMutex_);
+#endif
             unsigned long maxtime = (unsigned long)(dt * 1000000 * TCLTHREADMANAGER_MAX_CPU_USAGE);
             Ogre::Timer timer;
@@ -577 +635 @@
     {
         TclThreadManager::getInstance().debug("TclThread_execute: " + command);
+#if (BOOST_VERSION >= 103500)
         boost::mutex::scoped_lock interpreter_lock(interpreterBundle->interpreterMutex_);
+#else
+        boost::try_mutex::scoped_lock interpreter_lock(interpreterBundle->interpreterMutex_);
+#endif
         try
         {

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

@@ -36 +36 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
+#include <boost/thread/thread.hpp>
 
 #include "CorePrereqs.h"
@@ -119 +120 @@
             boost::condition fullQueueCondition_;
             boost::condition orxonoxEvalCondition_;
+#if (BOOST_VERSION >= 103500)
             boost::thread::id threadID_;
+#else
+            boost::thread threadID_;
+#endif
     };