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

[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)]

Correctly found and fixed the bug.
Thanks a lot!

Should be re-targeted to 3.14 branch.

review: Approve

[Ralph Lange (ralph-lange)]

3.14 re-targeting should probably be done on a new branch/merge proposal.

[Ralph Lange (ralph-lange)]

Resubmitted as https://code.launchpad.net/~bhill/epics-base/+git/epics-base/+merge/341104
Closing as rejected.

Unmerged commits

f7b1c40... by Bruce Hill on 2017-11-11

Fixed camonitor server side relative timestamps bug

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

diff --git a/src/ca/client/tools/tool_lib.c b/src/ca/client/tools/tool_lib.c
index 72044bd..29b252e 100644
--- a/src/ca/client/tools/tool_lib.c
+++ b/src/ca/client/tools/tool_lib.c
@@ -414,6 +414,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;                                             \
@@ -506,12 +512,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);