From c853234e01a3f932079ba87114aadc2e3db58644 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 8 Jun 2017 09:53:07 -0400 Subject: [PATCH] Remove artificial 60-minute timeout limit (Posix) --- src/libCom/osi/os/Darwin/osdTime.cpp | 4 +--- src/libCom/osi/os/posix/osdTime.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libCom/osi/os/Darwin/osdTime.cpp b/src/libCom/osi/os/Darwin/osdTime.cpp index f3e6db5dd..bf16aea3a 100644 --- a/src/libCom/osi/os/Darwin/osdTime.cpp +++ b/src/libCom/osi/os/Darwin/osdTime.cpp @@ -69,10 +69,8 @@ convertDoubleToWakeTime(double timeout, struct timespec *wakeTime) clock_get_time(host_clock, &now); - if (timeout<0.0) + if (timeout < 0.0) timeout = 0.0; - else if(timeout>3600.0) - timeout = 3600.0; wait.tv_sec = static_cast< long >(timeout); wait.tv_nsec = static_cast< long >((timeout - (double)wait.tv_sec) * 1e9); diff --git a/src/libCom/osi/os/posix/osdTime.cpp b/src/libCom/osi/os/posix/osdTime.cpp index 8a075f8ae..718b1d95d 100644 --- a/src/libCom/osi/os/posix/osdTime.cpp +++ b/src/libCom/osi/os/posix/osdTime.cpp @@ -90,8 +90,8 @@ extern "C" epicsShareFunc void struct timespec wait; int status; - if(timeout<0.0) timeout = 0.0; - else if(timeout>3600.0) timeout = 3600.0; + if (timeout < 0.0) + timeout = 0.0; #ifdef CLOCK_REALTIME status = clock_gettime(CLOCK_REALTIME, wakeTime); #else