Update version number to 3.14.12.8-rc1

Documentation updates for 3.14.12.8
dbCa: Fix for lp: #541221
2018-07-19 12:31:52 -05:00 · 2018-07-19 12:20:41 -05:00 · 2018-07-13 13:05:54 -05:00 · 2018-06-07 11:32:16 +02:00 · 2018-06-07 11:21:04 +02:00 · 2018-06-07 11:07:29 +02:00
36 changed files with 411 additions and 211 deletions
--- a/2
+++ b/2
@@ -20,5 +20,5 @@ Additional information about EPICS including mailing list
 archives and subscription instructions, documentation and
 training materials, additional components, links to other
 websites etc. is available on the EPICS home page at
-	http://www.aps.anl.gov/epics/
+	https://epics.anl.gov/

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,11 +40,12 @@ configuration:
 # Environment variables: compiler toolchain
 environment:
  matrix:
-  - TOOLCHAIN: 9.0
  - TOOLCHAIN: 10.0
  - TOOLCHAIN: 11.0
  - TOOLCHAIN: 12.0
  - TOOLCHAIN: 14.0
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    TOOLCHAIN: 2017
  - TOOLCHAIN: cygwin
  - TOOLCHAIN: mingw

@@ -57,8 +58,6 @@ platform:
 matrix:
  exclude:
  # VS Express installs don't have the 64 bit compiler
-  - platform: x64
-    TOOLCHAIN: 9.0
  - platform: x64
    TOOLCHAIN: 10.0

--- a/ci/appveyor-make.bat
+++ b/ci/appveyor-make.bat
@@ -1,6 +1,6 @@
 :: Universal build script for AppVeyor (https://ci.appveyor.com/)
 :: Environment:
-::     TOOLCHAIN      -  toolchain version   [9.0/10.0/11.0/12.0/14.0/cygwin/mingw]
+::     TOOLCHAIN      -  toolchain version   [10.0/11.0/12.0/14.0/2017/cygwin/mingw]
 ::     CONFIGURATION  -  determines EPICS build   [dynamic/static]
 ::     PLATFORM       -  architecture   [x86/x64]
 ::
@@ -57,10 +57,22 @@ if "%TOOLCHAIN%"=="mingw" (
 )

 set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio %TOOLCHAIN%"
+if not exist "%VSINSTALL%\" set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio\%TOOLCHAIN%\Community"
+if not exist "%VSINSTALL%\" goto MSMissing
+
 set "MAKE=C:\tools\make"

+echo [INFO] APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE%
+
 if "%OS%"=="64BIT" (
    set EPICS_HOST_ARCH=windows-x64%ST%
+    :: VS 2017
+    if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat" (
+        call "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat"
+        where cl
+        if !ERRORLEVEL! NEQ 0 goto MSMissing
+        goto MSFound
+    )
    if exist "%VSINSTALL%\VC\vcvarsall.bat" (
        call "%VSINSTALL%\VC\vcvarsall.bat" amd64
        where cl
@@ -79,12 +91,19 @@ if "%OS%"=="64BIT" (
    )
 ) else (
    set EPICS_HOST_ARCH=win32-x86%ST%
+    :: VS 2017
+    if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat" (
+        call "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat"
+        where cl
+        if !ERRORLEVEL! NEQ 0 goto MSMissing
+        goto MSFound
+    )
    if exist "%VSINSTALL%\VC\vcvarsall.bat" (
        call "%VSINSTALL%\VC\vcvarsall.bat" x86
        where cl
        if !ERRORLEVEL! NEQ 0 goto MSMissing
        goto MSFound
-    )    
+    )
    if exist "%VSINSTALL%\VC\bin\vcvars32.bat" (
        call "%VSINSTALL%\VC\bin\vcvars32.bat"
        where cl
--- a/ci/appveyor-prepare.bat
+++ b/ci/appveyor-prepare.bat
@@ -65,6 +65,6 @@ if "%TOOLCHAIN%"=="mingw" (
 )

 echo [INFO] Installing Make 4.1
-@powershell -Command "(new-object net.webclient).DownloadFile('https://www.aps.anl.gov/epics/download/tools/make-4.1-win64.zip', 'C:\tools\make-4.1.zip')"
+curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://epics.anl.gov/download/tools/make-4.1-win64.zip
 cd \tools
 "C:\Program Files\7-Zip\7z" e make-4.1.zip
--- a/configure/CONFIG_BASE_VERSION
+++ b/configure/CONFIG_BASE_VERSION
@@ -28,15 +28,10 @@ EPICS_MODIFICATION = 12

 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 6
+EPICS_PATCH_LEVEL = 8

 # This will end in -DEV between official releases
-EPICS_DEV_SNAPSHOT=-DEV
-#EPICS_DEV_SNAPSHOT=-pre1
-#EPICS_DEV_SNAPSHOT=-pre1-DEV
-#EPICS_DEV_SNAPSHOT=-pre2
-#EPICS_DEV_SNAPSHOT=-pre2-DEV
-#EPICS_DEV_SNAPSHOT=-rc1
+EPICS_DEV_SNAPSHOT=-rc1
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
--- a/configure/CONFIG_SITE_ENV
+++ b/configure/CONFIG_SITE_ENV
@@ -34,35 +34,30 @@
 #	The future dates below assume the rules don't get changed;
 #	see http://www.timeanddate.com/time/dst/2018.html to check.
 #
-#	DST for 2017  US: Mar 12 - Nov 05
-#	              EU: Mar 26 - Oct 29
-EPICS_TIMEZONE = CUS::360:031202:110502
-#EPICS_TIMEZONE = MET::-60:032602:102902
-#
 #	DST for 2018  US: Mar 11 - Nov 04
 #	              EU: Mar 25 - Oct 28
-#EPICS_TIMEZONE = CUS::360:031102:110402
-#EPICS_TIMEZONE = MET::-60:032502:102802
+EPICS_TIMEZONE = CUS::360:031102:110402
+#EPICS_TIMEZONE = MET::-60:032502:102803
 #
 #	DST for 2019  US: Mar 10 - Nov 03
 #	              EU: Mar 31 - Oct 27
 #EPICS_TIMEZONE = CUS::360:031002:110302
-#EPICS_TIMEZONE = MET::-60:033102:102702
+#EPICS_TIMEZONE = MET::-60:033102:102703
 #
 #	DST for 2020  US: Mar 08 - Nov 01
 #	              EU: Mar 29 - Oct 25
 #EPICS_TIMEZONE = CUS::360:030802:110102
-#EPICS_TIMEZONE = MET::-60:032902:102502
+#EPICS_TIMEZONE = MET::-60:032902:102503
 #
 #	DST for 2021  US: Mar 14 - Nov 07
 #	              EU: Mar 28 - Oct 31
 #EPICS_TIMEZONE = CUS::360:031402:110702
-#EPICS_TIMEZONE = MET::-60:032802:103102
+#EPICS_TIMEZONE = MET::-60:032802:103103
 #
 #	DST for 2022  US: Mar 13 - Nov 06
 #	              EU: Mar 27 - Oct 30
 #EPICS_TIMEZONE = CUS::360:031302:110602
-#EPICS_TIMEZONE = MET::-60:032702:103002
+#EPICS_TIMEZONE = MET::-60:032702:103003

 # EPICS_TS_NTP_INET
 #	NTP time server ip address for VxWorks and RTEMS.
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -301,6 +301,20 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))

 .PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%Include.dbd

