Changeset 852b1ce in tol

Timestamp:

May 2, 2013, 10:52:54 AM (13 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

4acc8bd

Parents:

6fce577

Message:

refs #770, deshabilitamos el thread hasta tener una lib de boost que compile bien con tol en VC9.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@5759 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/bgrammar/oprimp.cpp (modified) (18 diffs)

tol/btol/bgrammar/oprimp.cpp

@@ -22 +22 @@
 //#define TRACE_LEVEL 1
 
+#define DONOT_USE_THREAD_PROFILE
+
 #include <iostream>
-#include <boost/asio.hpp>
+
+#ifndef DONOT_USE_THREAD_PROFILE
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/locks.hpp>
+#endif
 
 #if defined(_MSC_VER)
@@ -79 +83 @@
 #ifdef Do_TolOprProfiler
 
+#ifndef DONOT_USE_THREAD_PROFILE
 typedef boost::shared_mutex Lock;
 typedef boost::unique_lock< Lock > WriteLock;
@@ -85 +90 @@
 Lock myLock;
 
+#define WRITE_LOCK \
+  WriteLock w_lock(myLock);
+#define READ_LOCK \
+  ReadLock r_lock(myLock);
+
 void SampleProfiler();
+#else
+#define WRITE_LOCK
+#define READ_LOCK
+#endif
 
 //--------------------------------------------------------------------
@@ -111 +125 @@
   static BTolOprProfiler* ptrCurrentProfiler;
   static size_t TickResolution;
+
+#ifndef DONOT_USE_THREAD_PROFILE
   static boost::thread *ptrThread;
+#endif
 
   struct CalllingStr
@@ -283 +300 @@
   static void StartThread()
   {
+#ifndef DONOT_USE_THREAD_PROFILE
     if (!BTolOprProfiler::ptrThread)
       {
       BTolOprProfiler::ptrThread = new boost::thread(&SampleProfiler);
       }
+#endif
   }
 
   static void StopThread()
   {
+#ifndef DONOT_USE_THREAD_PROFILE
     if (BTolOprProfiler::ptrThread)
       {
@@ -297 +317 @@
       BTolOprProfiler::ptrThread = NULL;
       }
+#endif
   }
 
@@ -302 +323 @@
   {
     // REVIEW: adquire an exclusive lock
-    WriteLock w_lock(myLock);
+    WRITE_LOCK;
     BTolOprProfiler::ptrCurrentProfiler = profiler;
     // REVIEW: release the lock (released when leaving scope
@@ -310 +331 @@
   {
     // REVIEW: adquire an exclusive lock
-    ReadLock r_lock(myLock);
+    READ_LOCK;
     return BTolOprProfiler::ptrCurrentProfiler;
     // REVIEW: release the lock (released when leaving scope
@@ -318 +339 @@
   {
     // REVIEW: adquire a lock
-    WriteLock w_lock(myLock);
+    WRITE_LOCK;
     if (BTolOprProfiler::ptrCurrentProfiler) 
       {
@@ -330 +351 @@
   {
     // REVIEW: adquire a lock
-    WriteLock w_lock(myLock);
+    WRITE_LOCK;
     if (BTolOprProfiler::ptrCurrentProfiler) 
       {
@@ -344 +365 @@
   {
     // REVIEW: adquire a lock
-    ReadLock r_lock(myLock);
+    READ_LOCK;
     if (BTolOprProfiler::ptrCurrentProfiler)
       {
@@ -356 +377 @@
   {
     // REVIEW: adquire a lock
-    WriteLock w_lock(myLock);
+    WRITE_LOCK;
     size_t previous = BTolOprProfiler::TickResolution;
     BTolOprProfiler::TickResolution = resolution;
@@ -366 +387 @@
   {
     // REVIEW: adquire a lock
-    ReadLock r_lock(myLock);
+    READ_LOCK;
     return BTolOprProfiler::TickResolution;
     // REVIEW: release the lock, released when leaving scope 
@@ -558 +579 @@
 void SampleProfiler()
 {
+#ifndef DONOT_USE_THREAD_PROFILE
   size_t resolution = BTolOprProfiler::GetTickResolution();
   while(1) 
@@ -565 +587 @@
     boost::this_thread::sleep(boost::posix_time::microseconds(resolution));
     }
+#endif
 }
 
@@ -603 +626 @@
 //--------------------------------------------------------------------
 {
+#ifndef DONOT_USE_THREAD_PROFILE
   if (BTolOprProfiler::ptrThread)
     {
@@ -609 +633 @@
     return;
     }
+#endif
   double freq = Real(Arg(1));
   BTolOprProfiler::enabled_ = 1;
@@ -641 +666 @@
 BTolOprProfiler* BTolOprProfiler::ptrCurrentProfiler = NULL;
 size_t BTolOprProfiler::TickResolution = 1;
+
+#ifndef DONOT_USE_THREAD_PROFILE
 boost::thread *BTolOprProfiler::ptrThread = NULL;
+#endif
 
 int BTolOprProfiler_Init() { return(BTolOprProfiler::Initialize()); }