Changeset 36:5131f790f11c in rrlib_thread


Ignore:
Timestamp:
22.12.2015 15:12:05 (3 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Children:
37:175256080b0d, 40:3c73feee6d4d
Parents:
35:7de42911b3a7 (diff), 34:e0b13f473508 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge with 14.08

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tThread.cpp

    r34 r36  
    3838#ifndef RRLIB_SINGLE_THREADED 
    3939#include <sys/resource.h> 
     40#ifndef __CYGWIN__ 
    4041#include <sys/syscall.h> 
     42#endif 
    4143#include <unistd.h> 
    4244#endif 
     
    7375//---------------------------------------------------------------------- 
    7476#ifndef RRLIB_SINGLE_THREADED 
     77#ifndef __CYGWIN__ 
    7578#ifdef _PTHREAD_H 
    7679#define RRLIB_THREAD_USING_PTHREADS 
     80#endif 
    7781#endif 
    7882#endif 
  • tThread.cpp

    r35 r36  
    517517bool tThread::StopThreads(bool query_only) 
    518518{ 
    519   volatile static bool stopping_threadz = false; 
    520   if (stopping_threadz || query_only)   // We don't do this twice 
    521   { 
    522     return stopping_threadz; 
    523   } 
    524 #ifndef RRLIB_SINGLE_THREADED 
    525   stopping_threadz = true; 
     519  volatile static bool stopping_threads = false; 
     520  if (stopping_threads || query_only)   // We don't do this twice 
     521  { 
     522    return stopping_threads; 
     523  } 
     524#ifndef RRLIB_SINGLE_THREADED 
     525  stopping_threads = true; 
    526526  const char*(*GetLogDescription)() = GetLogDescriptionStatic; 
    527   RRLIB_LOG_PRINT(USER, "Stopping all threads"); 
     527  RRLIB_LOG_PRINT(DEBUG, "Stopping all threads"); 
    528528 
    529529  tLock lock(internal::GetThreadList()->obj_mutex); 
Note: See TracChangeset for help on using the changeset viewer.