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

Merge libCom/osi changes needed for MultiCore Real-Time Utils

Browse Source
This commit is contained in:
Ralph Lange
2012-09-20 22:00:17 +02:00
parent ecba376d72 ca441a2a0e
commit 12909bfb1d
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libCom/osi/os/Linux/osdThread.h
View File

@@ -26,6 +26,7 @@ typedef struct epicsThreadOSD {
pid_t lwpId;
pthread_attr_t attr;
struct sched_param schedParam;
int schedPolicy;
EPICSTHREADFUNC createFunc;
void *createArg;
epicsEventId suspendEvent;
@@ -38,6 +39,7 @@ typedef struct epicsThreadOSD {
} epicsThreadOSD;
epicsShareFunc pthread_t epicsThreadGetPosixThreadId(epicsThreadId id);
epicsShareFunc int epicsThreadGetPosixPriority(epicsThreadId id);
#ifdef __cplusplus
}

16
src/libCom/osi/os/posix/osdThread.c
View File

@@ -106,9 +106,9 @@ if(status) { \
}
#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING)
static int getOssPriorityValue(epicsThreadOSD *pthreadInfo)
epicsShareFunc int epicsThreadGetPosixPriority(epicsThreadId pthreadInfo)
{
#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING)
double maxPriority,minPriority,slope,oss;
if(pcommonAttr->maxPriority==pcommonAttr->minPriority)
@@ -118,8 +118,11 @@ static int getOssPriorityValue(epicsThreadOSD *pthreadInfo)
slope = (maxPriority - minPriority)/100.0;
oss = (double)pthreadInfo->osiPriority * slope + minPriority;
return((int)oss);
}
#else
return 0;
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
}
static void setSchedulingPolicy(epicsThreadOSD *pthreadInfo,int policy)
{
#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING)
@@ -128,7 +131,8 @@ static void setSchedulingPolicy(epicsThreadOSD *pthreadInfo,int policy)
status = pthread_attr_getschedparam(
&pthreadInfo->attr,&pthreadInfo->schedParam);
checkStatusOnce(status,"pthread_attr_getschedparam");
pthreadInfo->schedParam.sched_priority = getOssPriorityValue(pthreadInfo);
pthreadInfo->schedParam.sched_priority = epicsThreadGetPosixPriority(pthreadInfo);
pthreadInfo->schedPolicy = policy;
status = pthread_attr_setschedpolicy(
&pthreadInfo->attr,policy);
checkStatusOnce(status,"pthread_attr_setschedpolicy");
@@ -610,12 +614,12 @@ epicsShareFunc void epicsShareAPI epicsThreadSetPriority(epicsThreadId pthreadIn
pthreadInfo->osiPriority = priority;
if(!pthreadInfo->isRealTimeScheduled) return;
#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING)
pthreadInfo->schedParam.sched_priority = getOssPriorityValue(pthreadInfo);
pthreadInfo->schedParam.sched_priority = epicsThreadGetPosixPriority(pthreadInfo);
status = pthread_attr_setschedparam(
&pthreadInfo->attr,&pthreadInfo->schedParam);
if(errVerbose) checkStatus(status,"pthread_attr_setschedparam");
status = pthread_setschedparam(
pthreadInfo->tid,pcommonAttr->schedPolicy,&pthreadInfo->schedParam);
pthreadInfo->tid, pthreadInfo->schedPolicy, &pthreadInfo->schedParam);
if(errVerbose) checkStatus(status,"pthread_setschedparam");
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
}

2
src/libCom/osi/os/posix/osdThread.h
View File

@@ -25,6 +25,7 @@ typedef struct epicsThreadOSD {
pthread_t tid;
pthread_attr_t attr;
struct sched_param schedParam;
int schedPolicy;
EPICSTHREADFUNC createFunc;
void *createArg;
epicsEventId suspendEvent;
@@ -37,6 +38,7 @@ typedef struct epicsThreadOSD {
} epicsThreadOSD;
epicsShareFunc pthread_t epicsThreadGetPosixThreadId(epicsThreadId id);
epicsShareFunc int epicsThreadGetPosixPriority(epicsThreadId id);
#ifdef __cplusplus
}