Changeset 2086 for trunk/Clp/src

Timestamp:

Jan 15, 2015 3:55:27 AM (5 years ago)

Author:

forrest

Message:

cleaner way for thread barrier

Location:

trunk/Clp/src

Files:

• ClpSimplex.hpp (modified) (4 diffs)
• ClpSolve.cpp (modified) (3 diffs)

trunk/Clp/src/ClpSimplex.hpp

@@ -268 +268 @@
      /// Primal initial solve
      int initialPrimalSolve();
-/// Barrier initial solve
+     /// Barrier initial solve
      int initialBarrierSolve();
      /// Barrier initial solve, not to be followed by crossover
@@ -1728 +1728 @@
 #define DEVEX_TRY_NORM 1.0e-4
 #define DEVEX_ADD_ONE 1.0
-#if defined(ABC_INHERIT) || defined(THREADS_IN_ANALYZE)
-#ifndef NORMAL_PTHREADS
-#define NORMAL_PTHREADS
-#endif
-#endif
 #if defined(ABC_INHERIT) || defined(CBC_THREAD) || defined(THREADS_IN_ANALYZE)
 // Use pthreads
@@ -1766 +1761 @@
   inline pthread_mutex_t * mutexPointer(int which,int thread=0) 
   { return mutex_+which+3*thread;}
-#ifdef NORMAL_PTHREADS
+#ifdef PTHREAD_BARRIER_SERIAL_THREAD
   inline pthread_barrier_t * barrierPointer() 
   { return &barrier_;}
@@ -1784 +1779 @@
   // For waking up thread
   pthread_mutex_t mutex_[3*(NUMBER_THREADS+1)];
-#ifdef NORMAL_PTHREADS
+#ifdef PTHREAD_BARRIER_SERIAL_THREAD
   pthread_barrier_t barrier_; 
 #endif

trunk/Clp/src/ClpSolve.cpp

@@ -5641 +5641 @@
   threadInfo->status=-1;
   int * which = threadInfo->stuff;
-#ifdef NORMAL_PTHREADS
+#ifdef PTHREAD_BARRIER_SERIAL_THREAD
   pthread_barrier_wait(driver->barrierPointer());
 #endif
@@ -5715 +5715 @@
     threadInfo_[iThread].status = 100;
   }
-#ifdef NORMAL_PTHREADS
+#ifdef PTHREAD_BARRIER_SERIAL_THREAD
   //pthread_barrierattr_t attr;
   pthread_barrier_init(&barrier_, /*&attr*/ NULL, numberThreads+1); 
@@ -5722 +5722 @@
     pthread_create(&abcThread_[iThread], NULL, parallelManager, reinterpret_cast<void *>(this));
   }
-#ifdef NORMAL_PTHREADS
+#ifdef PTHREAD_BARRIER_SERIAL_THREAD
   pthread_barrier_wait(&barrier_);
   pthread_barrier_destroy(&barrier_);