From fad89189da1a1fd57434dffcbfac8eec0ee2ad56 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 7 Sep 2017 17:38:58 -0500 Subject: [PATCH 1/5] Fix typo in CAref.html --- src/ca/CAref.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ca/CAref.html b/src/ca/CAref.html index 0b9af7b30..13bcd795f 100644 --- a/src/ca/CAref.html +++ b/src/ca/CAref.html @@ -2746,7 +2746,7 @@ time.

USERFUNC
-
Optional address of the user's callback function to be run when the +
Optional pointer to the user's callback function to be run when the connection state changes. Casual users of channel access may decide to set this field to null or 0 if they do not need to have a callback function run in response to each connection state change event. @@ -2921,7 +2921,7 @@ but they do not cause the record to be processed.

PFUNC
-
address of user supplied callback function to be +
Pointer to a user supplied callback function to be run when the requested operation completes
@@ -3029,7 +3029,7 @@ when a CA get request is initiated.

USERFUNC
-
Address of user supplied callback function to be +
Pointer to a user supplied callback function to be run when the requested operation completes.
@@ -3130,8 +3130,8 @@ indicating the current state of the channel.

channel identifier
-
USRERFUNC
-
The address of user supplied callback function to +
USERFUNC
+
Pointer to a user supplied callback function to be invoked with each subscription update.
@@ -3429,7 +3429,7 @@ field should not be used.

Arguments

USERFUNC
-
Address of user callback function to be executed when an exceptions +
Pointer to a user callback function to be executed when exceptions occur. Passing a null value causes the default exception handler to be reinstalled. The following structure is passed by value to the user's callback function. Currently, the op field can be one of @@ -3564,7 +3564,7 @@ default handler uses fprintf to send messages to 'stderr'.

Arguments

PFUNC
-
The address of a user supplied callback handler to be invoked when CA +
A pointer to a user supplied callback handler to be invoked when CA prints diagnostic messages. Installing a null pointer will cause the default callback handler to be reinstalled.
@@ -3612,7 +3612,7 @@ specified channel.

PFUNC
-
Address of user supplied callback function. A null pointer uninstalls +
Pointer to a user supplied callback function. A null pointer uninstalls the current handler. The following arguments are passed by value to the supplied callback handler. 
typedef struct ca_access_rights {

From 13fa1e2722443a67a861fb552a25c05ecd95fec0 Mon Sep 17 00:00:00 2001
From: Andrew Johnson 
Date: Thu, 7 Sep 2017 17:39:42 -0500
Subject: [PATCH 2/5] Travis: Use 'make test-results' for more compact output

---
 ci/travis-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/travis-build.sh b/ci/travis-build.sh
index ba752ac4a..a3ca3fd16 100644
--- a/ci/travis-build.sh
+++ b/ci/travis-build.sh
@@ -86,5 +86,5 @@ make -j2 $EXTRA
 if [ "$TEST" != "NO" ]
 then
    make tapfiles
-   find . -name '*.tap' -print0 | xargs -0 -n1 prove -e cat -f
+   make -s test-results
 fi

From c441cdd5a43ce0b096f29b47bd62765ae2ab735d Mon Sep 17 00:00:00 2001
From: Andrew Johnson 
Date: Mon, 25 Sep 2017 12:14:48 -0500
Subject: [PATCH 3/5] Adjust comments about EPICS_TIMEZONE

---
 configure/CONFIG_SITE_ENV | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure/CONFIG_SITE_ENV b/configure/CONFIG_SITE_ENV
index 271fd7134..1decb05c8 100644
--- a/configure/CONFIG_SITE_ENV
+++ b/configure/CONFIG_SITE_ENV
@@ -27,8 +27,9 @@
 # Time service:
 # EPICS_TIMEZONE
 #	Local timezone info for vxWorks and RTEMS.  The format is
-#	    ::::
-#	where the start and end are mmddhh - that is month,day,hour
+#	    ::::
+#	where  is only used by strftime() for %Z conversions,
+#	and  and  are mmddhh - that is month,day,hour
 #	e.g. for ANL in 2018: EPICS_TIMEZONE=CUS::360:031102:110402
 #	The future dates below assume the rules don't get changed;
 #	see http://www.timeanddate.com/time/dst/2018.html to check.

From 22debb3532606888ef5f8066e370f5a719df6b56 Mon Sep 17 00:00:00 2001
From: Andrew Johnson 
Date: Mon, 25 Sep 2017 15:41:31 -0500
Subject: [PATCH 4/5] Fix for LP: #1702298

---
 src/cas/build/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/cas/build/Makefile b/src/cas/build/Makefile
index ab4a14d99..f1ee7b81e 100644
--- a/src/cas/build/Makefile
+++ b/src/cas/build/Makefile
@@ -74,10 +74,9 @@ LIBSRCS += casStreamIO.cc
 LIBSRCS += ipIgnoreEntry.cc
 
 # There is a bug in some vxWorks compilers that these work around:
-ifeq ($(VX_GNU_VERSION), 4.1.2)
-  casStreamOS_CXXFLAGS_vxWorks-ppc604_altivec = -O0
-  casStreamOS_CXXFLAGS_vxWorks-ppc604_long = -O0
-  casStreamOS_CXXFLAGS_vxWorks-ppc604 = -O0
+ifeq ($(VXWORKS_VERSION)$(filter -mcpu=604,$(ARCH_DEP_CFLAGS)), 6.6-mcpu=604)
+  casDGIntfOS_CXXFLAGS = -fno-inline
+  casStreamOS_CXXFLAGS = -fno-inline
 endif
 
 LIBSRCS_vxWorks += templateInstances.cpp

From 32a6f6c4f1672d4c7b3a7008de89b9ed4eb97a04 Mon Sep 17 00:00:00 2001
From: Andrew Johnson 
Date: Mon, 9 Oct 2017 14:45:01 +0200
Subject: [PATCH 5/5] Fix DBD parsing slow-up with Perl 5.20 and later

---
 src/tools/DBD/Parser.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/tools/DBD/Parser.pm b/src/tools/DBD/Parser.pm
index 901420685..113ef42a8 100644
--- a/src/tools/DBD/Parser.pm
+++ b/src/tools/DBD/Parser.pm
@@ -78,8 +78,13 @@ sub parseCommon {
         m/\G \s* /oxgc;
 
         # Extract POD
-        if (m/\G ( = [a-zA-Z] .* ) \n/oxgc) {
-            $obj->add_pod($1, &parsePod);
+        if (m/\G ( = [a-zA-Z] )/xgc) {
+	    # The above regex was split from the one below for performance.
+	    # Using m/\G ( = [a-zA-Z] .* ) \n/ is slow in Perl 5.20 and later.
+	    my $directive = $1;
+	    m/\G ( .* ) \n/xgc;
+	    $directive .= $1;
+            $obj->add_pod($directive, &parsePod);
         }
         elsif (m/\G \# /oxgc) {
             if (m/\G \# ! BEGIN \{ ( [^}]* ) \} ! \# \# \n/oxgc) {