epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Moved condWait() into conditional compilation area where it's used.

Browse Source
This commit is contained in:
Andrew Johnson
2008-03-17 22:18:25 +00:00
parent 3a40dddccb
commit 87c4db7e4d
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libCom/osi/os/posix/osdMutex.c
View File

@@ -47,15 +47,6 @@ static int mutexLock(pthread_mutex_t *id)
}
}
static int condWait(pthread_cond_t *condId, pthread_mutex_t *mutexId)
{
int status;
while(1) {
status = pthread_cond_wait(condId,mutexId);
if(status!=EINTR) return status;
errlogPrintf("pthread_cond_wait returned EINTR. Violates SUSv3\n");
}
}
/* Until these can be demonstrated to work leave them undefined*/
/* On solaris 8 _POSIX_THREAD_PRIO_INHERIT fails*/
#undef _POSIX_THREAD_PROCESS_SHARED
@@ -220,6 +211,16 @@ void epicsMutexOsdUnlock(struct epicsMutexOSD * pmutex)
checkStatusQuit(status,"pthread_mutex_unlock","epicsMutexOsdUnlock");
}
static int condWait(pthread_cond_t *condId, pthread_mutex_t *mutexId)
{
int status;
while(1) {
status = pthread_cond_wait(condId,mutexId);
if(status!=EINTR) return status;
errlogPrintf("pthread_cond_wait returned EINTR. Violates SUSv3\n");
}
}
epicsMutexLockStatus epicsMutexOsdLock(struct epicsMutexOSD * pmutex)
{
pthread_t tid = pthread_self();