FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed indentation

Browse Source
This commit is contained in:
Robert Osfield
2011-03-08 15:31:49 +00:00
parent 42b709a9f4
commit 99aeca003b
3 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/OpenThreads/pthreads/PThreadBarrier.cpp
View File

@@ -87,17 +87,17 @@ Barrier::Barrier(int numThreads) {
if(sysconf(_POSIX_THREAD_PRIO_INHERIT)) {
pthread_mutexattr_setprotocol(&mutex_attr, PTHREAD_PRIO_INHERIT);
pthread_mutexattr_setprotocol(&mutex_attr, PTHREAD_PRIO_INHERIT);
} else if (sysconf(_POSIX_THREAD_PRIO_PROTECT)) {
int th_policy;
struct sched_param th_param;
pthread_getschedparam(pthread_self(), &th_policy, &th_param);
int th_policy;
struct sched_param th_param;
pthread_getschedparam(pthread_self(), &th_policy, &th_param);
pthread_mutexattr_setprotocol(&mutex_attr, PTHREAD_PRIO_PROTECT);
pthread_mutexattr_setprioceiling(&mutex_attr,
sched_get_priority_max(th_policy));
pthread_mutexattr_setprotocol(&mutex_attr, PTHREAD_PRIO_PROTECT);
pthread_mutexattr_setprioceiling(&mutex_attr,
sched_get_priority_max(th_policy));
}

34
src/OpenThreads/pthreads/PThreadCondition.cpp
View File

@@ -36,24 +36,24 @@ int gettimeofday(struct timeval* tp, void* tzp) {
LARGE_INTEGER t;
if(QueryPerformanceCounter(&t)) {
/* hardware supports a performance counter */
static int been_here = 0;
static LARGE_INTEGER f;
if( !been_here )
{
been_here = 1;
QueryPerformanceFrequency(&f);
}
tp->tv_sec = t.QuadPart/f.QuadPart;
tp->tv_usec = ((float)t.QuadPart/f.QuadPart*1000*1000)
- (tp->tv_sec*1000*1000);
/* hardware supports a performance counter */
static int been_here = 0;
static LARGE_INTEGER f;
if( !been_here )
{
been_here = 1;
QueryPerformanceFrequency(&f);
}
tp->tv_sec = t.QuadPart/f.QuadPart;
tp->tv_usec = ((float)t.QuadPart/f.QuadPart*1000*1000)
- (tp->tv_sec*1000*1000);
} else {
/* hardware doesn't support a performance counter, so get the
time in a more traditional way. */
DWORD t;
t = timeGetTime();
tp->tv_sec = t / 1000;
tp->tv_usec = t % 1000;
/* hardware doesn't support a performance counter, so get the
time in a more traditional way. */
DWORD t;
t = timeGetTime();
tp->tv_sec = t / 1000;
tp->tv_usec = t % 1000;
}
/* 0 indicates that the call succeeded. */

18
src/OpenThreads/pthreads/PThreadMutex.cpp
View File

@@ -75,18 +75,18 @@ Mutex::Mutex(MutexType type):
#if defined (_POSIX_THREAD_PRIO_INHERIT) || defined (_POSIX_THREAD_PRIO_PROTECT) // [
if(sysconf(_POSIX_THREAD_PRIO_INHERIT)) {
pthread_mutexattr_setprotocol(&mutex_attr, PTHREAD_PRIO_INHERIT);
pthread_mutexattr_setprotocol(&mutex_attr, PTHREAD_PRIO_INHERIT);
} else if (sysconf(_POSIX_THREAD_PRIO_PROTECT)) {
int th_policy;
struct sched_param th_param;
pthread_getschedparam(pthread_self(), &th_policy, &th_param);
int th_policy;
struct sched_param th_param;
pthread_getschedparam(pthread_self(), &th_policy, &th_param);
pthread_mutexattr_setprotocol(&mutex_attr, PTHREAD_PRIO_PROTECT);
pthread_mutexattr_setprioceiling(&mutex_attr,
sched_get_priority_max(th_policy));
pthread_mutexattr_setprotocol(&mutex_attr, PTHREAD_PRIO_PROTECT);
pthread_mutexattr_setprioceiling(&mutex_attr,
sched_get_priority_max(th_policy));
}