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

Let posix version of osdTime work on systems without real-time capability.

Browse Source
This commit is contained in:
W. Eric Norum
2004-10-07 19:39:00 +00:00
parent 372a3dc989
commit 667ab7eab8
2 changed files with 23 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
src/libCom/osi/os/Darwin/osdTime.cpp
View File

@@ -1,121 +0,0 @@
/*************************************************************************\
* Copyright (c) 2002 The University of Saskatchewan
* EPICS BASE Versions 3.13.7
* and higher are distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/*
* $Id$
*
* Author: Eric Norum
*/
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "osiSock.h"
#include "cantProceed.h"
#define epicsExportSharedSymbols
#include "epicsTime.h"
//
// epicsTime::osdGetCurrent ()
//
extern "C" epicsShareFunc int epicsShareAPI epicsTimeGetCurrent (epicsTimeStamp *pDest)
{
# ifdef CLOCK_REALTIME
struct timespec ts;
int status;
status = clock_gettime (CLOCK_REALTIME, &ts);
if (status) {
return epicsTimeERROR;
}
*pDest = epicsTime (ts);
return epicsTimeOK;
# else
int status;
struct timeval tv;
struct timezone tz;
status = gettimeofday (&tv, &tz);
if (status) {
return epicsTimeERROR;
}
*pDest = epicsTime (tv);
return epicsTimeOK;
# endif
}
//
// epicsTimeGetEvent ()
//
extern "C" epicsShareFunc int epicsShareAPI epicsTimeGetEvent (epicsTimeStamp *pDest, int eventNumber)
{
if (eventNumber==epicsTimeEventCurrentTime) {
return epicsTimeGetCurrent (pDest);
}
return epicsTimeERROR;
}
int epicsTime_gmtime ( const time_t *pAnsiTime, // X aCC 361
struct tm *pTM )
{
struct tm * pRet = gmtime_r ( pAnsiTime, pTM );
if ( pRet ) {
return epicsTimeOK;
}
else {
return epicsTimeERROR;
}
}
int epicsTime_localtime ( const time_t *clock, // X aCC 361
struct tm *result )
{
struct tm * pRet = localtime_r ( clock, result );
if ( pRet ) {
return epicsTimeOK;
}
else {
return epicsTimeERROR;
}
}
extern "C" epicsShareFunc void epicsShareAPI
convertDoubleToWakeTime(double timeout,struct timespec *wakeTime)
{
struct timespec wait;
int status;
if(timeout<0.0) timeout = 0.0;
else if(timeout>3600.0) timeout = 3600.0;
# ifdef CLOCK_REALTIME
status = clock_gettime(CLOCK_REALTIME,wakeTime);
# else
{
struct timeval tv;
struct timezone tz;
status = gettimeofday(&tv, &tz);
wakeTime->tv_sec = tv.tv_sec;
wakeTime->tv_nsec = tv.tv_usec * 1000;
}
# endif
if(status) {
printf("clock_gettime failed with error %s\n",strerror(errno));
cantProceed("convertDoubleToWakeTime");
}
wait.tv_sec = timeout;
wait.tv_nsec = (long)((timeout - (double)wait.tv_sec) * 1e9);
wakeTime->tv_sec += wait.tv_sec;
wakeTime->tv_nsec += wait.tv_nsec;
if(wakeTime->tv_nsec>1000000000L) {
wakeTime->tv_nsec -= 1000000000L;
++wakeTime->tv_sec;
}
}

23
src/libCom/osi/os/posix/osdTime.cpp
View File

@@ -30,6 +30,7 @@
//
extern "C" epicsShareFunc int epicsShareAPI epicsTimeGetCurrent (epicsTimeStamp *pDest)
{
# ifdef CLOCK_REALTIME
struct timespec ts;
int status;
@@ -40,6 +41,18 @@ extern "C" epicsShareFunc int epicsShareAPI epicsTimeGetCurrent (epicsTimeStamp
*pDest = epicsTime (ts);
return epicsTimeOK;
# else
int status;
struct timeval tv;
struct timezone tz;
status = gettimeofday (&tv, &tz);
if (status) {
return epicsTimeERROR;
}
*pDest = epicsTime (tv);
return epicsTimeOK;
# endif
}
//
@@ -85,7 +98,17 @@ extern "C" epicsShareFunc void epicsShareAPI
if(timeout<0.0) timeout = 0.0;
else if(timeout>3600.0) timeout = 3600.0;
# ifdef CLOCK_REALTIME
status = clock_gettime(CLOCK_REALTIME,wakeTime);
# else
{
struct timeval tv;
struct timezone tz;
status = gettimeofday(&tv, &tz);
wakeTime->tv_sec = tv.tv_sec;
wakeTime->tv_nsec = tv.tv_usec * 1000;
}
# endif
if(status) {
printf("clock_gettime failed with error %s\n",strerror(errno));
cantProceed("convertDoubleToWakeTime");