Fix typo on nanosseconds assignment; convertTS is now template

jerzyjamroz · Nov 21, 2023 · 09722e0 · 09722e0
1 parent 75509b9
commit 09722e0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 19 deletions.
diff --git a/evrApp/src/devEvrEvent.cpp b/evrApp/src/devEvrEvent.cpp
@@ -152,19 +152,20 @@ try {
     if (prec->val>=0 && prec->val<=255)
         post_event(prec->val);
 
-    // getTimeStampUTag method avoids EVR mutex being locked twice in a row
     if(prec->tse==epicsTimeEventDeviceTime){
-        // p->evr->getTimeStamp(&prec->time,p->event);
+#if 0
+        p->evr->getTimeStamp(&prec->time,p->event);
+        prec->utag = static_cast<epicsUInt64>(p->evr->eventUtag(p->event));
+#else
+        // getTimeStampUTag method avoids EVR mutex being locked twice in a row
         epicsTimeStampUTag ts;
         p->evr->getTimeStampUTag(&ts, p->event);
         prec->time.secPastEpoch = ts.secPastEpoch;
-        prec->time.nsec = ts.secPastEpoch;
+        prec->time.nsec = ts.nsec;
         prec->utag = ts.utag;
+#endif
     }
 
-    // set UTAG
-    //prec->utag = static_cast<epicsUInt64>(p->evr->eventUtag(p->event));
-
     return 0;
 } catch(std::runtime_error& e) {
     recGblRecordError(S_dev_noDevice, (void*)prec, e.what());
@@ -206,12 +207,17 @@ try {
 #endif
 
     if(prec->tse==epicsTimeEventDeviceTime){
-        // p->evr->getTimeStamp(&prec->time,p->event);
+#if 0
+        p->evr->getTimeStamp(&prec->time,p->event);
+        prec->utag = static_cast<epicsUInt64>(p->evr->eventUtag(p->event));
+#else
+        // getTimeStampUTag method avoids EVR mutex being locked twice in a row
         epicsTimeStampUTag ts;
         p->evr->getTimeStampUTag(&ts, p->event);
         prec->time.secPastEpoch = ts.secPastEpoch;
-        prec->time.nsec = ts.secPastEpoch;
+        prec->time.nsec = ts.nsec;
         prec->utag = ts.utag;
+#endif
     }
 
     // set UTAG
@@ -234,12 +240,17 @@ static long process_event(eventRecord *prec)
     long ret=0;
 try {
     if(prec->tse==epicsTimeEventDeviceTime){
-        // p->evr->getTimeStamp(&prec->time,p->event);
+#if 0
+        p->evr->getTimeStamp(&prec->time,p->event);
+        prec->utag = static_cast<epicsUInt64>(p->evr->eventUtag(p->event));
+#else
+        // getTimeStampUTag method avoids EVR mutex being locked twice in a row
         epicsTimeStampUTag ts;
         p->evr->getTimeStampUTag(&ts, p->event);
         prec->time.secPastEpoch = ts.secPastEpoch;
-        prec->time.nsec = ts.secPastEpoch;
+        prec->time.nsec = ts.nsec;
         prec->utag = ts.utag;
+#endif
     }
 
     // set UTAG

diff --git a/evrMrmApp/src/drvem.cpp b/evrMrmApp/src/drvem.cpp
@@ -826,7 +826,7 @@ EVRMRM::getTimeStamp(epicsTimeStamp *ret,epicsUInt32 event)
 
     }
 
-    if(!convertTS(&ts))
+    if(!convertTS<epicsTimeStamp>(&ts))
         return false;
 
     *ret = ts;
@@ -838,7 +838,6 @@ EVRMRM::getTimeStampUTag(epicsTimeStampUTag *ret,epicsUInt32 event)
 {
     if(!ret) throw std::runtime_error("Invalid argument");
     epicsTimeStampUTag tstag;
-    epicsTimeStamp ts;
 
     SCOPED_LOCK(evrLock);
     if(timestampValid<TSValidThreshold) return false;
@@ -888,9 +887,7 @@ EVRMRM::getTimeStampUTag(epicsTimeStampUTag *ret,epicsUInt32 event)
 
     }
 
-    ts.secPastEpoch = tstag.secPastEpoch;
-    ts.nsec = tstag.nsec;
-    if(!convertTS(&ts))
+    if(!convertTS<epicsTimeStampUTag>(&tstag))
         return false;
 
     *ret = tstag;
@@ -901,8 +898,8 @@ EVRMRM::getTimeStampUTag(epicsTimeStampUTag *ret,epicsUInt32 event)
 /** @brief In place conversion between raw posix sec+ticks to EPICS sec+nsec.
  @returns false if conversion failed
  */
-bool
-EVRMRM::convertTS(epicsTimeStamp* ts)
+template<typename TimeStampT>
+bool EVRMRM::convertTS(TimeStampT* ts)
 {
     // First validate the input
 
@@ -1426,7 +1423,7 @@ EVRMRM::drain_fifo()
                     active.flushtime.secPastEpoch = evt.last_sec;
                     active.flushtime.nsec = evt.last_evt;
 
-                    active.ok &= convertTS(&active.flushtime);
+                    active.ok &= convertTS<epicsTimeStamp>(&active.flushtime);
 
                     tbuf->doFlush();
                 }

diff --git a/evrMrmApp/src/drvem.h b/evrMrmApp/src/drvem.h
@@ -184,7 +184,8 @@ class epicsShareClass EVRMRM : public mrf::ObjectInst<EVRMRM, EVR>,
     virtual void eventNotifyAdd(epicsUInt32, eventCallback, void*) OVERRIDE FINAL;
     virtual void eventNotifyDel(epicsUInt32, eventCallback, void*) OVERRIDE FINAL;
 
-    bool convertTS(epicsTimeStamp* ts);
+    template<typename TimeStampT>
+    bool convertTS(TimeStampT* ts);
 
     virtual epicsUInt16 dbus() const OVERRIDE FINAL;