+##################################################### HTML files
+
+$(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
+.PRECIOUS: $(COMMON_DIR)/%.html %.html
+
 ##################################################### DB files

 $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf 
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -500,6 +500,10 @@ $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
 	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

+$(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
+	$(ECHO) "Installing generated html $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+
 $(INSTALL_TEMPLATES_SUBDIR)/%: ../%
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
--- a/configure/os/CONFIG.win32-x86.win32-x86
+++ b/configure/os/CONFIG.win32-x86.win32-x86
@@ -85,16 +85,20 @@ CPP = cl -nologo -C -E

 # Configure OS vendor C++ compiler
 #
-# __STDC__=0 gives us both:
-# 1) define STDC for code (pretend ANSI conformance)
-# 2) set it to 0 to use MS C "extensions" (open for _open etc.)
-# because MS uses:   if __STDC__ ... disable many nice things
-#
 # -EHsc - generate code for exceptions
 # -GR - generate code for run time type identification
 #
 CCC = cl -EHsc -GR
-CODE_CPPFLAGS += -nologo -D__STDC__=0
+
+# Other compiler flags, used for CPP, C and C++
+#
+# -FC - Show absolute path of source file in diagnostics
+# -D__STDC__=0 gives us both:
+#   1) define STDC for code (pretend ANSI conformance)
+#   2) set it to 0 to use MS C "extensions" (open for _open etc.)
+#   because MS uses:   if __STDC__ ... disable many nice things
+#
+CODE_CPPFLAGS += -nologo -FC -D__STDC__=0
 CODE_CPPFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE


@@ -142,6 +146,17 @@ STATIC_LDLIBS_NO=
 STATIC_LDFLAGS=
 RANLIB=

+#
+# option needed for parallel builds with Visual Studio 2015 onward
+#
+# -FS Force Synchronous PDB Writes
+ifneq ($(VisualStudioVersion),)
+  OPT_CXXFLAGS_NO += -FS
+  OPT_CFLAGS_NO += -FS
+endif
+
+
+#
 # add -profile here to run the ms profiler
 # -LTCG whole program optimization
 # -incremental:no full linking
--- a/documentation/KnownProblems.html
+++ b/documentation/KnownProblems.html
@@ -4,27 +4,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>Known Problems in R3.14.12.1</title>
+  <title>Known Problems in R3.14.12.8</title>
 </head>

 <body>
-<h1 style="text-align: center">EPICS Base R3.14.12.1: Known Problems</h1>
+<h1 style="text-align: center">EPICS Base R3.14.12.8: Known Problems</h1>

-<p>Any patch files linked below should be applied at the root of the
-base-3.14.12.1 tree. Download them, then use the GNU Patch program as
-follows:</p>
-
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.14.12.1</b>
-% <b>patch -p0 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
-
-<p>The following significant problems have been reported with this
-version of EPICS Base:</p>
-
-<ul>
-
-  <li>None yet.</li>
-
-</ul>
+<p>This was the last release in the Base-3.14 series, so we are no longer
+tracking bugs in this branch. Please upgrade to one of the newer releases which
+have incorporated many bug fixes and new features since they branched off the
+Base-3.14 release series.</p>

 </body>
 </html>
--- a/documentation/README.1st
+++ b/documentation/README.1st
@@ -436,6 +436,6 @@

 References

-   1. http://www.aps.anl.gov/epics/base/tornado.php
-   2. http://www.aps.anl.gov/epics/base/vxWorks6.php
-   3. http://www.aps.anl.gov/epics/
+   1. https://epics.anl.gov/base/tornado.php
+   2. https://epics.anl.gov/base/vxWorks6.php
+   3. https://epics.anl.gov/
--- a/documentation/README.html
+++ b/documentation/README.html
@@ -96,8 +96,8 @@
 needed to build for these target systems. The absolute path to and version
 number of the vxWorks  installation is normally specified in the
 base/configure/os/CONFIG_SITE.Common.vxWorksCommon file. Consult the EPICS web
- pages about <a href="http://www.aps.anl.gov/epics/base/tornado.php">vxWorks
- 5.x</a> and <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks
+ pages about <a href="https://epics.anl.gov/base/tornado.php">vxWorks
+ 5.x</a> and <a href="https://epics.anl.gov/base/vxWorks6.php">vxWorks
 6.x</a> and the vxWorks documentation for information about configuring your
 vxWorks operating system for use with EPICS.</P>

@@ -126,7 +126,7 @@

 <H3><A NAME="0_0_8"> Documentation</A></H3>
 <BLOCKQUOTE>EPICS documentation is available through the
- <a href="http://www.aps.anl.gov/epics/">EPICS website</a> at Argonne.
+ <a href="https://epics.anl.gov/">EPICS website</a> at Argonne.
 <P>Release specific documentation can also be found in the base/documentation
 directory of the distribution.</BLOCKQUOTE>

--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -3,16 +3,65 @@
 <html>
 <head>
  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-  <title>EPICS Base R3.14.12.7 Release Notes</title>
+  <title>EPICS Base R3.14.12.8 Release Notes</title>
 </head>

 <body lang="en">
-<h1 align="center">EPICS Base Release 3.14.12.7</h1>
+<h1 align="center">EPICS Base Release 3.14.12.8</h1>

-<h2 align="center">Changes between 3.14.12.6 and 3.14.12.7</h2>
+<p>This is the final release in the Base-3.14 series, please upgrade to the
+Base-3.15 series or to EPICS 7.</p>
+
+<h2 align="center">Changes between 3.14.12.7 and 3.14.12.8</h2>

 <!-- Insert new items immediately below here ... -->

+<h3>Fixes for Launchpad bugs</h3>
+
+<p>The following launchpad bugs have fixes included:</p>
+
+<ul>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/541221">
+    lp: #541221</a>, 'assert (pca->pgetNative)' failed in ../dbCa.c</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1747091">
+    lp: #1747091</a>, epicsTimeGetEvent() / generalTime bug</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1743076">
+    lp: #1743076</a>, Segfault in ca_attach_context() during exits</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1751380">
+    lp: #1751380</a>, Deadlock in ca_clear_subscription()</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1597809">
+    lp: #1597809</a>, Setting NAME field in DB file may break IOC</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1770292">
+    lp: #1770292</a>, get_alarm_double() inconsistent across record types</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1771298">
+    lp: #1771298</a>, Conversion of NaN to integer relies on undefined
+    behavior</li>
+</ul>
+
+<h3>Updated VxWorks Timezone settings</h3>
+
+<p>Removed the settings for 2017; fixed the hour of the change for MET.</p>
+
+<h3>Back-port podToHtml.pl and Rules from Base-3.15</h3>
+
+<p>This script permits Base to be built with Perl installations that do not
+provide the podchecker and pod2html scripts (e.g. Fedora 27).</p>
+
+<h3>Fixed camonitor server side relative timestamps bug</h3>
+
+<p>Initialize the first time-stamp from the first monitor, not the client-side
+current time in this configuration.</p>
+
+<h3>Build changes for MSVC</h3>
+
+<p>Windows builds using Visual Studio 2015 and later now use the <tt>-FS</tt>
+compiler option to allow parallel builds to work properly.</p>
+
+<p>We now give the <tt>-FC</tt> option to tell the compiler to print absolute
+paths for source files in diagnostic messages.</p>
+
+<h2 align="center">Changes between 3.14.12.6 and 3.14.12.7</h2>
+
 <h3>Extend maximum Posix epicsEventWaitWithTimeout() delay</h3>

 <p>The Posix implementation of epicsEventWaitWithTimeout() was limiting the
--- a/src/ca/CAref.html
+++ b/src/ca/CAref.html
@@ -1009,7 +1009,7 @@ d:/user/R3.14.clean/epics/base/lib/WIN32-x86/</code></p>
 <h2><a name="CommandUtils">Command Line Utilities</a></h2>

 <h3><a name="acctst">acctst</a></h3>
-<pre>acctst &lt;PV name&gt; [progress logging level] [channel duplication count] 
+<pre>acctst &lt;PV name&gt; [progress logging level] [channel duplication count]
                 [test repetition count] [enable preemptive callback]</pre>

 <h4>Description</h4>
@@ -2079,7 +2079,7 @@ example, be beneficial when tuning an archiver installation.</p>
 <p>Significant performance gains can be realized when the CA client library
 doesn't wait for a response to return from the server after each request. All
 requests which require interaction with a CA server are accumulated (buffered)
-and not forwarded to the IOC until one of <code>ca_flush_io()</code>, 
+and not forwarded to the IOC until one of <code>ca_flush_io()</code>,
 <code>ca_pend_io()</code>, <code>ca_pend_event()</code>, or
 <code>ca_sg_block()</code> are called allowing several operations to be
 efficiently sent over the network together. Any process variable values written
@@ -2103,16 +2103,16 @@ shouldn't test the success of a CA function call by checking to see if the
 returned value is zero as is the UNIX convention. Below are several methods to
 test CA function returns. See <a href="#ca_signal"><code>ca_signal()</code> and
 <code>SEVCHK()</code></a> for more information on this topic.</p>
-<pre>status = ca_XXXX(); 
-SEVCHK( status, "ca_XXXX() returned failure status"); 
+<pre>status = ca_XXXX();
+SEVCHK( status, "ca_XXXX() returned failure status");

-if ( status &amp; CA_M_SUCCESS ) { 
-        printf ( "The requested ca_XXXX() operation didn't complete successfully"); 
-} 
+if ( status &amp; CA_M_SUCCESS ) {
+        printf ( "The requested ca_XXXX() operation didn't complete successfully");
+}

-if ( status != ECA_NORMAL ) { 
+if ( status != ECA_NORMAL ) {
        printf("The requested ca_XXXX() operation didn't complete successfully because \"%s\"\n",
-                ca_message ( status ) ); 
+                ca_message ( status ) );
 }</pre>

 <h3><a name="Channel">Channel Access Data Types</a></h3>
@@ -2285,7 +2285,7 @@ int main ( int argc, char ** argv )
    unsigned nBytes;
    unsigned elementCount;
    char timeString[32];
-    unsigned i;    
+    unsigned i;
    chid chan;
    double sum;
    int status;
@@ -2328,7 +2328,7 @@ int main ( int argc, char ** argv )
    epicsTimeToStrftime ( timeString, sizeof ( timeString ),
        "%a %b %d %Y %H:%M:%S.%f", &amp; pTD-&gt;stamp );

-    printf ( "The sum of elements in %s at %s was %f\n", 
+    printf ( "The sum of elements in %s at %s was %f\n",
        argv[1], timeString, sum );

    ca_clear_channel ( chan );
@@ -2359,7 +2359,7 @@ executing within the user's callback function.</p>
 <pre>typedef struct event_handler_args {
    void            *usr;   /* user argument supplied with request */
    chanId          chid;   /* channel id */
-    long            type;   /* the type of the item returned */ 
+    long            type;   /* the type of the item returned */
    long            count;  /* the element count of the item returned */
    const void      *dbr;   /* a pointer to the item returned */
    int             status; /* ECA_XXX status of the requested op from the server */
@@ -2382,7 +2382,7 @@ attached to the request, an exception handler is executed in the client. The
 default exception handler prints a message on the console and exits if the
 exception condition is severe. Certain internal exceptions within the CA client
 library, and failures detected by the SEVCHK macro may also cause the exception
-handler to be invoked. To modify this behavior see 
+handler to be invoked. To modify this behavior see
 <code><a href="#ca_add_exception_event">ca_add_exception_event</a>()</code>.</p>

 <h3><a name="Server">Server and Client Share the Same Address Space on The Same
@@ -2674,6 +2674,14 @@ automatically released by the system when the process exits and
 vxWorks or RTEMS no cleanup occurs unless the application calls
 <code>ca_context_destroy()</code>.</p>

+<p>Note: This operation blocks until any user callbacks for any channel
+created in the current context have run to completion. If callbacks take a
+lock (mutex) then it is the user's responsibility to ensure that this lock
+is not held when <code>ca_clear_context()</code> is called, otherwise a
+deadlock may ensue. (See also
+<code><a href="#ca_clear_channel">ca_clear_channel</a>()</code> and
+<code><a href="#ca_clear_event">ca_clear_subscription</a>()</code>.)</p>
+
 <h4>Returns</h4>

 <p>ECA_NORMAL - Normal successful completion</p>
@@ -2819,6 +2827,12 @@ efficiently sent over the network in one message.</p>
 clearing a channel does shutdown and reclaim any channel state change event
 subscriptions (monitors) registered with the channel.</p>

+<p>Note: This operation blocks until any user callbacks for this channel
+have run to completion. If callbacks take a lock (mutex) then it is the
+user's responsibility to ensure that this lock is not held when
+<code>ca_clear_channel()</code> is called, otherwise a deadlock may ensue.
+(See also <code><a href="#ca_clear_event">ca_clear_subscription</a>()</code>.)</p>
+
 <h4>Arguments</h4>
 <dl>
  <dt><code>CHID</code></dt>
@@ -2833,16 +2847,16 @@ subscriptions (monitors) registered with the channel.</p>

 <h3><code><a name="ca_put">ca_put()</a></code></h3>
 <pre>#include &lt;cadef.h&gt;
-int ca_put ( chtype TYPE, 
-        chid CHID, void *PVALUE ); 
-int ca_array_put ( chtype TYPE, unsigned long COUNT, 
+int ca_put ( chtype TYPE,
+        chid CHID, void *PVALUE );
+int ca_array_put ( chtype TYPE, unsigned long COUNT,
        chid CHID, const void *PVALUE);
 typedef void ( caEventCallBackFunc ) (struct event_handler_args);
-int ca_put_callback ( chtype TYPE, 
-        chid CHID, const void *PVALUE, 
-        caEventCallBackFunc PFUNC, void *USERARG ); 
-int ca_array_put_callback ( chtype TYPE, unsigned long COUNT, 
-        chid CHID, const void *PVALUE, 
+int ca_put_callback ( chtype TYPE,
+        chid CHID, const void *PVALUE,
+        caEventCallBackFunc PFUNC, void *USERARG );
+int ca_array_put_callback ( chtype TYPE, unsigned long COUNT,
+        chid CHID, const void *PVALUE,
        caEventCallBackFunc PFUNC, void *USERARG );</pre>

 <h4>Description</h4>
@@ -3069,7 +3083,7 @@ when a CA get request is initiated.</p>
 typedef void ( caEventCallBackFunc ) (struct event_handler_args);
 int ca_create_subscription ( chtype TYPE, unsigned long COUNT,
        chid CHID, unsigned long MASK,
-        caEventCallBackFunc USERFUNC, void *USERARG, 
+        caEventCallBackFunc USERFUNC, void *USERARG,
        evid *PEVID );</pre>

 <h4>Description</h4>
@@ -3153,7 +3167,7 @@ indicating the current state of the channel.</p>
  <dt><code>MASK</code></dt>
    <dd>A mask with bits set for each of the event trigger types requested. The
      event trigger mask must be a <em>bitwise or</em> of one or more of the
-      following constants. 
+      following constants.
      <ul>
        <li>DBE_VALUE - Trigger events when the channel value exceeds the
          monitor dead band</li>
@@ -3200,6 +3214,13 @@ and not forwarded to the server until one of <code>ca_flush_io()</code>, <code>c
 <code>ca_pend_event()</code>, or <code>ca_sg_block()</code> are called. This allows several requests to be
 efficiently sent together in one message.</p>

+<p>Note: This operation blocks until any user callbacks for this channel
+have run to completion. If callbacks take a lock (mutex) then it is the
+user's responsibility to ensure that this lock is not held when
+<code>ca_clear_subscription()</code> is called, otherwise a deadlock may
+ensue. (See also <code><a
+href="#ca_clear_channel">ca_clear_channel</a>()</code>.)</p>
+
 <h4>Arguments</h4>
 <dl>
  <dt>EVID</dt>
@@ -3364,7 +3385,7 @@ becomes full.</p>

 <h3><code><a name="ca_signal">ca_signal()</a></code></h3>
 <pre>#include &lt;cadef.h&gt;
-int ca_signal ( long CA_STATUS, const char * CONTEXT_STRING ); 
+int ca_signal ( long CA_STATUS, const char * CONTEXT_STRING );
 void SEVCHK( CA_STATUS, CONTEXT_STRING );</pre>

 <h4>Description</h4>
@@ -3381,7 +3402,7 @@ recommended error handler for simple applications which do not wish to write
 code testing the status returned from each channel access call.</p>

 <h4>Examples</h4>
-<pre>status = ca_context_create (...); 
+<pre>status = ca_context_create (...);
 SEVCHK ( status, "Unable to create a CA client context" );</pre>

 <p>If the application only wishes to print the message associated with an error
@@ -3405,7 +3426,7 @@ this purpose.</p>

 <h3><code><a
 name="ca_add_exception_event">ca_add_exception_event()</a></code></h3>
-<pre>#include &lt;cadef.h&gt; 
+<pre>#include &lt;cadef.h&gt;
 typedef void (*pCallback) ( struct exception_handler_args HANDLERARGS );
 int ca_add_exception_event ( pCallback  USERFUNC, void *USERARG );</pre>

@@ -3614,7 +3635,7 @@ specified channel.</p>
  <dt><code>PFUNC</code></dt>
    <dd>Pointer to a user supplied callback function. A null pointer uninstalls
      the current handler. The following arguments are passed <em>by value</em>
-      to the supplied callback handler. 
+      to the supplied callback handler.
      <pre>typedef struct ca_access_rights {
    unsigned    read_access:1;
    unsigned    write_access:1;
@@ -3954,8 +3975,8 @@ type.</p>
 prints diagnostics to standard out.</p>

 <h4>Examples</h4>
-<pre>void ca_test_event (); 
-status = ca_create_subscription ( type, chid, ca_test_event, NULL, NULL ); 
+<pre>void ca_test_event ();
+status = ca_create_subscription ( type, chid, ca_test_event, NULL, NULL );
 SEVCHK ( status, .... );</pre>

 <h4>See Also</h4>
@@ -3989,8 +4010,8 @@ outstanding within them at any given time.</p>
 </dl>

 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
-status = ca_sg_create ( &amp;gid ); 
+<pre>CA_SYNC_GID gid;
+status = ca_sg_create ( &amp;gid );
 SEVCHK ( status, Sync group create failed );</pre>

 <h4>Returns</h4>
@@ -4028,8 +4049,8 @@ int ca_sg_delete ( CA_SYNC_GID GID );</pre>
 </dl>

 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
-status = ca_sg_delete ( gid ); 
+<pre>CA_SYNC_GID gid;
+status = ca_sg_delete ( gid );
 SEVCHK ( status, Sync group delete failed );</pre>

 <h4>Returns</h4>
@@ -4140,7 +4161,7 @@ will not block unless additional subsequent requests are made.</p>
 </dl>

 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
+<pre>CA_SYNC_GID gid;
 status = ca_sg_reset(gid);</pre>

 <h4>Returns</h4>
@@ -4153,7 +4174,7 @@ status = ca_sg_reset(gid);</pre>
 <pre>#include &lt;cadef.h&gt;
 int ca_sg_put ( CA_SYNC_GID GID, chtype TYPE,
        chid CHID, void *PVALUE );
-int ca_sg_array_put ( CA_SYNC_GID GID, chtype TYPE, 
+int ca_sg_array_put ( CA_SYNC_GID GID, chtype TYPE,
        unsigned long COUNT, chid CHID, void *PVALUE );</pre>

 <p>Write a value, or array of values, to a channel and increment the outstanding
@@ -4294,7 +4315,7 @@ reissued.</p>

 <h3><code><a name="ca_client_status">ca_client_status()</a></code></h3>
 <pre>int ca_client_status ( unsigned level );
-int ca_context_status ( struct ca_client_context *CONTEXT, 
+int ca_context_status ( struct ca_client_context *CONTEXT,
       unsigned LEVEL );</pre>

 <h4>Description</h4>
--- a/src/ca/access.cpp
+++ b/src/ca/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 );
-    }
 }

 /*
--- a/src/cap5/CA.pm
+++ b/src/cap5/CA.pm
@@ -639,7 +639,7 @@ not follow this pattern, but are still printable strings.

 =item [1] R3.14 Channel Access Reference Manual by Jeffrey O. Hill

-L<http://www.aps.anl.gov/epics/base/R3-14/12-docs/CAref.html>
+L<https://epics.anl.gov/base/R3-14/12-docs/CAref.html>

 =back

--- a/src/cap5/Makefile
+++ b/src/cap5/Makefile
@@ -66,10 +66,6 @@ ifdef T_A
 	$(RM) $@ $@_new
 	$(PERL) $(XSUBPP) -typemap $(EXTUTILS)/typemap $< > $@_new && $(MV) $@_new $@

-  %.html: ../%.pm
-	$(RM) $@
-	podchecker $< && pod2html --infile=$< --outfile=$@
-
  $(INSTALL_PERL_MODULES)/$(PERL_ARCHPATH)/%: %
 	$(ECHO) "Installing loadable shared library $@"
 	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_PERL_MODULES)/$(PERL_ARCHPATH)
--- a/src/cas/generic/casDGClient.cc
+++ b/src/cas/generic/casDGClient.cc
@@ -646,6 +646,11 @@ caStatus casDGClient::processDG ()
        if ( status != S_cas_success ) {
            break;
        }
+
+        if ( this->in.bytesPresent () > 0 && dgInBytesConsumed == 0 && status == S_cas_success ) {
+            this->in.removeMsg ( this->in.bytesPresent() );
+        }
+
    }
    return status;
 }
--- 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);
--- a/src/db/dbAccess.c
+++ b/src/db/dbAccess.c
@@ -297,10 +297,10 @@ static void get_alarm(DBADDR *paddr, char **ppbuffer,
    if (*options & DBR_AL_LONG) {
        struct dbr_alLong *pal = (struct dbr_alLong*) pbuffer;

-        pal->upper_alarm_limit   = (epicsInt32) ald.upper_alarm_limit;
-        pal->upper_warning_limit = (epicsInt32) ald.upper_warning_limit;
-        pal->lower_warning_limit = (epicsInt32) ald.lower_warning_limit;
-        pal->lower_alarm_limit   = (epicsInt32) ald.lower_alarm_limit;
+        pal->upper_alarm_limit   = finite(ald.upper_alarm_limit) ? (epicsInt32) ald.upper_alarm_limit : 0;
+        pal->upper_warning_limit = finite(ald.upper_warning_limit) ? (epicsInt32) ald.upper_warning_limit : 0;
+        pal->lower_warning_limit = finite(ald.lower_warning_limit) ? (epicsInt32) ald.lower_warning_limit : 0;
+        pal->lower_alarm_limit   = finite(ald.lower_alarm_limit) ? (epicsInt32) ald.lower_alarm_limit : 0;

        if (no_data)
            *options ^= DBR_AL_LONG; /*Turn off option*/
--- a/src/db/dbBkpt.c
+++ b/src/db/dbBkpt.c
@@ -409,7 +409,7 @@ long epicsShareAPI dbd(const char *record_name)

  precord = addr.precord;

-  if (! precord->bkpt & BKPT_ON_MASK) {
+  if (!(precord->bkpt & BKPT_ON_MASK)) {
      printf("   BKPT> No breakpoint set in this record\n");
      return(S_db_bkptNotSet);
  }
--- a/src/db/dbCa.c
+++ b/src/db/dbCa.c
@@ -591,11 +591,16 @@ static void connectionCallback(struct connection_handler_args arg)
    if (pca->gotFirstConnection) {
        if (pca->nelements != ca_element_count(arg.chid) ||
            pca->dbrType != ca_field_type(arg.chid)) {
-            /* BUG: We have no way to clear any old subscription with the
-             *      originally chosen data type/size.  That will continue
-             *      to send us data and will result in an assert() fail.
-             */
-            /* Let next dbCaGetLink and/or dbCaPutLink determine options */
+            /* Size or type changed, clear everything and let the next call
+               to dbCaGetLink() and/or dbCaPutLink() reset everything */
+            if (pca->evidNative) {
+                ca_clear_event(pca->evidNative);
+                pca->evidNative = 0;
+            }
+            if (pca->evidString) {
+                ca_clear_event(pca->evidString);
+                pca->evidString = 0;
+            }
            plink->value.pv_link.pvlMask &=
                ~(pvlOptInpNative | pvlOptInpString |
                  pvlOptOutNative | pvlOptOutString);
@@ -969,7 +974,8 @@ static void dbCaTask(void *arg)
                status = ca_add_array_event(
                    ca_field_type(pca->chid)+DBR_TIME_STRING,
                    ca_element_count(pca->chid),
-                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0, 0);
+                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0,
+                    &pca->evidNative);
                if (status != ECA_NORMAL) {
                    errlogPrintf("dbCaTask ca_add_array_event %s\n",
                        ca_message(status));
@@ -981,7 +987,8 @@ static void dbCaTask(void *arg)
                pca->pgetString = dbCalloc(1, MAX_STRING_SIZE);
                epicsMutexUnlock(pca->lock);
                status = ca_add_array_event(DBR_TIME_STRING, 1,
-                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0, 0);
+                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0,
+                    &pca->evidString);
                if (status != ECA_NORMAL) {
                    errlogPrintf("dbCaTask ca_add_array_event %s\n",
                        ca_message(status));
--- a/src/db/dbCaPvt.h
+++ b/src/db/dbCaPvt.h
@@ -73,6 +73,8 @@ typedef struct caLink
 	char		*pgetString;
 	void		*pputNative;
 	char		*pputString;
+	evid		evidNative;
+	evid		evidString;
 	char		gotInNative;
 	char		gotInString;
 	char		gotOutNative;
--- a/src/db/dbEvent.c
+++ b/src/db/dbEvent.c
@@ -90,7 +90,8 @@ struct event_user {
    epicsMutexId        lock;
    epicsEventId        ppendsem;       /* Wait while empty */
    epicsEventId        pflush_sem;     /* wait for flush */
-        
+    epicsEventId        pexitsem;       /* wait for event task to join */
+
    EXTRALABORFUNC      *extralabor_sub;/* off load to event task */
    void                *extralabor_arg;/* parameter to above */
    
@@ -134,7 +135,9 @@ static char *EVENT_PEND_NAME = "eventTask";

 static struct evSubscrip canceledEvent;

-static unsigned short ringSpace ( const struct event_que *pevq ) 
+static epicsMutexId stopSync;
+
+static unsigned short ringSpace ( const struct event_que *pevq )
 {
    if ( pevq->evque[pevq->putix] == EVENTQEMPTY ) {
        if ( pevq->getix > pevq->putix ) {
@@ -274,7 +277,11 @@ int epicsShareAPI dbel ( const char *pname, unsigned level )
 dbEventCtx epicsShareAPI db_init_events (void)
 {
    struct event_user * evUser;
-    
+
+    if (!stopSync) {
+        stopSync = epicsMutexMustCreate();
+    }
+
    if (!dbevEventUserFreeList) {
        freeListInitPvt(&dbevEventUserFreeList, 
            sizeof(struct event_user),8);
@@ -293,38 +300,49 @@ dbEventCtx epicsShareAPI db_init_events (void)
    if (!evUser) {
        return NULL;
    }
-    
+
+    /* Flag will be cleared when event task starts */
+    evUser->pendexit = TRUE;
+
    evUser->firstque.evUser = evUser;
    evUser->firstque.writelock = epicsMutexCreate();
-    if (!evUser->firstque.writelock) {
-        return NULL;
-    }
+    if (!evUser->firstque.writelock)
+        goto fail;

    evUser->ppendsem = epicsEventCreate(epicsEventEmpty);
-    if (!evUser->ppendsem) {
-        epicsMutexDestroy (evUser->firstque.writelock);
-        return NULL;
-    }    
+    if (!evUser->ppendsem)
+        goto fail;
    evUser->pflush_sem = epicsEventCreate(epicsEventEmpty);
-    if (!evUser->pflush_sem) {
-        epicsMutexDestroy (evUser->firstque.writelock);
-        epicsEventDestroy (evUser->ppendsem);
-        return NULL;
-    }
+    if (!evUser->pflush_sem)
+        goto fail;
    evUser->lock = epicsMutexCreate();
-    if (!evUser->lock) {
-        epicsMutexDestroy (evUser->firstque.writelock);
-        epicsEventDestroy (evUser->pflush_sem);
-        epicsEventDestroy (evUser->ppendsem);
-        return NULL;
-    }
+    if (!evUser->lock)
+        goto fail;
+    evUser->pexitsem = epicsEventCreate(epicsEventEmpty);
+    if (!evUser->pexitsem)
+        goto fail;

    evUser->flowCtrlMode = FALSE;
    evUser->extraLaborBusy = FALSE;
    evUser->pSuicideEvent = NULL;
    return (dbEventCtx) evUser;
+fail:
+    if(evUser->lock)
+        epicsMutexDestroy (evUser->lock);
+    if(evUser->firstque.writelock)
+        epicsMutexDestroy (evUser->firstque.writelock);
+    if(evUser->ppendsem)
+        epicsEventDestroy (evUser->ppendsem);
+    if(evUser->pflush_sem)
+        epicsEventDestroy (evUser->pflush_sem);
+    if(evUser->pexitsem)
+        epicsEventDestroy (evUser->pexitsem);
+    freeListFree(dbevEventUserFreeList,evUser);
+    return NULL;
 }

+
+    /* intentionally leak stopSync to avoid possible shutdown races */
 /*
 *  DB_CLOSE_EVENTS()
 *  
@@ -346,10 +364,30 @@ void epicsShareAPI db_close_events (dbEventCtx ctx)
     * hazardous to the system's health.
     */
    epicsMutexMustLock ( evUser->lock );
-    evUser->pendexit = TRUE;
+    if(!evUser->pendexit) { /* event task running */
+        evUser->pendexit = TRUE;
+        epicsMutexUnlock ( evUser->lock );
+
+        /* notify the waiting task */
+        epicsEventSignal(evUser->ppendsem);
+        /* wait for task to exit */
+        epicsEventMustWait(evUser->pexitsem);
+
+        epicsMutexMustLock ( evUser->lock );
+    }
+
    epicsMutexUnlock ( evUser->lock );
-    /* notify the waiting task */
-    epicsEventSignal(evUser->ppendsem);
+
+    epicsMutexMustLock (stopSync);
+
+    epicsEventDestroy(evUser->pexitsem);
+    epicsEventDestroy(evUser->ppendsem);
+    epicsEventDestroy(evUser->pflush_sem);
+    epicsMutexDestroy(evUser->lock);
+
+    epicsMutexUnlock (stopSync);
+
+    freeListFree(dbevEventUserFreeList, evUser);
 }

 /*
@@ -977,14 +1015,17 @@ static void event_task (void *pParm)
        }
    }

-    epicsEventDestroy(evUser->ppendsem);
-    epicsEventDestroy(evUser->pflush_sem);
-    epicsMutexDestroy(evUser->lock);
-
-    freeListFree(dbevEventUserFreeList, evUser);
-
    taskwdRemove(epicsThreadGetIdSelf());

+    /* use stopSync to ensure pexitsem is not destroy'd
+     * until epicsEventSignal() has returned.
+     */
+    epicsMutexMustLock (stopSync);
+
+    epicsEventSignal(evUser->pexitsem);
+
+    epicsMutexUnlock(stopSync);
+
    return;
 }

@@ -1008,7 +1049,6 @@ int epicsShareAPI db_start_events (
         return DB_EVENT_OK;
     }

-     evUser->pendexit = FALSE;
     evUser->init_func = init_func;
     evUser->init_func_arg = init_func_arg;
     if (!taskname) {
@@ -1022,6 +1062,7 @@ int epicsShareAPI db_start_events (
         epicsMutexUnlock ( evUser->lock );
         return DB_EVENT_ERROR;
     }
+     evUser->pendexit = FALSE;
     epicsMutexUnlock ( evUser->lock );
     return DB_EVENT_OK;
 }
--- a/src/db/dbLock.c
+++ b/src/db/dbLock.c
@@ -525,10 +525,10 @@ long epicsShareAPI dblsr(char *recordname,int level)
            printf(" Not Locked\n");
        } else {
            printf(" thread %p",plockSet->thread_id);
-            if(! plockSet->precord || !plockSet->precord->name)
-            printf(" NULL record or record name\n");
+            if(! plockSet->precord)
+                printf(" NULL record\n");
            else
-            printf(" record %s\n",plockSet->precord->name);
+                printf(" record %s\n",plockSet->precord->name);
        }
        if(level==0) { if(recordname) break; continue; }
        for(plockRecord = (lockRecord *)ellFirst(&plockSet->lockRecordList);
--- a/src/dbStatic/dbLexRoutines.c
+++ b/src/dbStatic/dbLexRoutines.c
@@ -960,23 +960,29 @@ static void dbRecordHead(char *recordType, char *name, int visible)

 static void dbRecordField(char *name,char *value)
 {
-    DBENTRY		*pdbentry;
-    tempListNode	*ptempListNode;
-    long		status;
+    DBENTRY *pdbentry;
+    tempListNode *ptempListNode;
+    long status;

-    if(duplicate) return;
+    if (duplicate) return;
    ptempListNode = (tempListNode *)ellFirst(&tempList);
    pdbentry = ptempListNode->item;
    status = dbFindField(pdbentry,name);
-    if(status) {
-	epicsPrintf("Record \"%s\" does not have a field \"%s\"\n", 
-                    dbGetRecordName(pdbentry), name);
-	yyerror(NULL);
-	return;
+    if (status) {
+        epicsPrintf("Record \"%s\" does not have a field \"%s\"\n",
+            dbGetRecordName(pdbentry), name);
+        yyerror(NULL);
+        return;
+    }
+    if (pdbentry->indfield == 0) {
+        epicsPrintf("Can't set \"NAME\" field of record \"%s\"\n",
+            dbGetRecordName(pdbentry));
+        yyerror(NULL);
+        return;
    }
    dbTranslateEscape(value, value);    /* yuck: in-place, but safe */
    status = dbPutString(pdbentry,value);
-    if(status) {
+    if (status) {
 	epicsPrintf("Can't set \"%s.%s\" to \"%s\"\n",
                    dbGetRecordName(pdbentry), name, value);
 	yyerror(NULL);
@@ -986,33 +992,33 @@ static void dbRecordField(char *name,char *value)

 static void dbRecordInfo(char *name, char *value)
 {
-    DBENTRY		*pdbentry;
-    tempListNode	*ptempListNode;
-    long		status;
+    DBENTRY *pdbentry;
+    tempListNode *ptempListNode;
+    long status;

-    if(duplicate) return;
+    if (duplicate) return;
    ptempListNode = (tempListNode *)ellFirst(&tempList);
    pdbentry = ptempListNode->item;
    status = dbPutInfo(pdbentry,name,value);
-    if(status) {
-	epicsPrintf("Can't set \"%s\" info \"%s\" to \"%s\"\n",
+    if (status) {
+        epicsPrintf("Can't set \"%s\" info \"%s\" to \"%s\"\n",
                    dbGetRecordName(pdbentry), name, value);
-	yyerror(NULL);
-	return;
+        yyerror(NULL);
+        return;
    }
 }

 static void dbRecordAlias(char *name)
 {
-    DBENTRY		*pdbentry;
-    tempListNode	*ptempListNode;
-    long		status;
+    DBENTRY *pdbentry;
+    tempListNode *ptempListNode;
+    long status;

-    if(duplicate) return;
+    if (duplicate) return;
    ptempListNode = (tempListNode *)ellFirst(&tempList);
    pdbentry = ptempListNode->item;
    status = dbCreateAlias(pdbentry, name);
-    if(status) {
+    if (status) {
        epicsPrintf("Can't create alias \"%s\" for \"%s\"\n",
                    name, dbGetRecordName(pdbentry));
        yyerror(NULL);
@@ -1022,15 +1028,16 @@ static void dbRecordAlias(char *name)

 static void dbAlias(char *name, char *alias)
 {
-    DBENTRY	dbEntry;
-    DBENTRY	*pdbEntry = &dbEntry;
+    DBENTRY dbEntry;
+    DBENTRY *pdbEntry = &dbEntry;

    dbInitEntry(pdbbase, pdbEntry);
    if (dbFindRecord(pdbEntry, name)) {
        epicsPrintf("Alias \"%s\" refers to unknown record \"%s\"\n",
                    alias, name);
        yyerror(NULL);
-    } else if (dbCreateAlias(pdbEntry, alias)) {
+    }
+    else if (dbCreateAlias(pdbEntry, alias)) {
        epicsPrintf("Can't create alias \"%s\" referring to \"%s\"\n",
                    alias, name);
        yyerror(NULL);
@@ -1040,14 +1047,14 @@ static void dbAlias(char *name, char *alias)

 static void dbRecordBody(void)
 {
-    DBENTRY	*pdbentry;
+    DBENTRY *pdbentry;

-    if(duplicate) {
-	duplicate = FALSE;
-	return;
+    if (duplicate) {
+        duplicate = FALSE;
+        return;
    }
    pdbentry = (DBENTRY *)popFirstTemp();
-    if(ellCount(&tempList))
-	yyerrorAbort("dbRecordBody: tempList not empty");
+    if (ellCount(&tempList))
+        yyerrorAbort("dbRecordBody: tempList not empty");
    dbFreeEntry(pdbentry);
 }
--- a/src/libCom/osi/epicsGeneralTime.c
+++ b/src/libCom/osi/epicsGeneralTime.c
@@ -269,7 +269,7 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
                    }
                }
            } else {
-                if (epicsTimeGreaterThanEqual(pDest,
+                if (epicsTimeGreaterThanEqual(&ts,
                        &gtPvt.eventTime[eventNumber])) {
                    *pDest = ts;
                    gtPvt.eventTime[eventNumber] = ts;
@@ -279,7 +279,6 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
                    key = epicsInterruptLock();
                    gtPvt.ErrorCounts++;
                    epicsInterruptUnlock(key);
-                }

                    IFDEBUG(10) {
                        char last[40], buff[40];
@@ -291,6 +290,7 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
                            "    %s, using %s instead\n",
                            ptp->name, buff, last);
                    }
+                }
            }
            break;
        }
--- a/src/makeBaseApp/top/exampleApp/src/xxxRecord.c
+++ b/src/makeBaseApp/top/exampleApp/src/xxxRecord.c
@@ -198,8 +198,8 @@ static long get_alarm_double(DBADDR *paddr,struct dbr_alDouble *pad)

 static void checkAlarms(xxxRecord *prec)
 {
-	double		val;
-	float		hyst, lalm, hihi, high, low, lolo;
+    double		val, hyst, lalm;
+    float		hihi, high, low, lolo;
 	unsigned short	hhsv, llsv, hsv, lsv;

 	if(prec->udf == TRUE ){
--- a/src/misc/epicsRelease.c
+++ b/src/misc/epicsRelease.c
@@ -16,8 +16,6 @@
 #define epicsExportSharedSymbols
 #include    "epicsRelease.h"

-static const char id[] = "@(#) " EPICS_VERSION_STRING ", Misc. Utilities Library" __DATE__;
-
 epicsShareFunc int epicsShareAPI coreRelease(void)
 {
    printf ( "############################################################################\n" );
--- a/src/rec/aSubRecord.c
+++ b/src/rec/aSubRecord.c
@@ -207,6 +207,14 @@ static long init_record(aSubRecord *prec, int pass)
    }
    strcpy(prec->onam, prec->snam);
    prec->oval = prec->val;
+    for (i = 0; i < NUM_ARGS; i++) {
+        epicsUInt32 nev = (&prec->neva)[i];
+
+        (&prec->onva)[i] = nev;
+        if (nev)
+            memcpy((&prec->ovla)[i], (&prec->vala)[i],
+                dbValueSize((&prec->ftva)[i]) * nev);
+    }
    return 0;
 }

--- a/src/rec/longinRecord.c
+++ b/src/rec/longinRecord.c
@@ -21,6 +21,7 @@

 #include "dbDefs.h"
 #include "epicsPrint.h"
+#include "epicsMath.h"
 #include "alarm.h"
 #include "dbAccess.h"
 #include "dbEvent.h"
@@ -201,10 +202,10 @@ static long get_alarm_double(DBADDR *paddr, struct dbr_alDouble	*pad)
    longinRecord *prec=(longinRecord *)paddr->precord;

    if(paddr->pfield==(void *)&prec->val){
-         pad->upper_alarm_limit = prec->hihi;
-         pad->upper_warning_limit = prec->high;
-         pad->lower_warning_limit = prec->low;
-         pad->lower_alarm_limit = prec->lolo;
+        pad->upper_alarm_limit = prec->hhsv ? prec->hihi : epicsNAN;
+        pad->upper_warning_limit = prec->hsv ? prec->high : epicsNAN;
+        pad->lower_warning_limit = prec->lsv ? prec->low : epicsNAN;
+        pad->lower_alarm_limit = prec->llsv ? prec->lolo : epicsNAN;
    } else recGblGetAlarmDouble(paddr,pad);
    return(0);
 }
--- a/src/rec/longoutRecord.c
+++ b/src/rec/longoutRecord.c
@@ -19,6 +19,7 @@

 #include "dbDefs.h"
 #include "epicsPrint.h"
+#include "epicsMath.h"
 #include "alarm.h"
 #include "dbAccess.h"
 #include "dbEvent.h"
@@ -242,10 +243,10 @@ static long get_alarm_double(DBADDR *paddr,struct dbr_alDouble *pad)
    int     fieldIndex = dbGetFieldIndex(paddr);

    if(fieldIndex == longoutRecordVAL) {
-         pad->upper_alarm_limit = prec->hihi;
-         pad->upper_warning_limit = prec->high;
-         pad->lower_warning_limit = prec->low;
-         pad->lower_alarm_limit = prec->lolo;
+        pad->upper_alarm_limit = prec->hhsv ? prec->hihi : epicsNAN;
+        pad->upper_warning_limit = prec->hsv ? prec->high : epicsNAN;
+        pad->lower_warning_limit = prec->lsv ? prec->low : epicsNAN;
+        pad->lower_alarm_limit = prec->llsv ? prec->lolo : epicsNAN;
    } else recGblGetAlarmDouble(paddr,pad);
    return(0);
 }
--- a/src/rsrv/online_notify.c
+++ b/src/rsrv/online_notify.c
@@ -72,7 +72,7 @@ void rsrv_online_notify_task(void *pParm)
    char                        * pStr;
    int                         autoBeaconAddr;
    ELLLIST                     autoAddrList;
-    char                        buf[16];
+    char                        buf[22];
    unsigned                    priorityOfUDP;
    epicsThreadBooleanStatus    tbs;
    epicsThreadId               tid;
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -28,6 +28,7 @@ PERL_SCRIPTS += makeMakefile.pl
 PERL_SCRIPTS += makeTestfile.pl
 PERL_SCRIPTS += mkmf.pl
 PERL_SCRIPTS += munch.pl
+PERL_SCRIPTS += podToHtml.pl
 PERL_SCRIPTS += replaceVAR.pl
 PERL_SCRIPTS += tap-to-junit-xml.pl
 PERL_SCRIPTS += useManifestTool.pl
--- a/src/tools/convertRelease.pl
+++ b/src/tools/convertRelease.pl
@@ -21,8 +21,7 @@ use Getopt::Std;
 use EPICS::Path;
 use EPICS::Release;

-use vars qw($arch $top $iocroot $root);
-
+our ($arch, $top, $iocroot, $root);
 our ($opt_a, $opt_t, $opt_T);

 $Getopt::Std::OUTPUT_HELP_VERSION = 1;
--- a/src/tools/podToHtml.pl
+++ b/src/tools/podToHtml.pl
@@ -0,0 +1,45 @@
+#!/usr/bin/env perl
+#*************************************************************************
+# Copyright (c) 2013 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+use strict;
+use warnings;
+
+use Getopt::Std;
+use Pod::Simple::HTML;
+
+our ($opt_o);
+
+$Getopt::Std::OUTPUT_HELP_VERSION = 1;
+&HELP_MESSAGE if !getopts('o:') || @ARGV != 1;
+
+my $infile = shift @ARGV;
+
+if (!$opt_o) {
+    ($opt_o = $infile) =~ s/\. \w+ $/.html/x;
+    $opt_o =~ s/^.*\///;
+}
+
+open my $out, '>', $opt_o or
+    die "Can't create $opt_o: $!\n";
+
+my $podHtml = Pod::Simple::HTML->new();
+
+$podHtml->html_css('style.css');
+$podHtml->perldoc_url_prefix('');
+$podHtml->perldoc_url_postfix('.html');
+$podHtml->set_source($infile);
+$podHtml->output_string(\my $html);
+$podHtml->run;
+
+print $out $html;
+close $out;
+
+sub HELP_MESSAGE {
+    print STDERR "Usage: podToHtml.pl [-o file.html] file.pod\n";
+    exit 2;
+}
Author	SHA1	Message	Date
Andrew Johnson	20d2cff501	Update version number to 3.14.12.8-rc1	2018-07-19 12:31:52 -05:00
Andrew Johnson	860ce156a2	Documentation updates for 3.14.12.8	2018-07-19 12:20:41 -05:00
Andrew Johnson	31fc35fbe8	dbCa: Fix for lp: #541221 I'd looked at this a few times since it was reported, but never actually fixed the bug I described in the comments. Apparently the only thing left to do was to store the eventId and use it to clear the subscription when we saw a type-change to a PV.	2018-07-13 13:05:54 -05:00
Ralph Lange	e459e8bdd4	cas: don't spin on zero-length search requests (fix lp:1743321)	2018-06-07 11:32:16 +02:00
Ralph Lange	b558bd9b16	Cherry-picking `e794639e` from 3.15 (lp:1730982 lp:1762543)	2018-06-07 11:21:04 +02:00
Michael Davidsaver	3c16c3c0da	Cherry-picking `d2b0e920` from 3.15 (closes lp:1773373)	2018-06-07 11:07:29 +02:00
Andrew Johnson	67844bacc3	Perl s/use vars/our/	2018-05-28 16:13:14 -05:00
Ralph Lange	7e7d230d8c	templates: fix warnings for xxxRecord.c in exampleApp (fixes #1772833)	2018-05-23 09:24:56 +02:00
Andrew Johnson	c1ece40f41	Updated Release Notes for Base-3.14.12.8	2018-05-19 22:42:23 -05:00
Andrew Johnson	a732539eee	epicsMath.h defines 'finite()' not 'isfinite()'	2018-05-19 21:14:36 -05:00
Ralph Lange	3bc0805a89	rec: fix missing includes in longin/longout	2018-05-18 09:54:42 +02:00
Ralph Lange	c72e35c769	Merge Ralph's fix-1770292 branch into 3.14	2018-05-17 17:16:07 +02:00
Ralph Lange	2d9c5e99a1	db: correctly convert NaN alarm levels to integers (fixes lp #1771298)	2018-05-15 11:18:11 +02:00
Ralph Lange	ca22d50831	rec: consistent get_alarm_double() for longin/longout (fixes lp #1770292)	2018-05-15 11:18:10 +02:00
Andrew Johnson	5cb91d9f6d	Merge Ben Franksen's deadlock_warning branch into 3.14	2018-05-12 20:20:30 -05:00
Andrew Johnson	116c90c2ea	Reformatting, no code changes	2018-05-03 14:40:12 -05:00
Andrew Johnson	3f3696fb91	dbStatic: Prevent modifying a NAME field using a DB file Fixes LP: #1597809	2018-05-03 14:28:44 -05:00
Benjamin Franksen	91ce807e8b	Fix for lp: #1751380 Add warnings about possible deadlock to the docs for ca_clear_channel, ca_clear_subscription, and ca_context_destroy.	2018-04-11 12:58:28 +02:00
Andrew Johnson	b9443f8813	Tell MSVC to use absolute filenames in diagnostics (-FC flag)	2018-03-23 11:39:53 -05:00
Andrew Johnson	b7d4609e57	Merge Bruce Hill's camonitor-server-relative-ts-bug-3.14 branch	2018-03-15 17:33:32 -05:00
Andrew Johnson	c8a7e1597d	VxWorks Timezone updates Remove 2017; fix hour in MET settings	2018-03-15 10:57:55 -05:00
Andrew Johnson	ceaff61c09	Pull in the podToHtml.pl script and rules from 3.15 This lets src/cap5 build with Perl installations that lack Perl's podchecker and pod2html scripts (e.g. Fedora 27).	2018-03-14 14:12:12 -05:00
Bruce Hill	6cc623a7b4	Fixed camonitor server side relative timestamps bug tsFirst needs to get initialized from the first server side timestamp instead of the client side tsNow.	2018-03-08 01:40:11 -08:00
Andrew Johnson	ac4d5c95ac	Clean up some compiler warnings from clang	2018-02-09 10:56:52 -06:00
Andrew Johnson	de442e9584	Fix for LP: #1743076 Never zero the CA client context private ID.	2018-02-05 12:02:13 -06:00
Andrew Johnson	713c2d5080	Fix for lp: #1747091 generalTimeGetEvent()	2018-02-02 17:47:35 -06:00
Michael Davidsaver	734d16291f	rsrv: buffer for IP too small An IPv4 address and port number has 21 characters max.	2018-02-01 09:42:51 -08:00
Andrew Johnson	1454f42a27	Config fix for parallel builds with MSVC 2015 and later From Mark Rivers and Freddie Akeroyd.	2018-02-01 11:19:08 -06:00
Andrew Johnson	c830a3a4ee	Updated links to new EPICS website at Argonne Only done for documents that are still present in EPICS 7.	2018-01-18 23:35:09 -06:00
Ralph Lange	8a1477ecab	appveyor-ci: update APS download URL	2018-01-04 09:00:18 +01:00
Ralph Lange	006ce1a240	appveyor-ci: remove VS 2008, add VS 2017	2017-12-19 09:39:57 +01:00
Ralph Lange	276dee2c3e	appveyor-ci: use curl for download of make.zip	2017-12-19 09:39:10 +01:00
Andrew Johnson	98a2871727	Reset SNAPSHOT to -DEV after tagging 3.14.12.7	2017-12-15 16:09:21 -06:00
Andrew Johnson	5ca1bb3bd5	Set SNAPSHOT for 3.14.12.7 final release	2017-12-15 16:06:08 -06:00
Andrew Johnson	f6be3c7f70	Set snapshot to -rc1-DEV	2017-12-08 16:40:08 -06:00
Andrew Johnson	00924dcba0	About to tag 3.14.12.7-rc1	2017-12-08 16:37:03 -06:00
Andrew Johnson	5278799575	aSubRecord: Copy the right amount of data Initialize OVLx from VALx with NEVx elements, size from FTVx	2017-11-15 20:59:06 -06:00
Michael Davidsaver	2af98c33c9	std/rec: aSub handle INAM changing outputs Allow EFLG="On Change" to work with INAM.	2017-11-08 14:29:30 -06:00