Merge 3.16 into ca/master

Local CA output links do *not* trigger processing in the same thread;
need to wait for the dest record in Group 3, but not in Group 4.

configure/CONFIG_CA_VERSION

@@ -1,4 +1,4 @@
 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 13
-EPICS_CA_MAINTENANCE_VERSION = 1
-EPICS_CA_DEVELOPMENT_FLAG = 0
+EPICS_CA_MAINTENANCE_VERSION = 2
+EPICS_CA_DEVELOPMENT_FLAG = 1

src/client/access.cpp

@@ -127,21 +127,10 @@ const char * ca_message_text []
 
 static epicsThreadOnceId caClientContextIdOnce = EPICS_THREAD_ONCE_INIT;
 
-extern "C" void ca_client_exit_handler (void *)
-{
-    if ( caClientContextId ) {
-        epicsThreadPrivateDelete ( caClientContextId );
-        caClientContextId = 0;
-    }
-}
-
 // runs once only for each process
 extern "C" void ca_init_client_context ( void * )
 {
     caClientContextId = epicsThreadPrivateCreate ();
-    if ( caClientContextId ) {
-        epicsAtExit ( ca_client_exit_handler,0 );
-    }
 }
 
 /*

src/client/oldChannelNotify.cpp

@@ -390,7 +390,7 @@ int epicsShareAPI ca_array_get_callback ( chtype type,
     {
         caStatus = ECA_ALLOCMEM;
     }
-    catch ( cacChannel::msgBodyCacheTooSmall ) {
+    catch ( cacChannel::msgBodyCacheTooSmall & ) {
         caStatus = ECA_TOLARGE;
     }
     catch ( ... )

src/perl/CA.pm

@@ -652,7 +652,7 @@ not follow this pattern, but are still printable strings.
 
 =item [1] R3.15 Channel Access Reference Manual by Jeffrey O. Hill
 
-L<http://www.aps.anl.gov/epics/base/R3-15/2-docs/CAref.html>
+L<https://epics.anl.gov/base/R3-15/5-docs/CAref.html>
 
 =back
 

src/perl/Makefile

@@ -37,11 +37,7 @@ ifeq ($(T_A),$(EPICS_HOST_ARCH))                 # No cross-builds (wrong Perl!)
 ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),) # Doesn't build on WIN32
   LOADABLE_LIBRARY_HOST = Cap5
 
-  PERL_SCRIPTS += cainfo.pl
-  PERL_SCRIPTS += caput.pl
-  PERL_SCRIPTS += caget.pl
   PERL_SCRIPTS += capr.pl
-  PERL_SCRIPTS += camonitor.pl
 
   PERL_MODULES += CA.pm
   PERL_MODULES += $(PERL_ARCHPATH)/$(LOADABLE_SHRLIB_PREFIX)Cap5$(LOADABLE_SHRLIB_SUFFIX)
@@ -60,7 +56,7 @@ Cap5_LIBS = ca Com
 Cap5_INCLUDES = -I$(shell $(PERL) ../perlConfig.pl archlib)/CORE
 Cap5_CFLAGS = $(shell $(PERL) ../perlConfig.pl ccflags)
 
-CLEANS += Cap5.c pod2htmd.tmp pod2htmi.tmp
+CLEANS += Cap5.c
 
 include $(TOP)/configure/RULES
 

src/template/Makefile

@@ -8,4 +8,10 @@ TEMPLATES += top/caClientApp/Makefile
 TEMPLATES += top/caClientApp/caExample.c
 TEMPLATES += top/caClientApp/caMonitor.c
 
+TEMPLATES += top/caPerlApp/Makefile
+TEMPLATES += top/caPerlApp/cainfo.pl
+TEMPLATES += top/caPerlApp/caget.pl
+TEMPLATES += top/caPerlApp/caput.pl
+TEMPLATES += top/caPerlApp/camonitor.pl
+
 include $(TOP)/configure/RULES

src/template/top/caPerlApp/Makefile

@@ -0,0 +1,17 @@
+TOP=..
+
+include $(TOP)/configure/CONFIG
+#----------------------------------------
+#  ADD MACRO DEFINITIONS AFTER THIS LINE
+
+PERL_SCRIPTS += _APPNAME_ModuleDirs.pm
+
+PERL_SCRIPTS += cainfo.pl
+PERL_SCRIPTS += caput.pl
+PERL_SCRIPTS += caget.pl
+PERL_SCRIPTS += camonitor.pl
+
+include $(TOP)/configure/RULES
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE
+

src/template/top/caPerlApp/caget.pl

@@ -2,8 +2,11 @@
 
 use strict;
 
+# This construct sets @INC to search lib/perl of all RELEASE entries
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
+use _APPNAME_ModuleDirs;
+no lib $Bin;
 
 use Getopt::Std;
 use Scalar::Util qw(looks_like_number);

src/template/top/caPerlApp/cainfo.pl

@@ -2,8 +2,11 @@
 
 use strict;
 
+# This construct sets @INC to search lib/perl of all RELEASE entries
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
+use _APPNAME_ModuleDirs;
+no lib $Bin;
 
 use Getopt::Std;
 use CA;

src/template/top/caPerlApp/camonitor.pl

@@ -2,8 +2,11 @@
 
 use strict;
 
+# This construct sets @INC to search lib/perl of all RELEASE entries
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
+use _APPNAME_ModuleDirs;
+no lib $Bin;
 
 use Getopt::Std;
 use Scalar::Util qw(looks_like_number);

src/template/top/caPerlApp/caput.pl

@@ -2,8 +2,11 @@
 
 use strict;
 
+# This construct sets @INC to search lib/perl of all RELEASE entries
 use FindBin qw($Bin);
-use lib "$Bin/../../lib/perl";
+use lib ($Bin, "$Bin/../../lib/perl");
+use _APPNAME_ModuleDirs;
+no lib $Bin;
 
 use Getopt::Std;
 use CA;

src/tools/caput.c

@@ -8,7 +8,7 @@
 * Copyright (c) 2002 Berliner Elektronenspeicherringgesellschaft fuer
 *     Synchrotronstrahlung.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*
@@ -419,7 +419,7 @@ int main (int argc, char *argv[])
         if (argc > optind+1) {
             for (i = optind + 1; i < argc; i++) {
                 strcat(cbuf, " ");
-                strcat(cbuf, argv[i]); 
+                strcat(cbuf, argv[i]);
             }
         }
 
@@ -530,6 +530,11 @@ int main (int argc, char *argv[])
         /* Use standard put with defined timeout */
         result = ca_array_put (dbrType, count, pvs[0].chid, pbuf);
     }
+    if (result != ECA_NORMAL) {
+        fprintf(stderr, "Error from put operation: %s\n", ca_message(result));
+        return 1;
+    }
+
     result = ca_pend_io(caTimeout);
     if (result == ECA_TIMEOUT) {
         fprintf(stderr, "Write operation timed out: Data was not written.\n");
@@ -545,7 +550,7 @@ int main (int argc, char *argv[])
     }
 
     if (result != ECA_NORMAL) {
-        fprintf(stderr, "Error occured writing data.\n");
+        fprintf(stderr, "Error occured writing data: %s\n", ca_message(result));
         return 1;
     }
 

src/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);