Merge ~bhill/epics-base:camonitor-server-relative-ts-bug-3.14 into ~epics-core/epics-base/+git/epics-base:3.14

[Bruce Hill]

tsFirst needs to get initialized from the first server side
timestamp instead of the client side tsNow.

Discovered when I added a -P option to show SLAC pulseId which is in the
lower 17 bits of nsec on the server side but is just nsec on the client side.

Tested and working here at SLAC since Nov 2017.

[Ralph Lange (ralph-lange)]

(Resubmittal of https://code.launchpad.net/~bhill/epics-base/+git/epics-base/+merge/341085)

Excellent! Thank you.

review: Approve

diff --git a/src/catools/tool_lib.c b/src/catools/tool_lib.c
index a29d7ef..ce7a049 100644
--- a/src/catools/tool_lib.c
+++ b/src/catools/tool_lib.c
@@ -416,6 +416,12 @@ char *dbr2str (const void *value, unsigned type)
     ptsNewS = &((struct TYPE *)value)->stamp;                           \
     ptsNewC = &tsNow;                                                   \
                                                                         \
+    if (!tsInitS)                                                       \
+    {                                                                   \
+        tsFirst = *ptsNewS;                                             \
+        tsInitS = 1;                                                    \
+    }                                                                   \
+                                                                        \
     switch (tsType) {                                                   \
     case relative:                                                      \
         ptsRefC = &tsStart;                                             \
@@ -508,12 +514,6 @@ void print_time_val_sts (pv* pv, unsigned long reqElems)
     epicsTimeGetCurrent(&tsNow);
     epicsTimeToStrftime(timeText, TIMETEXTLEN, timeFormatStr, &tsNow);
 
-    if (!tsInitS)
-    {
-        tsFirst = tsNow;
-        tsInitS = 1;
-    }
-
     if (pv->nElems <= 1 && fieldSeparator == ' ') printf("%-30s", pv->name);
     else                                            printf("%s", pv->name);
     printf("%c", fieldSeparator);