Experimental Physics and
Industrial Control System

Freddie Akeroyd via Core-talk <core-talk at aps.anl.gov> · Wed, 30 Sep 2020 18:33:42 -0000

Diff comments:

> diff --git a/modules/libcom/src/osi/os/WIN32/osdMonotonic.c b/modules/libcom/src/osi/os/WIN32/osdMonotonic.c
> index cb84643..208c1aa 100644
> --- a/modules/libcom/src/osi/os/WIN32/osdMonotonic.c
> +++ b/modules/libcom/src/osi/os/WIN32/osdMonotonic.c
> @@ -39,15 +42,10 @@ epicsUInt64 epicsMonotonicResolution(void)
>  epicsUInt64 epicsMonotonicGet(void)
>  {
>      LARGE_INTEGER val;
> -    if(osdUsePrefCounter) {
> -        if(!QueryPerformanceCounter(&val)) {
> -            errMessage(errlogMinor, "Warning: failed to fetch performance counter\n");
> -            return 0;
> -        } else
> -            return val.QuadPart;
> +    if(!QueryPerformanceCounter(&val)) {
> +        cantProceed("epicsMonotonicGet: Failed to read Windows Performance Counter\n");
> +        return 0;
>      } else {
> -        epicsUInt64 ret = GetTickCount();
> -        ret *= 1000000;
> -        return ret;
> +        return (epicsUInt64)(val.QuadPart * perfCounterScale + 0.5); /* return value in nanoseconds */

I agree - a separate MR for the extra functions. I think subtracting the ioc startup val.QuadPart makes it good enough for the moment.

>      }
>  }

-- 
https://code.launchpad.net/~freddie-akeroyd/epics-base/+git/epics-base/+merge/391018
Your team EPICS Core Developers is subscribed to branch epics-base:7.0.

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System