diff --git a/src/OpenThreads/pthreads/PThread.cpp b/src/OpenThreads/pthreads/PThread.cpp index 5cead3ce0..f58d798b4 100644 --- a/src/OpenThreads/pthreads/PThread.cpp +++ b/src/OpenThreads/pthreads/PThread.cpp @@ -52,17 +52,19 @@ #endif #include +#include #include "PThreadPrivateData.h" #include using namespace OpenThreads; - +/* #ifdef DEBUG # define DPRINTF(arg) printf arg #else # define DPRINTF(arg) #endif +*/ //----------------------------------------------------------------------------- // Initialize the static unique ids. @@ -191,7 +193,8 @@ private: int status = pthread_setspecific(PThreadPrivateData::s_tls_key, thread); if (status) { - printf("Error: pthread_setspecific(,) returned error status, status = %d\n",status); + OSG_NOTICE<<"pthread_setspecific(,) returned error status: "<getProcessId(), - strerror(status)); + OSG_NOTICE<<"THREAD INFO - ID("<getProcessId()<<") : Get sched: "<getProcessId(), + strerror(status));*/ } else { - printf( + OSG_NOTICE<<"THREAD INFO - ID("<getProcessId()<<") :\ + Thread running at "<<(my_policy == SCHED_FIFO ? "SCHEDULE_FIFO" + : (my_policy == SCHED_RR ? "SCHEDULE_ROUND_ROBIN" + : (my_policy == SCHED_OTHER ? "SCHEDULE_OTHER" + : "UNKNOWN")))<<"/ Priority: "<<\ + my_param.sched_priority<getProcessId(), + (int)thread->getProcessId(), (my_policy == SCHED_FIFO ? "SCHEDULE_FIFO" : (my_policy == SCHED_RR ? "SCHEDULE_ROUND_ROBIN" : (my_policy == SCHED_OTHER ? "SCHEDULE_OTHER" : "UNKNOWN"))), - my_param.sched_priority); + my_param.sched_priority);*/ max_priority = sched_get_priority_max(my_policy); min_priority = sched_get_priority_min(my_policy); - printf( + OSG_NOTICE<<"THREAD INFO - ID("<getProcessId()<<") :\ + Max priority: "<getProcessId(), - max_priority, min_priority); + (int)thread->getProcessId(), + max_priority, min_priority);*/ } } else { - printf( + OSG_NOTICE<<"THREAD INFO - ID("<getProcessId()<<") :\ + POSIX Priority scheduling not available"<getProcessId()); + (int)thread->getProcessId());*/ } fflush(stdout); @@ -472,7 +486,8 @@ void Thread::Init() int status = pthread_key_create(&PThreadPrivateData::s_tls_key, NULL); if (status) { - printf("Error: pthread_key_create(,) returned error status, status = %d\n",status); + OSG_NOTICE<<"pthread_key_create() returned error status: "<threadPriority = priority; - if(pd->isRunning) + if(pd->isRunning()) return ThreadPrivateActions::SetThreadSchedulingParams(this); else return 0; @@ -869,7 +884,7 @@ int Thread::setSchedulePolicy(ThreadPolicy policy) pd->threadPolicy = policy; - if(pd->isRunning) + if(pd->isRunning()) return ThreadPrivateActions::SetThreadSchedulingParams(this); else return 0;