Release R7.0.8.1

The handling of N-to-M array compression was broken with the addition
of the partial buffer option, which broke the bounds check that was
being used.

Note that this also makes the partial buffer option more consistent;
if, for example, you have
```
record(compress, foo) {
  field(ALG, "N to 1 Average")
  field(INP, "bar NPP")
  field(NSAM, 2)
  field(N, 2)
  field(PBUF, YES)
}
```
(with `bar` having, e.g. length 3), then this will now behave as
expected on both of the samples.

.github/workflows/check-editorconfig.yml

@@ -8,6 +8,6 @@ jobs:
   editorconfig:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: EditorConfig-Action
         uses: greut/eclint-action@v0

.github/workflows/ci-scripts-build.yml

@@ -29,6 +29,7 @@ on:
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
+  workflow_dispatch:
 
 env:
     SETUP_PATH: .ci-local:.ci
@@ -51,6 +52,25 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
+          - os: ubuntu-22.04
+            cmp: gcc-12
+            name: "Ub-22 gcc-12 c++20 Werror"
+            # Turn all warnings into errors,
+            # except for those we could not fix (yet).
+            # Remove respective -Wno-error=... flag once it is fixed.
+            extra: "CMD_CXXFLAGS=-std=c++20
+                    CMD_CPPFLAGS='-fdiagnostics-color
+                                  -Werror
+                                  -Wno-error=deprecated-declarations
+                                  -Wno-error=stringop-truncation
+                                  -Wno-error=restrict
+                                  -Wno-error=sizeof-pointer-memaccess
+                                  -Wno-error=nonnull
+                                  -Wno-error=dangling-pointer
+                                  -Wno-error=format-overflow
+                                  -Wno-error=format-security
+                                  -Wno-error=stringop-overread'"
+
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
@@ -264,6 +284,10 @@ jobs:
         submodules: true
     - name: Automatic core dumper analysis
       uses: mdavidsaver/ci-core-dumper@master
+      if: matrix.image!='centos:7'
+    - name: Automatic core dumper analysis
+      uses: mdavidsaver/ci-core-dumper@node16
+      if: matrix.image=='centos:7'
     - name: Prepare and compile dependencies
       run: python .ci/cue.py prepare
     - name: Build main module

.gitignore

@@ -17,3 +17,4 @@ O.*/
 *.log
 .*.swp
 .DS_Store
+.iocsh_history

configure/CONFIG_BASE_VERSION

@@ -48,7 +48,7 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 7
+EPICS_MODIFICATION = 8
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero
@@ -56,7 +56,7 @@ EPICS_PATCH_LEVEL = 1
 
 # Immediately after an official release the EPICS_PATCH_LEVEL is incremented
 # and the -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
-EPICS_DEV_SNAPSHOT=-DEV
+EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_CA_VERSION

@@ -2,11 +2,11 @@
 
 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 14
-EPICS_CA_MAINTENANCE_VERSION = 3
+EPICS_CA_MAINTENANCE_VERSION = 4
 
 # Development flag, set to zero for release versions
 
-EPICS_CA_DEVELOPMENT_FLAG = 1
+EPICS_CA_DEVELOPMENT_FLAG = 0
 
 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1

configure/CONFIG_DATABASE_VERSION

@@ -1,12 +1,12 @@
 # Version number for the database APIs and shared library
 
 EPICS_DATABASE_MAJOR_VERSION = 3
-EPICS_DATABASE_MINOR_VERSION = 22
+EPICS_DATABASE_MINOR_VERSION = 23
 EPICS_DATABASE_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions
 
-EPICS_DATABASE_DEVELOPMENT_FLAG = 1
+EPICS_DATABASE_DEVELOPMENT_FLAG = 0
 
 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1

configure/CONFIG_LIBCOM_VERSION

@@ -1,12 +1,12 @@
 # Version number for the libcom APIs and shared library
 
 EPICS_LIBCOM_MAJOR_VERSION = 3
-EPICS_LIBCOM_MINOR_VERSION = 22
+EPICS_LIBCOM_MINOR_VERSION = 23
 EPICS_LIBCOM_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions
 
-EPICS_LIBCOM_DEVELOPMENT_FLAG = 1
+EPICS_LIBCOM_DEVELOPMENT_FLAG = 0
 
 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1

configure/Makefile

@@ -34,5 +34,9 @@ CFG += TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A)
 
 include $(TOP)/configure/RULES
 
+ifeq ($(GNU),YES)
+  # Pass compiler flags to preprocessor to enable _FORTIFY_SOURCE
+  TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): CPPFLAGS += $(CFLAGS)
+endif
 TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): toolchain.c
 	$(PREPROCESS.cpp)

configure/RULES_BUILD

@@ -532,11 +532,11 @@ endif # LOADABLE_SHRLIB_SUFFIX
 ifneq ($(INSTALL_CONFIGS),)
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
 
 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
 endif
 
 $(INSTALL_INCLUDE)/%: $(COMMON_DIR)/%

configure/os/CONFIG.Common.RTEMS-qoriq_e500

@@ -22,7 +22,7 @@ ARCH_DEP_CFLAGS += -DRTEMS_HAS_ALTIVEC
 #OP_SYS_LDLIBS += -lbspExt #does not use posix stuff ... want to ignore
 OP_SYS_LDLIBS += -Wl,--gc-sections
 #ARCH_DEP_LDFLAGS = -mcpu=8540 -meabi -msdata=sysv -mstrict-align -mspe -mabi=spe -mfloat-gprs=double 
-ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/powerpc-rtems5/qoriq_e500/lib  
+ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/$(RTEMS_BSP)/lib
 
 MUNCH_SUFFIX = .img
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))

configure/toolchain.c

@@ -47,3 +47,8 @@ COMMANDLINE_LIBRARY ?= EPICS
 #else
 COMMANDLINE_LIBRARY ?= $(strip $(if $(wildcard $(if $(GNU_DIR),$(GNU_DIR)/include/readline/readline.h)), READLINE, EPICS))
 #endif
+
+#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE>2
+OP_SYS_CPPFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+#endif
+

documentation/RELEASE_NOTES.md

@@ -18,9 +18,107 @@ should also be read to understand what has changed since earlier releases:
 - [pva2pva](https://epics-base.github.io/pva2pva/release_notes.html)
 - [pvaClient](https://github.com/epics-base/pvaClientCPP/blob/master/documentation/RELEASE_NOTES.md)
 
-**This version of EPICS has not been released yet.**
+## EPICS Release 7.0.8.1
 
-## Changes made on the 7.0 branch since 7.0.7
+### Limit to `_FORTIFY_SOURCE=2`
+
+GCC versions 12 and beyond and glibc have added some aggressive runtime
+checks for buffer overflows in libc functions at runtime, and the
+[Ubuntu 2024.04](https://wiki.ubuntu.com/ToolChain/CompilerFlags) release
+increased their default gcc fortification level from 2 to 3.
+This has started causing EPICS Base builds to fail on that version, and
+other OS releases may make that configuration change with similar results.
+This release detects a compiler configured with `_FORTIFY_SOURCE=3` and
+overrides it to 2.
+Later releases of Base will adjust the code, providing information to the
+compiler to avoid triggering these incorrect protections.
+
+### Fix issue with compress record
+
+In Base 7.0.8, an update to the compress record was added to allow for certain
+algorithms to use partially filled buffers in their computations. Unfortunately,
+this broke the behaviour of the records in certain cases. This has been fixed.
+
+### Various minor changes
+
+These included fixing minor memory leaks and documentation corrections. The
+`SIZV` field of lsi, lso and printf record VAL fields now can't exceed 32767
+characters, to match an internal limit.
+
+### `epicsSocketAccept()` now returns `SOCKET`, not `int`
+
+This might have some effect on downstream modules still using `int`, but the
+OS-specific osdSock.h headers which osiSock.h includes have all declared
+`SOCKET` (in most casese as a typedef for `int`) for many releases.
+This change removes a compiler warning on WIN32.
+Further details and the discussion about this change can be found
+[here](https://github.com/epics-base/epics-base/pull/458).
+
+### `dbLoadRecords` allows macros with default values
+
+Previously the parser assumed that files containing macro substitutions were
+bad if no macro definitions were provided; that assumption was made incorrect
+once macro substitutions were allowed to provide a default value.
+
+### Hostname length limit in CA removed
+
+Before this release, the CA client library only handled hostnames in address
+list environment variables up to 255 characters long.
+This limit has been removed.
+
+-----
+
+## EPICS Release 7.0.8
+
+### bi "Raw Soft Channel" use MASK
+
+If MASK is non-zero, The raw device support will now apply MASK to the
+value read into RVAL.
+eg. allows extraction of a bit from an input integer.
+
+```
+record(longin, "integer") {
+    field(VAL, "0xff")
+}
+record(bi, "bit1") {
+    field(DESC, "extract bit 1")
+    field(DTYP, "Raw Soft Channel")
+    field(INP , "integer")
+    field(MASK, "0x2")
+    field(ZNAM, "Clear")
+    field(ONAM, "Set")
+}
+```
+
+### ANSI escapes in stderr
+
+ANSI escape charactor sequences may now be printed to the stderr stream.
+These escapes will appear in logs captured from that stream.
+Tools which parse and/or render these logs may need to be adjusted to
+either strip out the escapes, or to translate them into markup.
+(see [ansi2html](https://pypi.org/project/ansi2html/) for example)
+
+### Allow explicit append with `dbRecordsOnceOnly!=0`
+
+Previously setting `dbRecordsOnceOnly!=0` prevented any further changes to a record via a .db file.  eg.
+
+```
+record(ai, "myrec") {}
+```
+
+`dbRecordsOnceOnly!=0` previously disallowed appending fields with either form:
+
+```
+record("*", "myrec") {} # error
+record(ai, "myrec") {}  # error
+```
+
+Beginning with this release, `dbRecordsOnceOnly!=0` allows appending when explicitly intended (when record type is `"*"`).
+
+```
+record("*", "myrec") {} # allowed
+record(ai, "myrec") {}  # error
+```
 
 ### Add `$EPICS_CLI_TIMEOUT`
 
@@ -63,7 +161,7 @@ Previously, if a subRecord has an invalid `INP*` link, it was silently failing
 (and not running the proc function).  Now the the status code returned by the
 subroutine is returned from `dbProcess()`.
 
-### COMMANDLINE_LIBRARY fallback to GNU_DIR
+### COMMANDLINE\_LIBRARY fallback to GNU\_DIR
 
 Fall back to the previous behavior when searching for `readline.h` with older compilers.
 
@@ -102,6 +200,10 @@ and string formats, some of which support full nanosecond precision.
 More information is included in the filters documentation, which can be found in
 the `html/filters.html` document that is generated during the build
 
+### Allow adding new error symbols at any time
+
+`errSymbolAdd` can now be called after early initialization.
+
 ### Add conditional output (OOPT) to the longout record
 
 The longout record can now be configured using its new OOPT and OOCH fields
@@ -114,7 +216,9 @@ This functionality was suggested in
 be added to other output record types if the community finds it useful,
 please send feedback about the feature to tech-talk.
 
-### Tab completion for IOC shell
+### IOC Shell
+
+#### Tab completion
 
 When built with optional GNU libreadline support, the interactive IOC shell
 will perform tab completion for command names as well as for some arguments
@@ -126,14 +230,25 @@ using the new `iocshArgStringRecord` and `iocshArgStringPath` argument types.
 Both function identically to `iocshArgString` but indicate how to suggest
 completion strings.
 
-Builds on macOS (darwin-x86 or darwin-aarch64 targets) normally use Apple's
+Builds on macOS (`darwin-x86` or `darwin-aarch64` targets) normally use Apple's
 libedit library in readline compatibility mode, which doesn't support the tab
 completion API that GNU readline provides. You can use Homebrew or some other
 third-party package manager to install the GNU readline package, then edit the
-configure/os/CONFIG_SITE.darwinCommon.darwinCommon file to have EPICS use the
+`configure/os/CONFIG_SITE.darwinCommon.darwinCommon` file to have EPICS use the
 real thing to get tab completion in the IOC shell. The default settings in that
 file currently look for and use a Homebrew-installed readline if present.
 
+#### Persist history
+
+Attempt to read and write command to a file (`./.iocsh_history` by default).
+Name may be overwritten with by setting `$EPICS_IOCSH_HISTFILE` to an
+alternate path, or disabled by setting to an empty string.
+
+#### Changes to help output
+
+Rework the `help` command output to improve formatting and readability,
+and include a visual marker (a line of underlines) between different help commands.
+
 ### Add FMOD as CALC Expression
 
 The floating point modulo function `FMOD(NUM,DEN)` has been added to the CALC

documentation/ReleaseChecklist.html

@@ -48,14 +48,14 @@ everything that has to be done since it's so easy to miss steps.</p>
 <p>The following roles are used below:</p>
 
 <dl>
-  <dt><strong>Release Manager</strong> ()</dt>
+  <dt><strong>Release Manager</strong></dt>
     <dd>Responsible for managing and tagging the release</dd>
-  <dt><strong>Platform Developers</strong> (informal)</dt>
-    <dd>Responsible for individual operating system platforms</dd>
+  <dt><strong>Core Developers</strong></dt>
+    <dd>Responsible for maintaining the EPICS software</dd>
   <dt><strong>Application Developers</strong></dt>
     <dd>Responsible for support modules that depend on EPICS Base.</dd>
-  <dt><strong>APS Website Editor</strong> (Andrew Johnson)</dt>
-    <dd>Responsible for the APS EPICS website</dd>
+  <dt><strong>Website Editors</strong></dt>
+    <dd>Responsible for the EPICS websites</dd>
 </dl>
 
 <form>
@@ -72,23 +72,22 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Email all developers about the upcoming release and ask for a list
-        of remaining tasks that must be finished.</td>
+      <td>Notify core developers about the upcoming release and ask about any
+        remaining tasks that must be finished.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>All developers</td>
       <td>Check the bug tracker for any outstanding items and handle
-        appropriately. All bugs that have been fixed should have been marked
-        as Fix Committed.</td>
+        appropriately.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Set the Feature Freeze date, by which time all Git commits for
-        enhancements and new functionality should have been completed. After
-        this date, commits should only be made to fix problems that show up
-        during testing.</td>
+      <td>Set a Feature Freeze date, by which time all Git branches for
+        enhancements and new functionality should have been merged. After this
+        date, commits and merges should only be made to fix problems that show
+        up during testing.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -97,6 +96,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Ensure that documentation will be updated before the release date:
         <ul>
           <li>Release Notes</li>
+          <li>Doxygen annotations</li>
           <li>Other documents</li>
         </ul>
       </td>
@@ -104,13 +104,8 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Review and update this checklist for the upcoming release.</td>
-      </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Release Manager</td>
-      <td>Create a release milestone on Launchpad. If a target release date is
-        known set "Date Targeted" to the expected release date.</td>
+      <td>Review and update this checklist for the upcoming release.
+        Update the release version number in the tags and messages below.</td>
       </tr>
     <tr>
       <th colspan="3">Testing</th>
@@ -118,7 +113,7 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Platform Developers</td>
-      <td>Run the built-in test programs on all available host platforms using
+      <td>Run the internal test programs on all available host platforms using
         <blockquote><tt>
           make -s runtests
         </tt></blockquote></td>
@@ -156,6 +151,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Check that documentation has been updated:
         <ul>
           <li>Release Notes</li>
+          <li>Doxygen annotations</li>
           <li>Other documents</li>
           </ul>
         </td>
@@ -167,8 +163,8 @@ everything that has to be done since it's so easy to miss steps.</p>
     </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Release Manager</td>
-      <td>Obtain a positive <q>Ok to release</q> from developers.</td>
+      <td>Core Developers</td>
+      <td>Reach a consensus that the software is ready to release.</td>
       </tr>
     <tr>
       <th colspan="3">Creating the final release version</th>
@@ -191,27 +187,29 @@ everything that has to be done since it's so easy to miss steps.</p>
               cd base-7.0/modules/&lt;module&gt;/documentation<br />
               pandoc -f gfm -t html -o RELEASE_NOTES.html RELEASE_NOTES.md
               </tt></blockquote>
-            Commit changes (don't push).</li>
+            Commit these changes (don't push).</li>
 
           <li>Edit the module's release version file
-            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and its top-level
-            <tt>Doxyfile</tt>; set the <tt>DEVELOPMENT_FLAG</tt> value to 0 and
-            remove <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string.
-            Commit changes (don't push).</li>
+            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and the
+            <tt>Doxyfile</tt>s in the top-level and/or documentation
+            directories. In these, set <tt>DEVELOPMENT_FLAG</tt> to 0 and remove
+            <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string. Commit these
+            changes (don't push).</li>
 
           <li>Tag the module:
             <blockquote><tt>
-              git tag -m 'ANJ: Tag for EPICS 7.0.7' &lt;module-version&gt;
+              git tag -m 'ANJ: Tag for EPICS 7.0.8.1' &lt;module-version&gt;
               </tt></blockquote>
             </li>
 
           <li>Update the git submodule on the Base-7.0 branch to the
-            newly-tagged version, but don't commit yet:
+            newly-tagged version, check the module's status matches the tag:
             <blockquote><tt>
               cd base-7.0/modules<br />
               git add &lt;module&gt;<br />
               git submodule status --cached
               </tt></blockquote>
+            Don't commit the submodule updates yet.
             </li>
 
           <li>Edit the module's release version file
@@ -221,7 +219,8 @@ everything that has to be done since it's so easy to miss steps.</p>
             <tt>PROJECT_NUMBER</tt> string, appending <tt>-dev</tt> to the new
             module version number. Commit changes.</li>
 
-          <li>Push commits and the new tag to the submodule's GitHub repository:
+          <li>Push commits and the new tag to the submodule's GitHub repository
+            (assumed to be the <tt>upstream</tt> remote):
             <blockquote><tt>
               cd base-7.0/modules/&lt;module&gt;<br />
               git push --follow-tags upstream master
@@ -270,10 +269,9 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Tag the epics-base module in Git:
         <blockquote><tt>
           cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for release' R7.0.7
+          git tag -m 'ANJ: Tagged for release' R7.0.8.1
           </tt></blockquote>
-        <p>Don't push anything to the Launchpad repository
-          yet.</p>
+        <p>Don't push to GitHub yet.</p>
         </td>
       </tr>
     <tr>
@@ -305,12 +303,12 @@ everything that has to be done since it's so easy to miss steps.</p>
         files and directories that are only used for continuous integration:
         <blockquote><tt>
           cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.7 ../base-7.0.7.tar.gz base-7.0.7/
+          ./.tools/make-tar.sh R7.0.8.1 ../base-7.0.8.1.tar.gz base-7.0.8.1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
           cd ..<br />
-          gpg --armor --sign --detach-sig base-7.0.7.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.8.1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -318,8 +316,9 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Test the tar file by extracting its contents and building it on at
-        least one supported platform. When this succeeds the commits and new git
-        tag can be pushed to the Launchpad repository:
+        least one supported platform. If this succeeds the commits and new git
+        tag can be pushed to the GitHub repository's 7.0 branch (assumed to be
+        the <tt>upstream</tt> remote):
         <blockquote><tt>
           git push --follow-tags upstream 7.0
           </tt></blockquote>
@@ -367,7 +366,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       </tr>
 
     <tr>
-      <th colspan="3">Publish to epics-controls</th>
+      <th colspan="3">Publish to epics-controls.org</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
@@ -375,7 +374,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Upload the tar file and its <tt>.asc</tt> signature file to the
         epics-controls web-server.
         <blockquote><tt>
-          scp base-7.0.7.tar.gz base-7.0.7.tar.gz.asc epics-controls:download/base<br />
+          scp base-7.0.8.1.tar.gz base-7.0.8.1.tar.gz.asc epics-controls:download/base<br />
           </tt></blockquote>
         </td>
       </tr>
@@ -392,22 +391,22 @@ everything that has to be done since it's so easy to miss steps.</p>
       </tr>
 
     <tr>
-      <th colspan="3">Publish to Launchpad</th>
+      <th colspan="3">Publish to GitHub</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Go to the Launchpad milestone for this release. Click the Create
-        release button and add the release date. Put a URL for the release page
-        in the Release notes box, and click the Create release button. Upload
-        the tar file and its <tt>.asc</tt> signature file to the new Launchpad
-        release page.</td>
+      <td>Go to the GitHub
+        <a href="https://github.com/epics-base/epics-base/releases/new?tag=R7.0.8.1">
+          Create release from tag R7.0.8.1</a> page.
+        Upload the tar file and its <tt>.asc</tt> signature file to the new
+        GitHub release page.</td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Find all Launchpad bug reports with the status Fix Committed which
-        have been fixed in this release and mark them Fix Released.</td>
+      <td>We used to close out bug reports in Launchpad at release-time, this
+        would be the time to do that if we have an equivalent on GitHub.</td>
       </tr>
 
     <tr>

modules/Makefile

@@ -34,9 +34,6 @@ pvDatabase_DEPEND_DIRS = pvAccess
 SUBMODULES += pva2pva
 pva2pva_DEPEND_DIRS = pvAccess
 
-SUBMODULES += example
-example_DEPEND_DIRS = pva2pva pvaClient
-
 # Allow sites to add extra submodules
 -include Makefile.local
 

modules/ca/src/client/acctst.c

@@ -2575,7 +2575,8 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel )
     SEVCHK ( ca_get ( DBR_FLOAT, chan, &temp ), NULL );
     SEVCHK ( ca_pend_io ( timeoutToPendIO ), NULL );
 
-    /* printf ( "flow control bypassed %u events\n", flowCtrlCount ); */
+    if (0)
+        printf ( "flow control bypassed %u events\n", flowCtrlCount );
 
     showProgressEnd ( interestLevel );
 }

modules/ca/src/client/cac.cpp

@@ -25,6 +25,7 @@
 #include <stdexcept>
 #include <string> // vxWorks 6.0 requires this include
 
+#include "epicsStdio.h"
 #include "dbDefs.h"
 #include "epicsGuard.h"
 #include "epicsVersion.h"
@@ -1008,7 +1009,7 @@ bool cac::defaultExcep (
     char buf[512];
     char hostName[64];
     iiu.getHostName ( guard, hostName, sizeof ( hostName ) );
-    sprintf ( buf, "host=%s ctx=%.400s", hostName, pCtx );
+    epicsSnprintf( buf, sizeof(buf), "host=%s ctx=%.400s", hostName, pCtx );
     this->notify.exception ( guard, status, buf, 0, 0u );
     return true;
 }
@@ -1312,7 +1313,7 @@ void cac::pvMultiplyDefinedNotify ( msgForMultiplyDefinedPV & mfmdpv,
     const char * pChannelName, const char * pAcc, const char * pRej )
 {
     char buf[256];
-    sprintf ( buf, "Channel: \"%.64s\", Connecting to: %.64s, Ignored: %.64s",
+    epicsSnprintf( buf, sizeof(buf), "Channel: \"%.64s\", Connecting to: %.64s, Ignored: %.64s",
             pChannelName, pAcc, pRej );
     {
         callbackManager mgr ( this->notify, this->cbMutex );

modules/ca/src/client/iocinf.cpp

@@ -21,6 +21,9 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include <vector>
+#include <exception>
+
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
@@ -28,6 +31,7 @@
 
 #include "envDefs.h"
 #include "epicsAssert.h"
+#include "epicsString.h"
 #include "epicsStdioRedirect.h"
 #include "errlog.h"
 #include "osiWireFormat.h"
@@ -35,39 +39,6 @@
 #include "addrList.h"
 #include "iocinf.h"
 
-/*
- * getToken()
- */
-static char *getToken ( const char **ppString, char *pBuf, unsigned bufSIze )
-{
-    bool tokenFound = false;
-    const char *pToken;
-    unsigned i;
-
-    pToken = *ppString;
-    while ( isspace (*pToken) && *pToken ){
-        pToken++;
-    }
-
-    for ( i=0u; i<bufSIze; i++ ) {
-        if ( isspace (pToken[i]) || pToken[i]=='\0' ) {
-            pBuf[i] = '\0';
-            *ppString = &pToken[i];
-            if ( i != 0 ) {
-                tokenFound = true;
-            }
-            break;
-        }
-        pBuf[i] = pToken[i];
-    }
-
-    if ( tokenFound ) {
-        pBuf[bufSIze-1] = '\0';
-        return pBuf;
-    }
-    return NULL;
-}
-
 /*
  * addAddrToChannelAccessAddressList ()
  */
@@ -77,9 +48,7 @@ extern "C" int epicsStdCall addAddrToChannelAccessAddressList
 {
     osiSockAddrNode *pNewNode;
     const char *pStr;
-    const char *pToken;
     struct sockaddr_in addr;
-    char buf[256u]; /* large enough to hold an IP address or hostname */
     int status, ret = -1;
 
     pStr = envGetConfigParamPtr (pEnv);
@@ -87,31 +56,45 @@ extern "C" int epicsStdCall addAddrToChannelAccessAddressList
         return ret;
     }
 
-    while ( ( pToken = getToken (&pStr, buf, sizeof (buf) ) ) ) {
-        status = aToIPAddr ( pToken, port, &addr );
-        if (status<0) {
-            fprintf ( stderr, "%s: Parsing '%s'\n", __FILE__, pEnv->name);
-            fprintf ( stderr, "\tBad internet address or host name: '%s'\n", pToken);
-            continue;
+    try {
+        std::vector<char> scratch(pStr, pStr+strlen(pStr)+1); // copy chars and trailing nil
+
+        char *save = NULL;
+        for(const char *pToken = epicsStrtok_r(&scratch[0], " \t\n\r", &save);
+            pToken;
+            pToken = epicsStrtok_r(NULL, " \t\n\r", &save))
+        {
+            if(!pToken[0]) {
+                continue;
+            }
+
+            status = aToIPAddr ( pToken, port, &addr );
+            if (status<0) {
+                fprintf ( stderr, "%s: Parsing '%s'\n", __FILE__, pEnv->name);
+                fprintf ( stderr, "\tBad internet address or host name: '%s'\n", pToken);
+                continue;
+            }
+
+            if ( ignoreNonDefaultPort && ntohs ( addr.sin_port ) != port ) {
+                continue;
+            }
+
+            pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
+            if (pNewNode==NULL) {
+                fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
+                break;
+            }
+
+            pNewNode->addr.ia = addr;
+
+            /*
+             * LOCK applied externally
+             */
+            ellAdd (pList, &pNewNode->node);
+            ret = 0; /* success if anything is added to the list */
         }
-
-        if ( ignoreNonDefaultPort && ntohs ( addr.sin_port ) != port ) {
-            continue;
-        }
-
-        pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
-        if (pNewNode==NULL) {
-            fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
-            break;
-        }
-
-        pNewNode->addr.ia = addr;
-
-        /*
-         * LOCK applied externally
-         */
-        ellAdd (pList, &pNewNode->node);
-        ret = 0; /* success if anything is added to the list */
+    } catch(std::exception&) { // only bad_alloc currently possible
+        ret = -1;
     }
 
     return ret;

modules/ca/src/client/udpiiu.cpp

@@ -549,7 +549,7 @@ void epicsStdCall caRepeaterRegistrationMessage (
             char sockErrBuf[64];
             epicsSocketConvertErrnoToString (
                 sockErrBuf, sizeof ( sockErrBuf ) );
-            fprintf ( stderr, "error sending registration message to CA repeater daemon was \"%s\"\n",
+            fprintf ( stderr, ERL_ERROR " sending registration message to CA repeater daemon was \"%s\"\n",
                 sockErrBuf );
         }
     }
@@ -813,13 +813,13 @@ bool udpiiu::exceptionRespAction (
 
     if ( msg.m_postsize > sizeof ( caHdr ) ){
         errlogPrintf (
-            "error condition \"%s\" detected by %s with context \"%s\" at %s\n",
+            ERL_ERROR " condition \"%s\" detected by %s with context \"%s\" at %s\n",
             ca_message ( msg.m_available ),
             name, reinterpret_cast <const char *> ( &reqMsg + 1 ), date );
     }
     else{
         errlogPrintf (
-            "error condition \"%s\" detected by %s at %s\n",
+            ERL_ERROR " condition \"%s\" detected by %s at %s\n",
             ca_message ( msg.m_available ), name, date );
     }
 

modules/ca/src/tools/caput.c

@@ -35,6 +35,7 @@
 #include <epicsStdlib.h>
 
 #include <cadef.h>
+#include <errlog.h>
 #include <epicsGetopt.h>
 #include <epicsEvent.h>
 #include <epicsString.h>
@@ -549,7 +550,7 @@ int main (int argc, char *argv[])
         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));
+        fprintf(stderr, ERL_ERROR " from put operation: %s\n", ca_message(result));
         free(sbuf); free(dbuf); free(ebuf);
         return 1;
     }
@@ -570,7 +571,7 @@ int main (int argc, char *argv[])
     }
 
     if (result != ECA_NORMAL) {
-        fprintf(stderr, "Error occured writing data: %s\n", ca_message(result));
+        fprintf(stderr, ERL_ERROR " occured writing data: %s\n", ca_message(result));
         free(sbuf); free(dbuf); free(ebuf);
         return 1;
     }

modules/database/src/ioc/as/asCa.c

@@ -225,6 +225,11 @@ static void asCaTask(void)
         if(asCaDebug) printf("asCaTask has cleared all channels\n");
         epicsEventSignal(asCaTaskWait);
     }
+
+    /* ATM never reached, just a placeholder */
+    cantProceed("Unreachable.  Perpetual thread.");
+
+    taskwdRemove(0);
 }
 
 void asCaStart(void)

modules/database/src/ioc/as/asIocRegister.c

@@ -90,7 +90,7 @@ static const iocshFuncDef asprulesFuncDef = {
     "asprules",1,asprulesArgs,
     "List rules of an Access Security Group.\n"
     "If no Group is specified then list the rules for all groups\n"
-    "Example: asprules mygroup"
+    "Example: asprules mygroup\n"
 };
 static void asprulesCallFunc(const iocshArgBuf *args)
 {

modules/database/src/ioc/bpt/makeBpt.c

@@ -21,6 +21,7 @@
 #include <ctype.h>
 
 #include "dbDefs.h"
+#include "errlog.h"
 #include "ellLib.h"
 #include "cvtTable.h"
 
@@ -125,12 +126,12 @@ int main(int argc, char **argv)
     }
     inFile = fopen(argv[1],"r");
     if(!inFile) {
-        fprintf(stderr,"Error opening %s\n",argv[1]);
+        fprintf(stderr,ERL_ERROR " opening %s\n",argv[1]);
         exit(-1);
     }
     outFile = fopen(outFilename,"w");
     if(!outFile) {
-        fprintf(stderr,"Error opening %s\n",outFilename);
+        fprintf(stderr,ERL_ERROR " opening %s\n",outFilename);
         exit(-1);
     }
     while(fgets(inbuf,MAX_LINE_SIZE,inFile)) {

modules/database/src/ioc/db/callback.c

@@ -344,6 +344,10 @@ int callbackRequest(epicsCallback *pcallback)
         epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " pcallback was NULL\n");
         return S_db_notInit;
     }
+    if (!pcallback->callback) {
+        epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " pcallback->callback was NULL\n");
+        return S_db_notInit;
+    }
     priority = pcallback->priority;
     if (priority < 0 || priority >= NUM_CALLBACK_PRIORITIES) {
         epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " Bad priority\n");

modules/database/src/ioc/db/dbAccess.c

@@ -798,18 +798,13 @@ int dbLoadRecords(const char* file, const char* subs)
         return -1;
     }
     status = dbReadDatabase(&pdbbase, file, 0, subs);
-    switch(status)
-    {
-    case 0:
+    if(status==0) {
         if(dbLoadRecordsHook)
             dbLoadRecordsHook(file, subs);
-        break;
-    case -2:
-        errlogPrintf("dbLoadRecords: failed to load '%s'\n"
-            "    Records cannot be loaded after iocInit!\n", file);
-        break;
-    default:
-        errlogPrintf("dbLoadRecords: failed to load '%s'\n", file);
+    } else {
+        fprintf(stderr, ERL_ERROR " failed to load '%s'\n", file);
+        if(status==-2)
+            fprintf(stderr, "    Records cannot be loaded after iocInit!\n");
     }
     return status;
 }

modules/database/src/ioc/db/dbChannel.h

@@ -41,20 +41,35 @@ extern "C" {
 /**
  * event subscription
  */
-typedef struct evSubscrip {
+struct evSubscrip;
+
+typedef struct evSubscrip evSubscrip;
+
+#ifdef EPICS_PRIVATE_API
+struct evSubscrip {
     ELLNODE             node;
     struct dbChannel  * chan;
+    /* user_sub==NULL used to indicate db_cancel_event() */
     EVENTFUNC         * user_sub;
     void              * user_arg;
+    /* associated queue, may be shared with other evSubscrip */
     struct event_que  * ev_que;
+    /* NULL if !npend.  if npend!=0, pointer to last event added to event_que::valque */
     db_field_log     ** pLastLog;
-    unsigned long       npend;      /**< n times this event is on the queue */
-    unsigned long       nreplace;   /**< n times replacing event on the queue */
+    /* n times this event is on the queue */
+    unsigned long       npend;
+    /* n times replacing event on the queue */
+    unsigned long       nreplace;
+    /* DBE mask */
     unsigned char       select;
+    /* if set, subscription will yield dbfl_type_val */
     char                useValque;
+    /* event_task is handling this subscription */
     char                callBackInProgress;
+    /* this node added to dbCommon::mlis */
     char                enabled;
-} evSubscrip;
+};
+#endif
 
 typedef struct chFilter chFilter;
 

modules/database/src/ioc/db/dbEvent.c

@@ -18,6 +18,7 @@
  *          Ralph Lange <Ralph.Lange@bessy.de>
  */
 
+#define EPICS_PRIVATE_API
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -75,23 +76,23 @@ struct event_que {
     unsigned short          getix;
     unsigned short          quota;          /* the number of assigned entries*/
     unsigned short          nDuplicates;    /* N events duplicated on this q */
-    unsigned short          nCanceled;      /* the number of canceled entries */
     unsigned                possibleStall;
 };
 
 struct event_user {
     struct event_que    firstque;       /* the first event que */
 
+    ELLLIST             waiters;        /* event_waiter::node */
+
     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 */
 
     epicsThreadId       taskid;         /* event handler task id */
-    struct evSubscrip   *pSuicideEvent; /* event that is deleting itself */
+    epicsUInt32         pflush_seq;     /* worker cycle count for synchronization */
     unsigned            queovr;         /* event que overflow count */
     unsigned char       pendexit;       /* exit pend task */
     unsigned char       extra_labor;    /* if set call extra labor func */
@@ -101,6 +102,11 @@ struct event_user {
     epicsThreadId       init_func_arg;
 };
 
+typedef struct {
+    ELLNODE node; /* event_user::waiters */
+    epicsEventId wake;
+} event_waiter;
+
 /*
  * Reliable intertask communication requires copying the current value of the
  * channel for later queuing so 3 stepper motor steps of 10 each do not turn
@@ -122,10 +128,9 @@ static void *dbevFieldLogFreeList;
 
 static char *EVENT_PEND_NAME = "eventTask";
 
-static struct evSubscrip canceledEvent;
-
 static epicsMutexId stopSync;
 
+/* unused space in queue (EVENTQUESIZE when empty) */
 static unsigned short ringSpace ( const struct event_que *pevq )
 {
     if ( pevq->evque[pevq->putix] == EVENTQEMPTY ) {
@@ -139,17 +144,11 @@ static unsigned short ringSpace ( const struct event_que *pevq )
     return 0;
 }
 
-/*
- *  db_event_list ()
- */
 int db_event_list ( const char *pname, unsigned level )
 {
     return dbel ( pname, level );
 }
 
-/*
- * dbel ()
- */
 int dbel ( const char *pname, unsigned level )
 {
     DBADDR              addr;
@@ -217,7 +216,6 @@ int dbel ( const char *pname, unsigned level )
 
             if ( level > 2 ) {
                 unsigned nDuplicates;
-                unsigned nCanceled;
                 if ( pevent->nreplace ) {
                     printf (", discarded by replacement=%ld", pevent->nreplace);
                 }
@@ -226,14 +224,10 @@ int dbel ( const char *pname, unsigned level )
                 }
                 LOCKEVQUE(pevent->ev_que);
                 nDuplicates = pevent->ev_que->nDuplicates;
-                nCanceled = pevent->ev_que->nCanceled;
                 UNLOCKEVQUE(pevent->ev_que);
                 if  ( nDuplicates ) {
                     printf (", duplicate count =%u\n", nDuplicates );
                 }
-                if ( nCanceled ) {
-                    printf (", canceled count =%u\n", nCanceled );
-                }
             }
 
             if ( level > 3 ) {
@@ -318,9 +312,6 @@ dbEventCtx db_init_events (void)
     evUser->ppendsem = epicsEventCreate(epicsEventEmpty);
     if (!evUser->ppendsem)
         goto fail;
-    evUser->pflush_sem = epicsEventCreate(epicsEventEmpty);
-    if (!evUser->pflush_sem)
-        goto fail;
     evUser->lock = epicsMutexCreate();
     if (!evUser->lock)
         goto fail;
@@ -330,7 +321,6 @@ dbEventCtx db_init_events (void)
 
     evUser->flowCtrlMode = FALSE;
     evUser->extraLaborBusy = FALSE;
-    evUser->pSuicideEvent = NULL;
     return (dbEventCtx) evUser;
 fail:
     if(evUser->lock)
@@ -339,8 +329,6 @@ fail:
         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);
@@ -404,7 +392,6 @@ void db_close_events (dbEventCtx ctx)
 
     epicsEventDestroy(evUser->pexitsem);
     epicsEventDestroy(evUser->ppendsem);
-    epicsEventDestroy(evUser->pflush_sem);
     epicsMutexDestroy(evUser->lock);
 
     epicsMutexUnlock (stopSync);
@@ -461,8 +448,7 @@ dbEventSubscription db_add_event (
     while ( TRUE ) {
         int success = 0;
         LOCKEVQUE ( ev_que );
-        success = ( ev_que->quota + ev_que->nCanceled <
-                                EVENTQUESIZE - EVENTENTRIES );
+        success = ( ev_que->quota < EVENTQUESIZE - EVENTENTRIES );
         if ( success ) {
             ev_que->quota += EVENTENTRIES;
         }
@@ -579,62 +565,62 @@ static void event_remove ( struct event_que *ev_que,
 void db_cancel_event (dbEventSubscription event)
 {
     struct evSubscrip * const pevent = (struct evSubscrip *) event;
-    unsigned short getix;
+    struct event_que *que = pevent->ev_que;
+    char sync = 0;
 
     db_event_disable ( event );
 
-    /*
-     * flag the event as canceled by NULLing out the callback handler
-     *
-     * make certain that the event isn't being accessed while
-     * its call back changes
-     */
-    LOCKEVQUE (pevent->ev_que);
+    LOCKEVQUE (que);
 
-    pevent->user_sub = NULL;
+    pevent->user_sub = NULL; /* callback pointer doubles as canceled flag */
 
-    /*
-     * purge this event from the queue
-     *
-     * Its better to take this approach rather than waiting
-     * for the event thread to finish removing this event
-     * from the queue because the event thread will not
-     * process if we are in flow control mode. Since blocking
-     * here will block CA's TCP input queue then a dead lock
-     * would be possible.
-     */
-    for (   getix = pevent->ev_que->getix;
-            pevent->ev_que->evque[getix] != EVENTQEMPTY; ) {
-        if ( pevent->ev_que->evque[getix] == pevent ) {
-            assert ( pevent->ev_que->nCanceled < USHRT_MAX );
-            pevent->ev_que->nCanceled++;
-            event_remove ( pevent->ev_que, getix, &canceledEvent );
-        }
-        getix = RNGINC ( getix );
-        if ( getix == pevent->ev_que->getix ) {
-            break;
-        }
-    }
-    assert ( pevent->npend == 0u );
+    if(pevent->callBackInProgress) {
+        /* this event callback is pending or in-progress in event_task. */
+        if(pevent->ev_que->evUser->taskid != epicsThreadGetIdSelf())
+            sync = 1; /* concurrent to event_task, so wait */
 
-    if ( pevent->ev_que->evUser->taskid == epicsThreadGetIdSelf() ) {
-        pevent->ev_que->evUser->pSuicideEvent = pevent;
-    }
-    else {
-        while ( pevent->callBackInProgress ) {
-            UNLOCKEVQUE (pevent->ev_que);
-            epicsEventMustWait ( pevent->ev_que->evUser->pflush_sem );
-            LOCKEVQUE (pevent->ev_que);
-        }
+    } else if(pevent->npend) {
+        /* some (now defunct) events in the queue, defer free() to event_task */
+
+    } else {
+        /* no other references, cleanup now */
+
+        pevent->ev_que->quota -= EVENTENTRIES;
+        freeListFree ( dbevEventSubscriptionFreeList, pevent );
     }
 
-    pevent->ev_que->quota -= EVENTENTRIES;
+    UNLOCKEVQUE (que);
 
-    UNLOCKEVQUE (pevent->ev_que);
+    if(sync) {
+        /* cycle through worker */
+        struct event_user *evUser = que->evUser;
+        epicsUInt32 curSeq;
+        event_waiter wait;
+        wait.wake = epicsEventCreate(epicsEventEmpty); /* may fail */
 
-    freeListFree ( dbevEventSubscriptionFreeList, pevent );
+        epicsMutexMustLock ( evUser->lock );
+        ellAdd(&evUser->waiters, &wait.node);
+        /* grab current cycle counter, then wait for it to change */
+        curSeq = evUser->pflush_seq;
+        do {
+            epicsMutexUnlock( evUser->lock );
+            /* ensure worker will cycle at least once */
+            epicsEventMustTrigger(evUser->ppendsem);
 
-    return;
+            if(wait.wake) {
+                epicsEventMustWait(wait.wake);
+            } else {
+                epicsThreadSleep(0.01); /* ick. but better than cantProceed() */
+            }
+
+            epicsMutexMustLock ( evUser->lock );
+        } while(curSeq == evUser->pflush_seq);
+        ellDelete(&evUser->waiters, &wait.node);
+        /* destroy under lock to ensure epicsEventMustTrigger() has returned */
+        if(wait.wake)
+            epicsEventDestroy(wait.wake);
+        epicsMutexUnlock( evUser->lock );
+    }
 }
 
 /*
@@ -934,10 +920,7 @@ void db_post_single_event (dbEventSubscription event)
  */
 static int event_read ( struct event_que *ev_que )
 {
-    db_field_log *pfl;
     int notifiedRemaining = 0;
-    void ( *user_sub ) ( void *user_arg, struct dbChannel *chan,
-            int eventsRemaining, db_field_log *pfl );
 
     /*
      * evUser ring buffer must be locked for the multiple
@@ -958,19 +941,7 @@ static int event_read ( struct event_que *ev_que )
     while ( ev_que->evque[ev_que->getix] != EVENTQEMPTY ) {
         struct evSubscrip *pevent = ev_que->evque[ev_que->getix];
         int eventsRemaining;
-
-        pfl = ev_que->valque[ev_que->getix];
-        if ( pevent == &canceledEvent ) {
-            ev_que->evque[ev_que->getix] = EVENTQEMPTY;
-            if (ev_que->valque[ev_que->getix]) {
-                db_delete_field_log(ev_que->valque[ev_que->getix]);
-                ev_que->valque[ev_que->getix] = NULL;
-            }
-            ev_que->getix = RNGINC ( ev_que->getix );
-            assert ( ev_que->nCanceled > 0 );
-            ev_que->nCanceled--;
-            continue;
-        }
+        db_field_log *pfl = ev_que->valque[ev_que->getix];
 
         /*
          * Simple type values queued up for reliable interprocess
@@ -980,13 +951,7 @@ static int event_read ( struct event_que *ev_que )
 
         event_remove ( ev_que, ev_que->getix, EVENTQEMPTY );
         ev_que->getix = RNGINC ( ev_que->getix );
-        eventsRemaining = ev_que->evque[ev_que->getix] != EVENTQEMPTY && !ev_que->nCanceled;
-
-        /*
-         * create a local copy of the call back parameters while
-         * we still have the lock
-         */
-        user_sub = pevent->user_sub;
+        eventsRemaining = ev_que->evque[ev_que->getix] != EVENTQEMPTY;
 
         /*
          * Next event pointer can be used by event tasks to determine
@@ -998,14 +963,12 @@ static int event_read ( struct event_que *ev_que )
          * record lock, and it is calling db_post_events() waiting
          * for the event queue lock (which this thread now has).
          */
-        if ( user_sub ) {
-            /*
-             * This provides a way to test to see if an event is in use
-             * despite the fact that the event queue does not point to
-             * it.
-             */
+        if ( pevent->user_sub ) {
+            EVENTFUNC* user_sub = pevent->user_sub;
             pevent->callBackInProgress = TRUE;
+
             UNLOCKEVQUE (ev_que);
+
             /* Run post-event-queue filter chain */
             if (ellCount(&pevent->chan->post_chain)) {
                 pfl = dbChannelRunPostChain(pevent->chan, pfl);
@@ -1016,27 +979,15 @@ static int event_read ( struct event_que *ev_que )
                                 eventsRemaining, pfl );
                 notifiedRemaining = eventsRemaining;
             }
+
             LOCKEVQUE (ev_que);
 
-            /*
-             * check to see if this event has been canceled each
-             * time that the callBackInProgress flag is set to false
-             * while we have the event queue lock, and post the flush
-             * complete sem if there are no longer any events on the
-             * queue
-             */
-            if ( ev_que->evUser->pSuicideEvent == pevent ) {
-                ev_que->evUser->pSuicideEvent = NULL;
-            }
-            else {
-                if ( pevent->user_sub==NULL && pevent->npend==0u ) {
-                    pevent->callBackInProgress = FALSE;
-                    epicsEventSignal ( ev_que->evUser->pflush_sem );
-                }
-                else {
-                    pevent->callBackInProgress = FALSE;
-                }
-            }
+            pevent->callBackInProgress = FALSE;
+        }
+        /* callback may have called db_cancel_event(), so must check user_sub again */
+        if(!pevent->user_sub && !pevent->npend) {
+            pevent->ev_que->quota -= EVENTENTRIES;
+            freeListFree ( dbevEventSubscriptionFreeList, pevent );
         }
         db_delete_field_log(pfl);
     }
@@ -1051,9 +1002,6 @@ static int event_read ( struct event_que *ev_que )
     return DB_EVENT_OK;
 }
 
-/*
- * EVENT_TASK()
- */
 static void event_task (void *pParm)
 {
     struct event_user * const evUser = (struct event_user *) pParm;
@@ -1094,13 +1042,25 @@ static void event_task (void *pParm)
         }
         evUser->extraLaborBusy = FALSE;
 
-        for ( ev_que = &evUser->firstque; ev_que;
-                ev_que = ev_que->nextque ) {
+        for ( ev_que = &evUser->firstque; ev_que; ev_que = ev_que->nextque ) {
+            /* unlock during iteration is safe as event_que will not be free'd */
             epicsMutexUnlock ( evUser->lock );
             event_read (ev_que);
             epicsMutexMustLock ( evUser->lock );
         }
         pendexit = evUser->pendexit;
+
+        evUser->pflush_seq++;
+        if(ellCount(&evUser->waiters)) {
+            /* hold lock throughout to avoid race between event trigger and destroy */
+            ELLNODE *cur;
+            for(cur = ellFirst(&evUser->waiters); cur; cur = ellNext(cur)) {
+                event_waiter *w = CONTAINER(cur, event_waiter, node);
+                if(w->wake)
+                    epicsEventMustTrigger(w->wake);
+            }
+        }
+
         epicsMutexUnlock ( evUser->lock );
 
     } while( ! pendexit );

modules/database/src/ioc/db/dbLink.h

@@ -359,6 +359,8 @@ typedef struct lset {
      * @param   plink   the link
      * @param   rtn     routine to execute
      * @returns status value
+     *
+     * @since 3.16.1
      */
     long (*doLocked)(struct link *plink, dbLinkUserCallback rtn, void *priv);
 

modules/database/src/ioc/db/dbLock.c

@@ -869,7 +869,7 @@ nosplit:
     }
 }
 
-static char *msstring[4]={"NMS","MS","MSI","MSS"};
+static const char *msstring[4]={"NMS","MS","MSI","MSS"};
 
 long dblsr(char *recordname,int level)
 {

modules/database/src/ioc/db/dbLock.h

@@ -24,18 +24,64 @@ extern "C" {
 
 struct dbCommon;
 struct dbBase;
+/** @brief Lock multiple records.
+ *
+ * A dbLocker allows a caller to simultaneously lock multiple records.
+ * The list of records is provided to dbLockerAlloc().
+ * And the resulting dbLocker can be locked/unlocked repeatedly.
+ *
+ * Each thread can only lock one dbLocker at a time.
+ * While locked, dbScanLock() may be called only on those records
+ * included in the dbLocker.
+ *
+ * @since 3.16.0.1
+ */
+struct dbLocker;
 typedef struct dbLocker dbLocker;
 
+/** @brief Lock a record for modification.
+ *
+ *  While locked, caller may access record using eg. dbGet() or dbPut(),
+ *  but not dbGetField() or dbPutField().
+ *  The caller must later call dbScanUnlock().
+ *  dbScanLock() may be called again as the record lock behaves as a recursive mutex.
+ */
 DBCORE_API void dbScanLock(struct dbCommon *precord);
+/** @brief Unlock a record.
+ *
+ *  Reverse the action of dbScanLock()
+ */
 DBCORE_API void dbScanUnlock(struct dbCommon *precord);
 
+/** @brief Prepare to lock a set of records.
+ * @param precs Array of nrecs dbCommon pointers.
+ * @param nrecs Length of precs array
+ * @param flags Set to 0
+ * @return NULL on error
+ * @since 3.16.0.1
+ */
 DBCORE_API dbLocker *dbLockerAlloc(struct dbCommon * const *precs,
                                        size_t nrecs,
                                        unsigned int flags);
 
-DBCORE_API void dbLockerFree(dbLocker *);
+/** @brief Free dbLocker allocated by dbLockerAlloc()
+ * @param plocker Must not be NULL
+ * @since 3.16.0.1
+ */
+DBCORE_API void dbLockerFree(dbLocker *plocker);
 
+/** @brief Lock all records of dbLocker
+ *
+ * While locked, caller may access any associated record passed to dbLockerAlloc() .
+ * dbScanLockMany() may not be called again (multi-lock is not recursive).
+ * dbScanLock()/dbScanUnlock() may be called on individual record.
+ * The caller must later call dbScanUnlockMany().
+ * @since 3.16.0.1
+ */
 DBCORE_API void dbScanLockMany(dbLocker*);
+/** @brief Unlock all records of dbLocker
+ * @since 3.16.0.1
+ */
 DBCORE_API void dbScanUnlockMany(dbLocker*);
 
 DBCORE_API unsigned long dbLockGetLockId(

modules/database/src/ioc/db/dbLockPvt.h

@@ -10,6 +10,7 @@
 #define DBLOCKPVT_H
 
 #include "dbLock.h"
+#include "epicsMutex.h"
 #include "epicsSpin.h"
 
 /* Define to enable additional error checking */

modules/database/src/ioc/db/dbUnitTest.c

@@ -50,6 +50,7 @@ void testdbPrepare(void)
 {
     if(!testEvtLock)
         testEvtLock = epicsMutexMustCreate();
+    initHookAnnounce(initHookAfterPrepareDatabase);
 }
 
 void testdbReadDatabase(const char* file,
@@ -94,6 +95,7 @@ void testIocShutdownOk(void)
 
 void testdbCleanup(void)
 {
+    initHookAnnounce(initHookBeforeCleanupDatabase);
     dbFreeBase(pdbbase);
     db_cleanup_events();
     initHookFree();

modules/database/src/ioc/dbStatic/dbBase.h

@@ -118,6 +118,10 @@ typedef struct dbRecordNode {
     char            *recordname;
     ELLLIST         infoList;       /*LIST head of info nodes*/
     int             flags;
+    /** Parse order of this record()
+     *  @since 7.0.8.1
+     */
+    unsigned        order;
     struct dbRecordNode *aliasedRecnode; /* NULL unless flags|DBRN_FLAGS_ISALIAS */
 }dbRecordNode;
 
@@ -184,5 +188,9 @@ typedef struct dbBase {
     struct gphPvt   *pgpHash;
     short           ignoreMissingMenus;
     short           loadCdefs;
+    /** Total number of records.
+     *  @since 7.0.8.1
+     */
+    unsigned        no_records;
 }dbBase;
 #endif

modules/database/src/ioc/dbStatic/dbLexRoutines.c

@@ -247,23 +247,23 @@ static long dbReadCOM(DBBASE **ppdbbase,const char *filename, FILE *fp,
     }
     my_buffer = dbCalloc(MY_BUFFER_SIZE,sizeof(char));
     freeListInitPvt(&freeListPvt,sizeof(tempListNode),100);
-    if(substitutions) {
-        if(macCreateHandle(&macHandle,NULL)) {
-            epicsPrintf("macCreateHandle error\n");
-            status = -1;
-            goto cleanup;
-        }
-        macParseDefns(macHandle,(char *)substitutions,&macPairs);
-        if(macPairs ==NULL) {
-            macDeleteHandle(macHandle);
-            macHandle = NULL;
-        } else {
-            macInstallMacros(macHandle,macPairs);
-            free((void *)macPairs);
-            mac_input_buffer = dbCalloc(MY_BUFFER_SIZE,sizeof(char));
-        }
-        macSuppressWarning(macHandle,dbQuietMacroWarnings);
+    if (substitutions == NULL)
+        substitutions = "";
+    if(macCreateHandle(&macHandle,NULL)) {
+        epicsPrintf("macCreateHandle error\n");
+        status = -1;
+        goto cleanup;
     }
+    macParseDefns(macHandle,substitutions,&macPairs);
+    if(macPairs == NULL) {
+        macDeleteHandle(macHandle);
+        macHandle = NULL;
+    } else {
+        macInstallMacros(macHandle,macPairs);
+        free(macPairs);
+        mac_input_buffer = dbCalloc(MY_BUFFER_SIZE,sizeof(char));
+    }
+    macSuppressWarning(macHandle,dbQuietMacroWarnings);
     pinputFile = dbCalloc(1,sizeof(inputFile));
     if (filename) {
         pinputFile->filename = macEnvExpand(filename);
@@ -1068,7 +1068,7 @@ int dbRecordNameValidate(const char *name)
     const char *pos = name;
 
     if (!*name) {
-        yyerrorAbort("Error: Record/Alias name can't be empty");
+        yyerrorAbort(ERL_ERROR ": Record/Alias name can't be empty");
         return 1;
     }
 
@@ -1086,7 +1086,7 @@ int dbRecordNameValidate(const char *name)
                          name, c);
 
         } else if(c==' ' || c=='\t' || c=='"' || c=='\'' || c=='.' || c=='$') {
-            epicsPrintf("Error: Bad character '%c' in Record/Alias name \"%s\"\n",
+            epicsPrintf(ERL_ERROR ": Bad character '%c' in Record/Alias name \"%s\"\n",
                 c, name);
             yyerrorAbort(NULL);
             return 1;
@@ -1110,14 +1110,10 @@ static void dbRecordHead(char *recordType, char *name, int visible)
     allocTemp(pdbentry);
 
     if (recordType[0] == '*' && recordType[1] == 0) {
-        if (dbRecordsOnceOnly)
-            epicsPrintf("Record-type \"*\" not valid with dbRecordsOnceOnly\n");
-        else {
-            status = dbFindRecord(pdbentry, name);
-            if (status == 0)
-                return; /* done */
-            epicsPrintf("Record \"%s\" not found\n", name);
-        }
+        status = dbFindRecord(pdbentry, name);
+        if (status == 0)
+            return; /* done */
+        epicsPrintf(ERL_ERROR ": Record \"%s\" not found\n", name);
         yyerror(NULL);
         duplicate = TRUE;
         return;
@@ -1136,15 +1132,16 @@ static void dbRecordHead(char *recordType, char *name, int visible)
     status = dbCreateRecord(pdbentry,name);
     if (status == S_dbLib_recExists) {
         if (strcmp(recordType, dbGetRecordTypeName(pdbentry)) != 0) {
-            epicsPrintf("Record \"%s\" of type \"%s\" redefined with new type "
+            epicsPrintf(ERL_ERROR ": Record \"%s\" of type \"%s\" redefined with new type "
                 "\"%s\"\n", name, dbGetRecordTypeName(pdbentry), recordType);
             yyerror(NULL);
             duplicate = TRUE;
             return;
         }
         else if (dbRecordsOnceOnly) {
-            epicsPrintf("Record \"%s\" already defined (dbRecordsOnceOnly is "
-                "set)\n", name);
+            epicsPrintf(ERL_ERROR ": Record \"%s\" already defined and dbRecordsOnceOnly set.\n"
+                        "Used record type \"*\" to append.\n",
+                name);
             yyerror(NULL);
             duplicate = TRUE;
         }
@@ -1170,8 +1167,28 @@ static void dbRecordField(char *name,char *value)
     pdbentry = ptempListNode->item;
     status = dbFindField(pdbentry,name);
     if (status) {
-        epicsPrintf("Record \"%s\" does not have a field \"%s\"\n",
-            dbGetRecordName(pdbentry), name);
+        epicsPrintf("%s Record \"%s\" does not have a field \"%s\"\n",
+                    dbGetRecordTypeName(pdbentry), dbGetRecordName(pdbentry), name);
+        if(dbGetRecordName(pdbentry)) {
+            DBENTRY temp;
+            double bestSim = -1.0;
+            const dbFldDes *bestFld = NULL;
+            dbCopyEntryContents(pdbentry, &temp);
+            for(status = dbFirstField(&temp, 0); !status; status = dbNextField(&temp, 0)) {
+                double sim = epicsStrSimilarity(name, temp.pflddes->name);
+                if(!bestFld || sim > bestSim) {
+                    bestSim = sim;
+                    bestFld = temp.pflddes;
+                }
+            }
+            dbFinishEntry(&temp);
+            if(bestSim>0.0) {
+                epicsPrintf("    Did you mean \"%s\"?", bestFld->name);
+                if(bestFld->prompt)
+                    epicsPrintf("  (%s)", bestFld->prompt);
+                epicsPrintf("\n");
+            }
+        }
         yyerror(NULL);
         return;
     }

modules/database/src/ioc/dbStatic/dbStaticIocRegister.c

@@ -10,6 +10,7 @@
 
 #include "iocsh.h"
 #include "errSymTbl.h"
+#include "errlog.h"
 
 #include "dbStaticIocRegister.h"
 #include "dbStaticLib.h"
@@ -254,7 +255,7 @@ static void dbCreateAliasCallFunc(const iocshArgBuf *args)
     }
     dbFinishEntry(&ent);
     if(status) {
-        fprintf(stderr, "Error: %ld %s\n", status, errSymMsg(status));
+        fprintf(stderr, ERL_ERROR ": %ld %s\n", status, errSymMsg(status));
         iocshSetError(1);
     }
 }

modules/database/src/ioc/dbStatic/dbStaticLib.c

@@ -57,10 +57,10 @@ static char *pNullString = "";
  */
 STATIC_ASSERT(messagesize >= 21);
 
-static char *ppstring[5]={" NPP"," PP"," CA"," CP"," CPP"};
-static char *msstring[4]={" NMS"," MS"," MSI"," MSS"};
+static const char *ppstring[5]={" NPP"," PP"," CA"," CP"," CPP"};
+static const char *msstring[4]={" NMS"," MS"," MSI"," MSS"};
 
-maplinkType pamaplinkType[LINK_NTYPES] = {
+const maplinkType pamaplinkType[LINK_NTYPES] = {
     {"CONSTANT",CONSTANT},
     {"PV_LINK",PV_LINK},
     {"VME_IO",VME_IO},
@@ -89,7 +89,7 @@ static FILE *openOutstream(const char *filename)
     errno = 0;
     stream = fopen(filename,"w");
     if(!stream) {
-        fprintf(stderr,"error opening %s %s\n",filename,strerror(errno));
+        fprintf(stderr,ERL_ERROR " opening %s %s\n",filename,strerror(errno));
         return 0;
     }
     return stream;
@@ -637,7 +637,7 @@ void dbFinishEntry(DBENTRY *pdbentry)
     }
 }
 
-DBENTRY * dbCopyEntry(DBENTRY *pdbentry)
+DBENTRY * dbCopyEntry(const DBENTRY *pdbentry)
 {
     DBENTRY *pnew;
 
@@ -647,7 +647,7 @@ DBENTRY * dbCopyEntry(DBENTRY *pdbentry)
     return(pnew);
 }
 
-void dbCopyEntryContents(DBENTRY *pfrom,DBENTRY *pto)
+void dbCopyEntryContents(const DBENTRY *pfrom,DBENTRY *pto)
 {
     *pto = *pfrom;
     pto->message = NULL;
@@ -1445,6 +1445,7 @@ long dbCreateRecord(DBENTRY *pdbentry,const char *precordName)
     pdbentry->precnode = pNewRecNode;
     ppvd = dbPvdAdd(pdbentry->pdbbase,precordType,pNewRecNode);
     if(!ppvd) {errMessage(-1,"Logic Err: Could not add to PVD");return(-1);}
+    pNewRecNode->order = pdbentry->pdbbase->no_records++;
     return(0);
 }
 
@@ -1686,6 +1687,7 @@ long dbCreateAlias(DBENTRY *pdbentry, const char *alias)
     }
 
     ellAdd(&precordType->recList, &pnewnode->node);
+    pnewnode->order = pdbentry->pdbbase->no_records++;
     precordType->no_aliases++;
 
     return 0;
@@ -2204,11 +2206,11 @@ long dbInitRecordLinks(dbRecordType *rtyp, struct dbCommon *prec)
              */
 
         } else if(dbCanSetLink(plink, &link_info, devsup)!=0) {
-            errlogPrintf("Error: %s.%s: can't initialize link type %d with \"%s\" (type %d)\n",
+            errlogPrintf(ERL_ERROR ": %s.%s: can't initialize link type %d with \"%s\" (type %d)\n",
                          prec->name, pflddes->name, plink->type, plink->text, link_info.ltype);
 
         } else if(dbSetLink(plink, &link_info, devsup)) {
-            errlogPrintf("Error: %s.%s: failed to initialize link type %d with \"%s\" (type %d)\n",
+            errlogPrintf(ERL_ERROR ": %s.%s: failed to initialize link type %d with \"%s\" (type %d)\n",
                          prec->name, pflddes->name, plink->type, plink->text, link_info.ltype);
         }
         free(plink->text);

modules/database/src/ioc/dbStatic/dbStaticLib.h

@@ -51,9 +51,9 @@ DBCORE_API void dbInitEntry(DBBASE *pdbbase,
     DBENTRY *pdbentry);
 
 DBCORE_API void dbFinishEntry(DBENTRY *pdbentry);
-DBCORE_API DBENTRY * dbCopyEntry(DBENTRY *pdbentry);
-DBCORE_API void dbCopyEntryContents(DBENTRY *pfrom,
-    DBENTRY *pto);
+DBCORE_API DBENTRY * dbCopyEntry(const DBENTRY *pdbentry);
+DBCORE_API void dbCopyEntryContents(const DBENTRY *pfrom,
+                                    DBENTRY *pto);
 
 DBCORE_API extern int dbBptNotMonotonic;
 

modules/database/src/ioc/dbStatic/dbStaticRun.c

@@ -143,7 +143,7 @@ long dbAllocRecord(DBENTRY *pdbentry,const char *precordName)
 
                 status = dbPutStringNum(pdbentry,pflddes->initial);
                 if(status)
-                    epicsPrintf("Error initializing %s.%s initial %s\n",
+                    epicsPrintf(ERL_ERROR " initializing %s.%s initial %s\n",
                                 pdbRecordType->name,pflddes->name,pflddes->initial);
             }
             break;

modules/database/src/ioc/dbStatic/dbYacc.y

@@ -370,9 +370,9 @@ json_value: jsonNULL    { $$ = dbmfStrdup("null"); }
 static int yyerror(char *str)
 {
     if (str)
-        epicsPrintf("Error: %s\n", str);
+        epicsPrintf(ERL_ERROR ": %s\n", str);
     else
-        epicsPrintf("Error");
+        epicsPrintf(ERL_ERROR "");
     if (!yyFailed) {    /* Only print this stuff once */
         epicsPrintf(" at or before '%s'", yytext);
         dbIncludePrint();

modules/database/src/ioc/dbStatic/link.h

@@ -43,11 +43,11 @@ extern "C" {
 #define VXI_IO          15
 #define LINK_NTYPES 16
 typedef struct maplinkType {
-    char *strvalue;
+    const char *strvalue;
     int  value;
 } maplinkType;
 
-DBCORE_API extern maplinkType pamaplinkType[];
+DBCORE_API extern const maplinkType pamaplinkType[LINK_NTYPES];
 
 #define VXIDYNAMIC      0
 #define VXISTATIC       1
@@ -193,7 +193,7 @@ struct lset;
 struct link {
     struct dbCommon *precord;   /* Pointer to record owning link */
     short type;
-    short flags;
+    unsigned short flags;
     struct lset *lset;
     char *text;             /* Raw link text */
     union value value;

modules/database/src/ioc/dbtemplate/dbLoadTemplate.y

@@ -16,6 +16,7 @@
 #include "osiUnistd.h"
 #include "macLib.h"
 #include "dbmf.h"
+#include "errlog.h"
 
 #include "epicsExport.h"
 #include "dbAccess.h"
@@ -337,7 +338,7 @@ int dbLoadTemplate(const char *sub_file, const char *cmd_collect)
 
     if (dbTemplateMaxVars < 1)
     {
-        fprintf(stderr,"Error: dbTemplateMaxVars = %d, must be +ve\n",
+        fprintf(stderr,ERL_ERROR ": dbTemplateMaxVars = %d, must be +ve\n",
                 dbTemplateMaxVars);
         return -1;
     }

modules/database/src/ioc/dbtemplate/msi.cpp

@@ -264,7 +264,7 @@ static void addMacroReplacements(MAC_HANDLE * const macPvt,
     if (status) {
         status = macInstallMacros(macPvt, pairs);
         if (!status) {
-            fprintf(stderr, "Error from macInstallMacros\n");
+            fprintf(stderr, ERL_ERROR " from macInstallMacros\n");
             usageExit(1);
         }
         free(pairs);
@@ -522,7 +522,7 @@ static void inputOpenFile(inputData *pinputData, const char * const filename)
     }
 
     if (!fp) {
-        fprintf(stderr, "msi: Can't open file '%s'\n", filename);
+        fprintf(stderr, ERL_ERROR " msi: Can't open file '%s'\n", filename);
         inputErrPrint(pinputData);
         abortExit(1);
     }
@@ -672,7 +672,7 @@ static void substituteOpen(subInfo **ppvt, const std::string& substitutionName)
 
     fp = fopen(substitutionName.c_str(), "r");
     if (!fp) {
-        fprintf(stderr, "msi: Can't open file '%s'\n", substitutionName.c_str());
+        fprintf(stderr, ERL_ERROR " msi: Can't open file '%s'\n", substitutionName.c_str());
         abortExit(1);
     }
 

modules/database/src/ioc/misc/iocInit.c

@@ -173,7 +173,7 @@ static int iocBuild_2(void)
 
     scanInit();
     if (asInit()) {
-        errlogPrintf("iocBuild: asInit Failed.\n");
+        errlogPrintf(ERL_ERROR " iocBuild: asInit Failed.\n");
         return -1;
     }
     dbProcessNotifyInit();

modules/database/src/ioc/misc/registerAllRecordDeviceDrivers.cpp

@@ -17,6 +17,7 @@
 
 #include <epicsStdio.h>
 #include <epicsFindSymbol.h>
+#include <errlog.h>
 #include <registryRecordType.h>
 #include <registryDeviceSupport.h>
 #include <registryDriverSupport.h>
@@ -248,7 +249,7 @@ registerAllRecordDeviceDrivers(DBBASE *pdbbase)
 
     } catch(std::exception& e) {
         dbFinishEntry(&entry);
-        fprintf(stderr, "Error: %s\n", e.what());
+        fprintf(stderr, ERL_ERROR ": %s\n", e.what());
         return 2;
     }
 }

modules/database/src/ioc/rsrv/caservertask.c

@@ -120,6 +120,11 @@ static void req_server (void *pParm)
             }
         }
     }
+
+    /* ATM never reached, just a placeholder */
+    cantProceed("Unreachable.  Perpetual thread.");
+
+    taskwdRemove(0);
 }
 
 static
@@ -748,6 +753,7 @@ void rsrv_init (void)
         if(!havesometcp)
             cantProceed("CAS: No TCP server started\n");
     }
+    free(socks);
 
     /* servers list is considered read-only from this point */
 

modules/database/src/ioc/rsrv/online_notify.c

@@ -129,7 +129,11 @@ void rsrv_online_notify_task(void *pParm)
         }
     }
 
+    /* ATM never reached, just a placeholder */
+    cantProceed("Unreachable.  Perpetual thread.");
+
     free(lastError);
+    taskwdRemove(0);
 }
 
 

modules/database/src/std/dev/devBiSoftRaw.c

@@ -51,6 +51,9 @@ static long readLocked(struct link *pinp, void *dummy)
 
     if (status) return status;
 
+    if (prec->mask)
+        prec->rval &= prec->mask;
+
     if (dbLinkIsConstant(&prec->tsel) &&
         prec->tse == epicsTimeEventDeviceTime)
         dbGetTimeStamp(pinp, &prec->time);

modules/database/src/std/rec/biRecord.dbd.pod

@@ -60,8 +60,10 @@ this chapter for information on soft device support.
 
 If the record gets its values from hardware or uses the C<Raw Soft Channel>
 device support, the device support routines place the value in the RVAL
-field which is then converted using the process described in the next
-section.
+field.
+(Since 7.0.8) If the MASK field is non-zero, then this MASK is applied to RVAL.
+The value from RVAL is then converted using the process described in the
+next section.
 
 =fields INP, DTYP, ZNAM, ONAM, RVAL, VAL
 

modules/database/src/std/rec/calcRecord.dbd.pod

@@ -158,7 +158,7 @@ CEIL: Ceiling (unary)
 FLOOR: Floor (unary)
 
 =item *
-FMOD: Floating point modulo (binary)  Added in UNRELEASED
+FMOD: Floating point modulo (binary)  Added in 7.0.8
 
 =item *
 LOG: Log base 10 (unary)

modules/database/src/std/rec/calcoutRecord.dbd.pod

@@ -184,7 +184,7 @@ CEIL: Ceiling (unary)
 FLOOR: Floor (unary)
 
 =item *
-FMOD: Floating point modulo (binary)  Added in UNRELEASED
+FMOD: Floating point modulo (binary)  Added in 7.0.8
 
 =item *
 LOG: Log base 10 (unary)
@@ -1160,7 +1160,7 @@ See next section.
 
 =head2 C<special>
 
-This is called id CALC or OCAL is changed. C<special> calls postfix.
+This is called if CALC or OCAL is changed. C<special> calls postfix.
 
 =head2 C<get_units>
 

modules/database/src/std/rec/compressRecord.c

@@ -149,13 +149,16 @@ static int compare(const void *arg1, const void *arg2)
     else               return  1;
 }
 
+#define min(a, b) ((a) < (b) ? (a) : (b))
+
 static int compress_array(compressRecord *prec,
     double *psource, int no_elements)
 {
-    epicsInt32 i,j;
+    epicsInt32 j;
     epicsInt32 n, nnew;
     epicsInt32 nsam = prec->nsam;
-    double value;
+    epicsUInt32 samples_written = 0;
+    double value = 0.0;
 
     /* skip out of limit data */
     if (prec->ilil < prec->ihil) {
@@ -167,61 +170,54 @@ static int compress_array(compressRecord *prec,
     }
     if (prec->n <= 0)
         prec->n = 1;
-    if (no_elements < prec->n && prec->pbuf != menuYesNoYES)
-        return 1; /*dont do anything*/
-    n = no_elements;
+    n = prec->n;
 
-    /* determine number of samples to take */
-    if (no_elements < nsam * n)
-        nnew = (no_elements / n);
-    else nnew = nsam;
+    nnew = min(no_elements, nsam * n);
 
-    /* compress according to specified algorithm */
-    switch (prec->alg){
-    case compressALG_N_to_1_Low_Value:
-        /* compress N to 1 keeping the lowest value */
-        for (i = 0; i < nnew; i++) {
+    while (nnew > 0)
+    {
+        if (nnew < n && prec->pbuf != menuYesNoYES)
+            break;
+
+        n = min(n, nnew);
+        switch (prec->alg)
+        {
+        case compressALG_N_to_1_Low_Value:
             value = *psource++;
-            for (j = 1; j < n; j++, psource++) {
+            for (j = 1; j < n; j++, psource++)
+            {
                 if (value > *psource)
                     value = *psource;
             }
-            put_value(prec, &value, 1);
-        }
-        break;
-    case compressALG_N_to_1_High_Value:
-        /* compress N to 1 keeping the highest value */
-        for (i = 0; i < nnew; i++){
+            break;
+        case compressALG_N_to_1_High_Value:
             value = *psource++;
-            for (j = 1; j < n; j++, psource++) {
+            for (j = 1; j < n; j++, psource++)
+            {
                 if (value < *psource)
                     value = *psource;
             }
-            put_value(prec, &value, 1);
-        }
-        break;
-    case compressALG_N_to_1_Average:
-        /* compress N to 1 keeping the average value */
-        for (i = 0; i < nnew; i++) {
-            value = 0;
-            for (j = 0; j < n; j++, psource++)
+            break;
+        case compressALG_N_to_1_Average:
+            value = *psource++;
+            for (j = 1; j < n; j++, psource++)
+            {
                 value += *psource;
-            value /= n;
-            put_value(prec, &value, 1);
-        }
-        break;
-
-    case compressALG_N_to_1_Median:
-        /* compress N to 1 keeping the median value */
-        /* note: sorts source array (OK; it's a work pointer) */
-        for (i = 0; i < nnew; i++, psource += nnew) {
+            }
+            value = value / n;
+            break;
+        case compressALG_N_to_1_Median:
+            /* note: sorts source array (OK; it's a work pointer) */
             qsort(psource, n, sizeof(double), compare);
             value = psource[n / 2];
-            put_value(prec, &value, 1);
+            psource += n;
+            break;
         }
-        break;
+        nnew -= n;
+        put_value(prec, &value, 1);
+        samples_written++;
     }
-    return 0;
+    return (samples_written == 0);
 }
 
 static int array_average(compressRecord *prec,

modules/database/src/std/rec/histogramRecord.dbd.pod

@@ -91,10 +91,10 @@ The BPTR field contains a pointer to the unsigned long array of frequency
 values. The VAL field references this array as well. However, the BPTR field is
 not accessible at run-time.
 
-The MCNT field keeps counts the number of signal counts since the last monitor
+The MCNT field keeps the number of signal counts since the last monitor
 was invoked.
 
-The collections controls field (CMD) is a menu field with five choices:
+The collections controls field (CMD) is a menu field with four choices:
 
 =menu histogramCMD
 
@@ -110,8 +110,6 @@ array. Unlike C<Read>, it doesn't clear the array first.
 
 The C<Stop> command disables the reading of signal values into the array.
 
-The C<Setup> command waits until the C<start> or C<read> command has been issued
-to start counting.
 
 The CSTA or collections status field implements the CMD field choices by
 enabling or disabling the reading of values into the histogram array. While

modules/database/src/std/rec/longoutRecord.dbd.pod

@@ -85,7 +85,7 @@ for information on the format of hardware addresses and database links.
 
 =head4 Menu longoutOOPT
 
-The OOPT field was added in EPICS UNRELEASED.
+The OOPT field was added in EPICS 7.0.8.
 
 It determines the condition that causes the output link to be
 written to. It's a menu field that has six choices:
@@ -119,7 +119,7 @@ VAL is non-zero and last value was zero.
 
 =head4 Changes in OUT field when OOPT = On Change
 
-The OOCH field was added in EPICS UNRELEASED.
+The OOCH field was added in EPICS 7.0.8.
 
 If OOCH is C<YES> (its default value) and the OOPT field is C<On Change>,
 the record will write to the device support the first time the record gets

modules/database/src/std/rec/lsiRecord.c

@@ -49,6 +49,9 @@ static long init_record(struct dbCommon *pcommon, int pass)
         if (sizv < 16) {
             sizv = 16;  /* Enforce a minimum size for the VAL field */
             prec->sizv = sizv;
+        } else if (sizv > 0x7fff) {
+            sizv = 0x7fff;  /* SIZV is unsigned, but dbAddr::field_size is signed */
+            prec->sizv = sizv;
         }
 
         prec->val = callocMustSucceed(1, sizv, "lsi::init_record");

modules/database/src/std/rec/lsiRecord.dbd.pod

@@ -9,7 +9,7 @@
 =title Long String Input Record (lsi)
 
 The long string input record is used to retrieve an arbitrary ASCII string with
-a maximum length of 65535 characters.
+a maximum length of 32767 characters.
 
 This record type was included in base.dbd beginning with epics-base 3.15.0.2 .
 
@@ -36,7 +36,7 @@ from. It can be a database or channel access link, or a constant. If constant,
 the VAL field is initialized with the constant and can be changed via dbPuts.
 Otherwise, the string is read from the specified location each time the record
 is processed and placed in the VAL field. The maximum number of characters in
-VAL is given by SIZV, and cannot be larger than 65535. In addition, the
+VAL is given by SIZV, and cannot be larger than 32767. In addition, the
 appropriate device support module must be entered into the DTYP field.
 
 =fields VAL, OVAL, SIZV, INP, DTYP

modules/database/src/std/rec/lsoRecord.c

@@ -53,6 +53,9 @@ static long init_record(struct dbCommon *pcommon, int pass)
         if (sizv < 16) {
             sizv = 16;  /* Enforce a minimum size for the VAL field */
             prec->sizv = sizv;
+        } else if (sizv > 0x7fff) {
+            sizv = 0x7fff;  /* SIZV is unsigned, but dbAddr::field_size is signed */
+            prec->sizv = sizv;
         }
 
         prec->val = callocMustSucceed(1, sizv, "lso::init_record");

modules/database/src/std/rec/lsoRecord.dbd.pod

@@ -9,7 +9,7 @@
 =title Long String Output Record (lso)
 
 The long string output record is used to write an arbitrary ASCII string with a
-maximum length of 65535 characters.
+maximum length of 32767 characters.
 
 This record type was included in base.dbd beginning with epics-base 3.15.0.2 .
 
@@ -41,7 +41,7 @@ C<supervisory> is specified, DOL is ignored, the current value of VAL is
 written, and VAL can be changed externally via dbPuts at run-time.
 
 The maximum number of characters in VAL is given by SIZV, and cannot be larger
-than 65535.
+than 32767.
 
 DOL can also be a constant instead of a link, in which case VAL is initialized
 to the constant value. Most simple string constants are likely to be interpreted

modules/database/src/std/rec/mbboDirectRecord.dbd.pod

@@ -322,6 +322,7 @@ to alarms that are common to all record types.
     field(B0,DBF_UCHAR) {
         prompt("Bit 0")
         promptgroup("51 - Output 0-7")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -329,6 +330,7 @@ to alarms that are common to all record types.
     field(B1,DBF_UCHAR) {
         prompt("Bit 1")
         promptgroup("51 - Output 0-7")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -336,6 +338,7 @@ to alarms that are common to all record types.
     field(B2,DBF_UCHAR) {
         prompt("Bit 2")
         promptgroup("51 - Output 0-7")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -343,6 +346,7 @@ to alarms that are common to all record types.
     field(B3,DBF_UCHAR) {
         prompt("Bit 3")
         promptgroup("51 - Output 0-7")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -350,6 +354,7 @@ to alarms that are common to all record types.
     field(B4,DBF_UCHAR) {
         prompt("Bit 4")
         promptgroup("51 - Output 0-7")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -357,6 +362,7 @@ to alarms that are common to all record types.
     field(B5,DBF_UCHAR) {
         prompt("Bit 5")
         promptgroup("51 - Output 0-7")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -364,6 +370,7 @@ to alarms that are common to all record types.
     field(B6,DBF_UCHAR) {
         prompt("Bit 6")
         promptgroup("51 - Output 0-7")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -371,6 +378,7 @@ to alarms that are common to all record types.
     field(B7,DBF_UCHAR) {
         prompt("Bit 7")
         promptgroup("51 - Output 0-7")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -378,6 +386,7 @@ to alarms that are common to all record types.
     field(B8,DBF_UCHAR) {
         prompt("Bit 8")
         promptgroup("52 - Output 8-15")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -385,6 +394,7 @@ to alarms that are common to all record types.
     field(B9,DBF_UCHAR) {
         prompt("Bit 9")
         promptgroup("52 - Output 8-15")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -392,6 +402,7 @@ to alarms that are common to all record types.
     field(BA,DBF_UCHAR) {
         prompt("Bit 10")
         promptgroup("52 - Output 8-15")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -399,6 +410,7 @@ to alarms that are common to all record types.
     field(BB,DBF_UCHAR) {
         prompt("Bit 11")
         promptgroup("52 - Output 8-15")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -406,6 +418,7 @@ to alarms that are common to all record types.
     field(BC,DBF_UCHAR) {
         prompt("Bit 12")
         promptgroup("52 - Output 8-15")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -413,6 +426,7 @@ to alarms that are common to all record types.
     field(BD,DBF_UCHAR) {
         prompt("Bit 13")
         promptgroup("52 - Output 8-15")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -420,6 +434,7 @@ to alarms that are common to all record types.
     field(BE,DBF_UCHAR) {
         prompt("Bit 14")
         promptgroup("52 - Output 8-15")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -427,6 +442,7 @@ to alarms that are common to all record types.
     field(BF,DBF_UCHAR) {
         prompt("Bit 15")
         promptgroup("52 - Output 8-15")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -434,6 +450,7 @@ to alarms that are common to all record types.
     field(B10,DBF_UCHAR) {
         prompt("Bit 16")
         promptgroup("53 - Output 16-23")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -441,6 +458,7 @@ to alarms that are common to all record types.
     field(B11,DBF_UCHAR) {
         prompt("Bit 17")
         promptgroup("53 - Output 16-23")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -448,6 +466,7 @@ to alarms that are common to all record types.
     field(B12,DBF_UCHAR) {
         prompt("Bit 18")
         promptgroup("53 - Output 16-23")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -455,6 +474,7 @@ to alarms that are common to all record types.
     field(B13,DBF_UCHAR) {
         prompt("Bit 19")
         promptgroup("53 - Output 16-23")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -462,6 +482,7 @@ to alarms that are common to all record types.
     field(B14,DBF_UCHAR) {
         prompt("Bit 20")
         promptgroup("53 - Output 16-23")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -469,6 +490,7 @@ to alarms that are common to all record types.
     field(B15,DBF_UCHAR) {
         prompt("Bit 21")
         promptgroup("53 - Output 16-23")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -476,6 +498,7 @@ to alarms that are common to all record types.
     field(B16,DBF_UCHAR) {
         prompt("Bit 22")
         promptgroup("53 - Output 16-23")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -483,6 +506,7 @@ to alarms that are common to all record types.
     field(B17,DBF_UCHAR) {
         prompt("Bit 23")
         promptgroup("53 - Output 16-23")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -490,6 +514,7 @@ to alarms that are common to all record types.
     field(B18,DBF_UCHAR) {
         prompt("Bit 24")
         promptgroup("54 - Output 24-31")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -497,6 +522,7 @@ to alarms that are common to all record types.
     field(B19,DBF_UCHAR) {
         prompt("Bit 25")
         promptgroup("54 - Output 24-31")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -504,6 +530,7 @@ to alarms that are common to all record types.
     field(B1A,DBF_UCHAR) {
         prompt("Bit 26")
         promptgroup("54 - Output 24-31")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -511,6 +538,7 @@ to alarms that are common to all record types.
     field(B1B,DBF_UCHAR) {
         prompt("Bit 27")
         promptgroup("54 - Output 24-31")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -518,6 +546,7 @@ to alarms that are common to all record types.
     field(B1C,DBF_UCHAR) {
         prompt("Bit 28")
         promptgroup("54 - Output 24-31")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -525,6 +554,7 @@ to alarms that are common to all record types.
     field(B1D,DBF_UCHAR) {
         prompt("Bit 29")
         promptgroup("54 - Output 24-31")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -532,6 +562,7 @@ to alarms that are common to all record types.
     field(B1E,DBF_UCHAR) {
         prompt("Bit 30")
         promptgroup("54 - Output 24-31")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)
@@ -539,6 +570,7 @@ to alarms that are common to all record types.
     field(B1F,DBF_UCHAR) {
         prompt("Bit 31")
         promptgroup("54 - Output 24-31")
+        asl(ASL0)
         special(SPC_MOD)
         pp(TRUE)
         interest(1)

modules/database/src/std/rec/printfRecord.c

@@ -337,6 +337,9 @@ static long init_record(struct dbCommon *pcommon, int pass)
         if (sizv < 16) {
             sizv = 16;  /* Enforce a minimum size for the VAL field */
             prec->sizv = sizv;
+        } else if (sizv > 0x7fff) {
+            sizv = 0x7fff;  /* SIZV is unsigned, but dbAddr::field_size is signed */
+            prec->sizv = sizv;
         }
 
         prec->val = callocMustSucceed(1, sizv, "printf::init_record");

modules/database/src/std/rec/printfRecord.dbd.pod

@@ -152,7 +152,7 @@ Specification|https://docs.epics-controls.org/en/latest/guides/EPICS_Process_Dat
 for information on specifying links.
 
 The formatted string is written to the VAL field.  The maximum number of
-characters in VAL is given by SIZV, and cannot be larger than 65535. The LEN
+characters in VAL is given by SIZV, and cannot be larger than 32767. The LEN
 field contains the length of the formatted string in the VAL field.
 
 =fields FMT, INP0, INP1, INP2, INP3, INP4, INP5, INP6, INP7, INP8, INP9, VAL, SIZV, LEN

modules/database/src/tools/dbdExpand.pl

@@ -20,10 +20,14 @@ use EPICS::Getopts;
 use EPICS::Readfile;
 use EPICS::macLib;
 
-our ($opt_D, @opt_I, @opt_S, $opt_o);
+our ($opt_D, $opt_A, @opt_I, @opt_S, $opt_o);
 
-getopts('DI@S@o:') or
-    die "Usage: dbdExpand [-D] [-I dir] [-S macro=val] [-o out.dbd] in.dbd ...";
+getopts('DAI@S@o:') or
+    die "Usage: dbdExpand [-D] [-A] [-I dir] [-S macro=val] [-o out.dbd] in.dbd ...";
+
+if ($opt_A) {
+    $DBD::Parser::allowAutoDeclarations = 1;
+}
 
 my @path = map { split /[:;]/ } @opt_I; # FIXME: Broken on Win32?
 my $macros = EPICS::macLib->new(@opt_S);

modules/database/test/ioc/db/dbPutGetTest.c

@@ -4,6 +4,8 @@
 * in file LICENSE that is included with this distribution.
  \*************************************************************************/
 
+#define EPICS_PRIVATE_API
+
 #include <string.h>
 
 #include <errlog.h>

modules/database/test/std/rec/compressTest.c

@@ -469,6 +469,38 @@ testNto1Average(void) {
     testdbCleanup();
 }
 
+void testNto2Average(void) {
+    DBADDR wfaddr, caddr;
+
+    testDiag("Test N to 1 Average, NSAM=2, N=2");
+
+    testdbPrepare();
+
+    testdbReadDatabase("recTestIoc.dbd", NULL, NULL);
+
+    recTestIoc_registerRecordDeviceDriver(pdbbase);
+
+    testdbReadDatabase("compressTest.db", NULL, "INP=wf,ALG=N to 1 Average,BALG=FIFO Buffer,NSAM=2,N=2");
+
+    eltc(0);
+    testIocInitOk();
+    eltc(1);
+
+    fetchRecordOrDie("wf", wfaddr);
+    fetchRecordOrDie("comp", caddr);
+
+    writeToWaveform(&wfaddr, 4, 1., 2., 3., 4.);
+
+    dbScanLock(caddr.precord);
+    dbProcess(caddr.precord);
+
+    checkArrD("comp", 2, 1.5, 3.5, 0, 0);
+    dbScanUnlock(caddr.precord);
+
+    testIocShutdownOk();
+    testdbCleanup();
+}
+
 void
 testNto1AveragePartial(void) {
     double buf = 0.0;
@@ -517,6 +549,36 @@ testNto1AveragePartial(void) {
     testdbCleanup();
 }
 
+void
+testNtoMPartial(void) {
+    DBADDR wfaddr, caddr;
+
+    testDiag("Test Average, N to M, Partial");
+
+    testdbPrepare();
+    testdbReadDatabase("recTestIoc.dbd", NULL, NULL);
+    recTestIoc_registerRecordDeviceDriver(pdbbase);
+    testdbReadDatabase("compressTest.db", NULL, "INP=wf,ALG=N to 1 Average,BALG=FIFO Buffer,NSAM=2,N=3,PBUF=YES");
+
+    eltc(0);
+    testIocInitOk();
+    eltc(1);
+
+    fetchRecordOrDie("wf", wfaddr);
+    fetchRecordOrDie("comp", caddr);
+
+    writeToWaveform(&wfaddr, 4, 1., 2., 3., 4.);
+
+    dbScanLock(caddr.precord);
+    dbProcess(caddr.precord);
+
+    checkArrD("comp", 2, 2.0, 4.0, 0, 0);
+    dbScanUnlock(caddr.precord);
+
+    testIocShutdownOk();
+    testdbCleanup();
+}
+
 void
 testNto1LowValue(void) {
     double buf = 0.0;
@@ -634,12 +696,14 @@ testAIAveragePartial(void) {
 
 MAIN(compressTest)
 {
-    testPlan(132);
+    testPlan(134);
     testFIFOCirc();
     testLIFOCirc();
     testArrayAverage();
     testNto1Average();
+    testNto2Average();
     testNto1AveragePartial();
+    testNtoMPartial();
     testAIAveragePartial();
     testNto1LowValue();
     return testDone();

modules/libcom/src/as/asLib.y

@@ -209,7 +209,7 @@ static int yyerror(char *str)
     if (strlen(str))
         errlogPrintf("%s at line %d\n", str, line_num);
     else
-        errlogPrintf("Error at line %d\n", line_num);
+        errlogPrintf(ERL_ERROR " at line %d\n", line_num);
     yyFailed = TRUE;
     return 0;
 }

modules/libcom/src/as/asLibRoutines.c

@@ -176,12 +176,12 @@ long epicsStdCall asInitFile(const char *filename,const char *substitutions)
 
     fp = fopen(filename,"r");
     if(!fp) {
-        errlogPrintf("asInitFile: Can't open file '%s'\n", filename);
+        fprintf(stderr, ERL_ERROR " asInitFile: Can't open file '%s'\n", filename);
         return(S_asLib_badConfig);
     }
     status = asInitFP(fp,substitutions);
     if(fclose(fp)==EOF) {
-        errMessage(0,"asInitFile: fclose failed!");
+        fprintf(stderr, ERL_ERROR " asInitFile: fclose failed!");
         if(!status) status = S_asLib_badConfig;
     }
     return(status);
@@ -366,7 +366,7 @@ long epicsStdCall asAddClient(ASCLIENTPVT *pasClientPvt,ASMEMBERPVT asMemberPvt,
 {
     ASGMEMBER   *pasgmember = asMemberPvt;
     ASGCLIENT   *pasgclient;
-    int         len, i;
+    size_t      len, i;
 
     long        status;
     if(!asActive) return(S_asLib_asNotActive);
@@ -394,7 +394,7 @@ long epicsStdCall asChangeClient(
 {
     ASGCLIENT   *pasgclient = asClientPvt;
     long        status;
-    int         len, i;
+    size_t      len, i;
 
     if(!asActive) return(S_asLib_asNotActive);
     if(!pasgclient) return(S_asLib_badClient);

modules/libcom/src/calc/postfix.c

@@ -335,6 +335,10 @@ LIBCOM_API long
             break;
 
         case SEPERATOR:
+            if (pstacktop == stack) {
+                *perror = CALC_ERR_BAD_SEPERATOR;
+                goto bad;
+            }
             /* Move operators to the output until open paren */
             while (pstacktop->name[0] != '(') {
                 if (pstacktop <= stack+1) {
@@ -353,6 +357,10 @@ LIBCOM_API long
             break;
 
         case CLOSE_PAREN:
+            if (pstacktop == stack) {
+                *perror = CALC_ERR_PAREN_NOT_OPEN;
+                goto bad;
+            }
             /* Move operators to the output until matching paren */
             while (pstacktop->name[0] != '(') {
                 if (pstacktop <= stack+1) {

modules/libcom/src/calc/postfix.h

@@ -222,7 +222,7 @@ extern "C" {
  *    - n parameter minimum value: min(a, b, ...)
  *    - Square root: sqr(a) or sqrt(a)
  *    - Floating point modulo: fmod(num, den)
- *  \since The fmod() function was added in UNRELEASED
+ *  \since The fmod() function was added in 7.0.8
  *
  * -# ***Trigonometric Functions***
  *  Standard circular trigonometric functions, with angles expressed in radians:

modules/libcom/src/error/Makefile

@@ -26,6 +26,7 @@ ERR_S_FILES += $(LIBCOM)/as/asLib.h
 ERR_S_FILES += $(LIBCOM)/misc/epicsStdlib.h
 ERR_S_FILES += $(LIBCOM)/pool/epicsThreadPool.h
 ERR_S_FILES += $(LIBCOM)/error/errMdef.h
+ERR_S_FILES += $(LIBCOM)/error/errSymTbl.h
 ERR_S_FILES += $(TOP)/modules/database/src/ioc/db/dbAccessDefs.h
 ERR_S_FILES += $(TOP)/modules/database/src/ioc/dbStatic/dbStaticLib.h
 

modules/libcom/src/error/errMdef.h

@@ -19,6 +19,7 @@
 #define RTN_SUCCESS(STATUS) ((STATUS)==0)
 
 /* Module numbers start above 500 for compatibility with vxWorks errnoLib */
+#define MIN_MODULE_NUM 501
 
 /* FIXME: M_xxx values could be declared as integer variables and set
  * at runtime from registration routines; the S_xxx definitions would
@@ -32,6 +33,7 @@
 #define M_stdlib        (504 << 16) /* EPICS Standard library */
 #define M_pool          (505 << 16) /* Thread pool */
 #define M_time          (506 << 16) /* epicsTime */
+#define M_err           (507 << 16) /* Error */
 
 /* ioc */
 #define M_dbAccess      (511 << 16) /* Database Access Routines */

modules/libcom/src/error/errSymLib.c

@@ -23,6 +23,9 @@
 #include "cantProceed.h"
 #include "epicsAssert.h"
 #include "epicsStdio.h"
+#include "epicsTypes.h"
+#include "epicsMutex.h"
+#include "epicsThread.h"
 #include "errMdef.h"
 #include "errSymTbl.h"
 #include "ellLib.h"
@@ -33,69 +36,49 @@
 static epicsUInt16 errhash(long errNum);
 
 typedef struct errnumnode {
-    ELLNODE            node;
     long               errNum;
     struct errnumnode *hashnode;
     const char        *message;
     long               pad;
 } ERRNUMNODE;
 
-static ELLLIST errnumlist = ELLLIST_INIT;
-static ERRNUMNODE **hashtable;
-static int initialized = 0;
+typedef struct {
+    ERRNUMNODE *table[NHASH * sizeof(ERRNUMNODE *)];
+    epicsMutexId tableMutexId;
+} errHashTable_t;
+
+static errHashTable_t errHashTable;
+
 extern ERRSYMTAB_ID errSymTbl;
 
 /****************************************************************
  * ERRSYMBLD
  *
- * Create the normal ell LIST of sorted error messages nodes
- * Followed by linked hash lists - that link together those
- * ell nodes that have a common hash number.
+ * Populate EPICS error symbols
  *
  ***************************************************************/
 int errSymBld(void)
 {
-    ERRSYMBOL      *errArray = errSymTbl->symbols;
-    ERRNUMNODE     *perrNumNode = NULL;
-    ERRNUMNODE     *pNextNode = NULL;
-    ERRNUMNODE    **phashnode = NULL;
-    int             i;
-    int             modnum;
-
-    if (initialized)
-        return(0);
-
-    hashtable = (ERRNUMNODE**)callocMustSucceed
-        (NHASH, sizeof(ERRNUMNODE*),"errSymBld");
+    ERRSYMBOL *errArray = errSymTbl->symbols;
+    int i;
     for (i = 0; i < errSymTbl->nsymbols; i++, errArray++) {
-        modnum = errArray->errNum >> 16;
-        if (modnum < 501) {
-            fprintf(stderr, "errSymBld: ERROR - Module number in errSymTbl < 501 was Module=%lx Name=%s\n",
-                errArray->errNum, errArray->name);
-            continue;
-        }
-        if ((errSymbolAdd(errArray->errNum, errArray->name)) < 0) {
+        if (errSymbolAdd(errArray->errNum, errArray->name)) {
             fprintf(stderr, "errSymBld: ERROR - errSymbolAdd() failed \n");
-            continue;
         }
     }
-    perrNumNode = (ERRNUMNODE *) ellFirst(&errnumlist);
-    while (perrNumNode) {
-        /* hash each perrNumNode->errNum */
-        epicsUInt16 hashInd = errhash(perrNumNode->errNum);
 
-        phashnode = (ERRNUMNODE**)&hashtable[hashInd];
-        pNextNode = (ERRNUMNODE*) *phashnode;
-        /* search for last node (NULL) of hashnode linked list */
-        while (pNextNode) {
-            phashnode = &pNextNode->hashnode;
-            pNextNode = *phashnode;
-        }
-        *phashnode = perrNumNode;
-        perrNumNode = (ERRNUMNODE *) ellNext((ELLNODE *) perrNumNode);
-    }
-    initialized = 1;
-    return(0);
+    return 0;
+}
+
+static void _initErrorHashTable(void *_unused)
+{
+    errHashTable.tableMutexId = epicsMutexMustCreate();
+}
+
+static void initErrorHashTable()
+{
+    static epicsThreadOnceId initErrSymOnceFlag = EPICS_THREAD_ONCE_INIT;
+    epicsThreadOnce(&initErrSymOnceFlag, _initErrorHashTable, NULL);
 }
 
 /****************************************************************
@@ -109,21 +92,47 @@ static epicsUInt16 errhash(long errNum)
 
     modnum = (unsigned short) (errNum >> 16);
     errnum = (unsigned short) (errNum & 0xffff);
-    return (((modnum - 500) * 20) + errnum) % NHASH;
+    return ((modnum - (MIN_MODULE_NUM - 1)) * 20 + errnum) % NHASH;
 }
 
 /****************************************************************
  * ERRSYMBOLADD
- * adds symbols to the master errnumlist as compiled from errSymTbl.c
+ * adds symbols to the global error symbol hash table
  ***************************************************************/
 int errSymbolAdd(long errNum, const char *name)
 {
-    ERRNUMNODE *pNew = (ERRNUMNODE*) callocMustSucceed(1,
-        sizeof(ERRNUMNODE), "errSymbolAdd");
+    ERRNUMNODE *pNextNode = NULL;
+    ERRNUMNODE **phashnode = NULL;
+    ERRNUMNODE *pNew = NULL;
+    int modnum = (epicsUInt16) (errNum >> 16);
+    epicsUInt16 hashInd = errhash(errNum);
 
+    if (modnum < MIN_MODULE_NUM)
+        return S_err_invCode;
+
+    initErrorHashTable();
+
+    epicsMutexLock(errHashTable.tableMutexId);
+    phashnode = (ERRNUMNODE**)&errHashTable.table[hashInd];
+    pNextNode = (ERRNUMNODE*) *phashnode;
+
+    /* search for last node (NULL) of hashnode linked list */
+    while (pNextNode) {
+        if (pNextNode->errNum == errNum) {
+            int notIdentical = strcmp(name, pNextNode->message);
+            epicsMutexUnlock(errHashTable.tableMutexId);
+            return  notIdentical ? S_err_codeExists : 0;
+        }
+        phashnode = &pNextNode->hashnode;
+        pNextNode = *phashnode;
+    }
+
+    pNew = (ERRNUMNODE*) callocMustSucceed(
+        1, sizeof(ERRNUMNODE), "errSymbolAdd");
     pNew->errNum = errNum;
     pNew->message = name;
-    ellAdd(&errnumlist, (ELLNODE*)pNew);
+    *phashnode = pNew;
+    epicsMutexUnlock(errHashTable.tableMutexId);
     return 0;
 }
 
@@ -155,31 +164,31 @@ const char* errSymLookupInternal(long status)
     if (!status)
         return "Ok";
 
-    if (!initialized)
-        errSymBld();
+    initErrorHashTable();
 
     modNum = (unsigned) status;
     modNum >>= 16;
     modNum &= 0xffff;
-    if (modNum <= 500) {
-        const char * pStr = strerror ((int) status);
-        if (pStr) {
-            return pStr;
-        }
+    if (modNum < MIN_MODULE_NUM) {
+        return strerror ((int) status);
     }
     else {
         unsigned hashInd = errhash(status);
-        phashnode = (ERRNUMNODE**)&hashtable[hashInd];
+        const char *result = NULL;
+        epicsMutexLock(errHashTable.tableMutexId);
+        phashnode = (ERRNUMNODE**)&errHashTable.table[hashInd];
         pNextNode = *phashnode;
         while (pNextNode) {
             if (pNextNode->errNum==status){
-                return pNextNode->message;
+                 result = pNextNode->message;
+                 break;
             }
             phashnode = &pNextNode->hashnode;
             pNextNode = *phashnode;
         }
+        epicsMutexUnlock(errHashTable.tableMutexId);
+        return result;
     }
-    return NULL;
 }
 
 const char* errSymMsg(long status)
@@ -210,12 +219,12 @@ void errSymDump(void)
     int i;
     int msgcount = 0;
 
-    if (!initialized) errSymBld();
+    initErrorHashTable();
 
     msgcount = 0;
     printf("errSymDump: number of hash slots = %d\n", NHASH);
     for (i = 0; i < NHASH; i++) {
-        ERRNUMNODE **phashnode = &hashtable[i];
+        ERRNUMNODE **phashnode = &errHashTable.table[i];
         ERRNUMNODE *pNextNode = *phashnode;
         int count = 0;
 
@@ -246,14 +255,15 @@ void errSymTestPrint(long errNum)
     epicsUInt16 modnum;
     epicsUInt16 errnum;
 
-    if (!initialized) errSymBld();
+    initErrorHashTable();
 
     message[0] = '\0';
     modnum = (epicsUInt16) (errNum >> 16);
     errnum = (epicsUInt16) (errNum & 0xffff);
-    if (modnum < 501) {
+    if (modnum < MIN_MODULE_NUM) {
         fprintf(stderr, "Usage:  errSymTestPrint(long errNum) \n");
-        fprintf(stderr, "errSymTestPrint: module number < 501 \n");
+        fprintf(stderr,
+                "errSymTestPrint: module number < %d\n", MIN_MODULE_NUM);
         return;
     }
     errSymLookup(errNum, message, sizeof(message));
@@ -271,10 +281,11 @@ void errSymTest(epicsUInt16 modnum, epicsUInt16 begErrNum,
     long         errNum;
     epicsUInt16  errnum;
 
-    if (!initialized) errSymBld();
-    if (modnum < 501)
+    if (modnum < MIN_MODULE_NUM)
         return;
 
+    initErrorHashTable();
+
     /* print range of error messages */
     for (errnum = begErrNum; errnum <= endErrNum; errnum++) {
         errNum = modnum << 16;

modules/libcom/src/error/errSymTbl.h

@@ -16,6 +16,9 @@
 #include "libComAPI.h"
 #include "epicsTypes.h"
 
+#define S_err_invCode (M_err | 1)       /* Invalid error symbol code */
+#define S_err_codeExists (M_err | 2)    /* Error code already exists */
+
 /* ERRSYMBOL - entry in symbol table */
 typedef struct {
     long errNum;        /* errMessage symbol number */

modules/libcom/src/error/errlog.c

@@ -246,7 +246,7 @@ int isATTY(FILE* fp)
     else if(fp==stderr)
         hand = GetStdHandle(STD_ERROR_HANDLE);
 #ifdef ENABLE_VIRTUAL_TERMINAL_PROCESSING
-    if(hand && GetConsoleMode(hand, &mode)) {
+    if(hand!=INVALID_HANDLE_VALUE && GetConsoleMode(hand, &mode)) {
         (void)SetConsoleMode(hand, mode|ENABLE_VIRTUAL_TERMINAL_PROCESSING);
         mode = 0u;
         if(GetConsoleMode(hand, &mode) && (mode&ENABLE_VIRTUAL_TERMINAL_PROCESSING))

modules/libcom/src/error/errlog.h

@@ -180,8 +180,8 @@ LIBCOM_API void errlogAddListener(errlogListener listener, void *pPrivate);
  * \param listener Function pointer of type ::errlogListener
  * \param pPrivate This will be passed as the first argument of listener()
  *
- * \since UNRELEASED Safe to call from a listener callback.
- * \until UNRELEASED Self-removal from a listener callback caused corruption.
+ * \since 7.0.8 Safe to call from a listener callback.
+ * \until 7.0.8 Self-removal from a listener callback caused corruption.
  */
 LIBCOM_API int errlogRemoveListeners(errlogListener listener,
     void *pPrivate);
@@ -285,14 +285,16 @@ LIBCOM_API void errSymLookup(long status, char *pBuf, size_t bufLength);
 #define ANSI_ESC_MAGENTA "\033[35;1m"
 #define ANSI_ESC_CYAN "\033[36;1m"
 #define ANSI_ESC_BOLD "\033[1m"
+#define ANSI_ESC_UNDERLINE "\033[4m"
 #define ANSI_ESC_RESET "\033[0m"
-#define ANSI_RED(STR)     ANSI_ESC_RED     STR ANSI_ESC_RESET
-#define ANSI_GREEN(STR)   ANSI_ESC_GREEN   STR ANSI_ESC_RESET
-#define ANSI_YELLOW(STR)  ANSI_ESC_YELLOW  STR ANSI_ESC_RESET
-#define ANSI_BLUE(STR)    ANSI_ESC_BLUE    STR ANSI_ESC_RESET
-#define ANSI_MAGENTA(STR) ANSI_ESC_MAGENTA STR ANSI_ESC_RESET
-#define ANSI_CYAN(STR)    ANSI_ESC_CYAN    STR ANSI_ESC_RESET
-#define ANSI_BOLD(STR)    ANSI_ESC_BOLD    STR ANSI_ESC_RESET
+#define ANSI_RED(STR)       ANSI_ESC_RED       STR ANSI_ESC_RESET
+#define ANSI_GREEN(STR)     ANSI_ESC_GREEN     STR ANSI_ESC_RESET
+#define ANSI_YELLOW(STR)    ANSI_ESC_YELLOW    STR ANSI_ESC_RESET
+#define ANSI_BLUE(STR)      ANSI_ESC_BLUE      STR ANSI_ESC_RESET
+#define ANSI_MAGENTA(STR)   ANSI_ESC_MAGENTA   STR ANSI_ESC_RESET
+#define ANSI_CYAN(STR)      ANSI_ESC_CYAN      STR ANSI_ESC_RESET
+#define ANSI_BOLD(STR)      ANSI_ESC_BOLD      STR ANSI_ESC_RESET
+#define ANSI_UNDERLINE(STR) ANSI_ESC_UNDERLINE STR ANSI_ESC_RESET
 #define ERL_ERROR ANSI_RED("ERROR")
 #define ERL_WARNING ANSI_MAGENTA("WARNING")
 /** @} */

modules/libcom/src/flex/Makefile

@@ -19,7 +19,7 @@ parse_CPPFLAGS = -DDEFAULT_SKELETON_FILE=$(SKELETON_FILE)
 
 INC += flex.skel.static
 
-# flex.c is included in parse.c
+# flex.c, scan.c and yylex.c are #included by parse.c
 e_flex_SRCS += ccl.c
 e_flex_SRCS += dfa.c
 e_flex_SRCS += ecs.c

modules/libcom/src/flex/ccl.c

@@ -132,7 +132,6 @@ void cclnegate(int cclp)
 void list_character_set(FILE *file, int cset[])
 {
     int i;
-    char *readable_form();
 
     putc( '[', file );
 

modules/libcom/src/flex/flex.c

@@ -188,7 +188,6 @@ int main(int argc, char *argv[])
 void flexend(int status)
 {
     int tblsiz;
-    char *flex_gettime();
 
     if ( skelfile != NULL )
         {
@@ -382,7 +381,7 @@ void flexend(int status)
 void flexinit(int argc, char **argv)
 {
     int i, sawcmpflag;
-    char *arg, *flex_gettime(), *mktemp();
+    char *arg;
 
     printstats = syntaxerror = trace = spprdflt = interactive = caseins = false;
     backtrack_report = performance_report = ddebug = fulltbl = fullspd = false;

modules/libcom/src/flex/flexdef.h

@@ -567,8 +567,8 @@ extern int sectnum, nummt, hshcol, dfaeql, numeps, eps2, num_reallocs;
 extern int tmpuses, totnst, peakpairs, numuniq, numdup, hshsave;
 extern int num_backtracking, bol_needed;
 
-void *allocate_array(int size, int element_size);
-void *reallocate_array(void *array, int size, int element_size);
+extern void *allocate_array(int size, int element_size);
+extern void *reallocate_array(void *array, int size, int element_size);
 
 #define allocate_integer_array(size) \
     (int *) allocate_array( size, sizeof( int ) )
@@ -677,10 +677,20 @@ extern int all_upper (Char *);
 /* bubble sort an integer array */
 extern void bubble (int [], int);
 
+/* replace upper-case letter to lower-case */
+extern Char clower(int c);
+
+/* returns copy of a string */
+extern char *copy_string(char *str);
+
+/* returns copy of a (potentially) unsigned string */
+extern Char *copy_unsigned_string(Char *str);
+
 /* shell sort a character array */
 extern void cshell (Char [], int, int);
 
-extern void dataend (void);     /* finish up a block of data declarations */
+/* finish up a block of data declarations */
+extern void dataend (void);
 
 /* report an error message and terminate */
 extern void flexerror (char[]) NORETURN;
@@ -688,6 +698,9 @@ extern void flexerror (char[]) NORETURN;
 /* report a fatal error message and terminate */
 extern void flexfatal (char[]);
 
+/* return current time */
+extern char *flex_gettime();
+
 /* report an error message formatted with one integer argument */
 extern void lerrif (char[], int);
 
@@ -700,11 +713,18 @@ extern void line_directive_out (FILE*);
 /* generate a data statment for a two-dimensional array */
 extern void mk2data (int);
 
-extern void mkdata (int);       /* generate a data statement */
+/* generate a data statement */
+extern void mkdata (int);
 
 /* return the integer represented by a string of digits */
 extern int myctoi (Char []);
 
+/* return character corresponding to escape sequence */
+extern Char myesc(Char *array);
+
+/* return the the human-readable form of a character */
+extern char *readable_form(int c);
+
 /* write out one section of the skeleton file */
 extern void skelout (void);
 
@@ -784,8 +804,14 @@ extern void cclinstal (Char [], int);
 /* lookup the number associated with character class */
 extern int ccllookup (Char []);
 
-extern void ndinstal (char[], Char[]);  /* install a name definition */
-extern void scinstal (char[], int);     /* make a start condition */
+/* install a name definition */
+extern void ndinstal (char[], Char[]);
+
+/* lookup a name definition */
+extern Char *ndlookup(char *nd);
+
+/* make a start condition */
+extern void scinstal (char[], int);
 
 /* lookup the number associated with a start condition */
 extern int sclookup (char[]);

modules/libcom/src/flex/gen.c

@@ -217,7 +217,6 @@ void genecs(void)
     int i, j;
     static char C_char_decl[] = "static const %s %s[%d] =\n    {   0,\n";
     int numrows;
-    Char clower();
 
     if ( numecs < csize )
         printf( C_char_decl, "YY_CHAR", "yy_ec", csize );
@@ -237,8 +236,6 @@ void genecs(void)
 
     if ( trace )
         {
-        char *readable_form();
-
         fputs( "\n\nEquivalence Classes:\n\n", stderr );
 
         numrows = csize / 8;

modules/libcom/src/flex/parse.y

@@ -34,11 +34,18 @@
 
 int pat, scnum, eps, headcnt, trailcnt, anyccl, lastchar, i, actvp, rulelen;
 int trlcontxt, xcluflg, cclsorted, varlength, variable_trail_rule;
-Char clower();
 
 static int madeany = false;  /* whether we've made the '.' character class */
 int previous_continued_action;  /* whether the previous rule's action was '|' */
 
+/* forward declarations */
+
+void build_eof_action( void );
+void synerr( char str[] );
+void format_pinpoint_message( char msg[], char arg[] );
+void pinpoint_message( char str[] );
+void yyerror( char msg[] );
+
 %}
 
 %%
@@ -626,7 +633,7 @@ string          :  string CHAR
  *                    conditions
  */
 
-void build_eof_action()
+void build_eof_action( void )
 
     {
     int i;
@@ -652,8 +659,7 @@ void build_eof_action()
 
 /* synerr - report a syntax error */
 
-void synerr( str )
-char str[];
+void synerr( char str[] )
 
     {
     syntaxerror = true;
@@ -665,8 +671,7 @@ char str[];
  *                           pinpointing its location
  */
 
-void format_pinpoint_message( msg, arg )
-char msg[], arg[];
+void format_pinpoint_message( char msg[], char arg[] )
 
     {
     char errmsg[MAXLINE];
@@ -678,8 +683,7 @@ char msg[], arg[];
 
 /* pinpoint_message - write out a message, pinpointing its location */
 
-void pinpoint_message( str )
-char str[];
+void pinpoint_message( char str[] )
 
     {
     fprintf( stderr, "\"%s\", line %d: %s\n", infilename, linenum, str );
@@ -690,8 +694,7 @@ char str[];
  *           currently, messages are ignore
  */
 
-void yyerror( msg )
-char msg[];
+void yyerror( char msg[] )
 
     {
     }

modules/libcom/src/flex/scan.c

@@ -953,6 +953,7 @@ void yy_load_buffer_state ( void );
 YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size );
 void yy_delete_buffer ( YY_BUFFER_STATE b );
 void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file );
+void set_input_file( char *file );
 
 #define yy_new_buffer yy_create_buffer
 
@@ -966,7 +967,7 @@ YY_DECL
     static int bracelevel, didadef;
     int i, indented_code = false, checking_used = false, new_xlation = false;
     int doing_codeblock = false;
-    Char nmdef[MAXLINE], myesc();
+    Char nmdef[MAXLINE];
 
 
     if ( yy_init )
@@ -1488,7 +1489,6 @@ case 65:
 # line 333 "scan.l"
 {
                         Char *nmdefptr;
-                        Char *ndlookup();
 
                         (void) strcpy( nmstr, (char *) yytext );
                         nmstr[yyleng - 1] = '\0';  /* chop trailing brace */
@@ -2230,8 +2230,7 @@ int yywrap()
 
 /* set_input_file - open the given file (if NULL, stdin) for scanning */
 
-void set_input_file( file )
-char *file;
+void set_input_file( char *file )
 
     {
     if ( file )

modules/libcom/src/flex/sym.c

@@ -108,8 +108,6 @@ void cclinstal(Char *ccltxt, int cclnum)
     /* we don't bother checking the return status because we are not called
      * unless the symbol is new
      */
-    Char *copy_unsigned_string();
-
     (void) addsym( (char *) copy_unsigned_string( ccltxt ), (char *) 0, cclnum,
                    ccltab, CCL_HASH_SIZE );
     }
@@ -191,9 +189,6 @@ int hashfunct(char *str, int hash_size)
 
 void ndinstal(char *nd, Char *def)
 {
-    char *copy_string();
-    Char *copy_unsigned_string();
-
     if ( addsym( copy_string( nd ), (char *) copy_unsigned_string( def ), 0,
                  ndtbl, NAME_TABLE_HASH_SIZE ) )
         synerr( "name defined twice" );
@@ -227,8 +222,6 @@ Char *ndlookup(char *nd)
 
 void scinstal(char *str, int xcluflg)
 {
-    char *copy_string();
-
     /* bit of a hack.  We know how the default start-condition is
      * declared, and don't put out a define for it, because it
      * would come out as "#define 0 1"

modules/libcom/src/gpHash/gpHashLib.c

@@ -63,7 +63,7 @@ GPHENTRY * epicsStdCall gphFindParse(gphPvt *pgphPvt, const char *name, size_t l
     ELLLIST **paplist;
     ELLLIST *gphlist;
     GPHENTRY *pgphNode;
-    int hash;
+    unsigned hash;
 
     if (pgphPvt == NULL) return NULL;
     paplist = pgphPvt->paplist;
@@ -99,7 +99,7 @@ GPHENTRY * epicsStdCall gphAdd(gphPvt *pgphPvt, const char *name, void *pvtid)
     ELLLIST **paplist;
     ELLLIST *plist;
     GPHENTRY *pgphNode;
-    int hash;
+    unsigned hash;
 
     if (pgphPvt == NULL) return NULL;
     paplist = pgphPvt->paplist;
@@ -144,7 +144,7 @@ void epicsStdCall gphDelete(gphPvt *pgphPvt, const char *name, void *pvtid)
     ELLLIST **paplist;
     ELLLIST *plist = NULL;
     GPHENTRY *pgphNode;
-    int hash;
+    unsigned hash;
 
     if (pgphPvt == NULL) return;
     paplist = pgphPvt->paplist;

modules/libcom/src/iocsh/initHooks.c

@@ -139,6 +139,9 @@ const char *initHookName(int state)
         "initHookBeforeFree",
         "initHookAfterShutdown",
 
+        "initHookAfterPrepareDatabase",
+        "initHookBeforeCleanupDatabase",
+
         "initHookAfterInterruptAccept",
         "initHookAtEnd"
     };

modules/libcom/src/iocsh/initHooks.h

@@ -71,6 +71,7 @@ extern "C" {
  * if the IOC is later paused and restarted.
  */
 typedef enum {
+
     // iocInit() begins
     initHookAtIocBuild = 0,         /**< Start of iocBuild() / iocInit() */
     initHookAtBeginning,            /**< Database sanity checks passed */
@@ -110,7 +111,7 @@ typedef enum {
      */
     initHookAfterCloseLinks,
     /** \brief Scan tasks stopped.
-     *  \since UNRELEASED Triggered during normal IOC shutdown
+     *  \since 7.0.8 Triggered during normal IOC shutdown
      *  \since 7.0.3.1 Added, triggered only by unittest code.
      */
     initHookAfterStopScan,
@@ -119,7 +120,7 @@ typedef enum {
      */
     initHookAfterStopCallback,
     /** \brief CA links stopped.
-     *  \since UNRELEASED Triggered during normal IOC shutdown
+     *  \since 7.0.8 Triggered during normal IOC shutdown
      *  \since 7.0.3.1 Added, triggered only by unittest code.
      */
     initHookAfterStopLinks,
@@ -133,6 +134,17 @@ typedef enum {
     initHookAfterShutdown,
     // iocShutdown() ends
 
+    /** \brief Called during testdbPrepare()
+     * Use this hook to repeat actions each time an empty test database is initialized.
+     * \since 7.0.8 Added, triggered only by unittest code.
+     */
+    initHookAfterPrepareDatabase,
+    /** \brief Called during testdbCleanup()
+     * Use this hook to perform cleanup each time before a test database is free()'d.
+     * \since 7.0.8 Added, triggered only by unittest code.
+     */
+    initHookBeforeCleanupDatabase,
+
     /* Deprecated states: */
     /** Only announced once.  Deprecated in favor of initHookAfterDatabaseRunning */
     initHookAfterInterruptAccept,

modules/libcom/src/iocsh/iocsh.cpp

@@ -16,6 +16,7 @@
 #include <vector>
 #include <map>
 #include <string>
+#include <sstream>
 
 #include <stddef.h>
 #include <string.h>
@@ -43,6 +44,7 @@
 
 #if EPICS_COMMANDLINE_LIBRARY == EPICS_COMMANDLINE_LIBRARY_READLINE
 #  include <readline/readline.h>
+#  include <readline/history.h>
 #  define USE_READLINE
 /* libedit also provides readline.h, but isn't fully compatible with
  * GNU readline.  It also doesn't specifically identify itself.
@@ -202,7 +204,7 @@ showError (const char *filename, int lineno, const char *msg, ...)
 
     va_start (ap, msg);
     if (filename)
-        fprintf(epicsGetStderr(), "%s line %d: ", filename, lineno);
+        fprintf(epicsGetStderr(), ERL_ERROR " %s line %d: ", filename, lineno);
     vfprintf (epicsGetStderr(), msg, ap);
     fputc ('\n', epicsGetStderr());
     va_end (ap);
@@ -633,6 +635,15 @@ struct ReadlineContext {
             rl_completer_quote_characters = (char*)"\"";
             rl_attempted_completion_function = &iocsh_attempt_completion;
             rl_bind_key('\t', rl_complete);
+            compute_hist_file();
+            if(!hist_file.empty()) {
+                if(int err = read_history(hist_file.c_str())) {
+                    if(err!=ENOENT)
+                        fprintf(stderr, ERL_ERROR " %s (%d) loading '%s'\n",
+                                strerror(err), err, hist_file.c_str());
+                }
+                stifle_history(1024); // some limit...
+            }
         }
 #endif
         return context;
@@ -641,6 +652,12 @@ struct ReadlineContext {
     ~ReadlineContext() {
         if(context) {
 #ifdef USE_READLINE
+            if(!hist_file.empty()) {
+                if(int err = write_history(hist_file.c_str())) {
+                    fprintf(stderr, ERL_ERROR " %s (%d) writing '%s'\n",
+                            strerror(err), err, hist_file.c_str());
+                }
+            }
             rl_readline_name = prev_rl_readline_name;
             rl_basic_word_break_characters = prev_rl_basic_word_break_characters;
             rl_completer_word_break_characters = prev_rl_completer_word_break_characters;
@@ -653,6 +670,26 @@ struct ReadlineContext {
             epicsReadlineEnd(context);
         }
     }
+
+#ifdef USE_READLINE
+    std::string hist_file;
+
+    void compute_hist_file() {
+        std::string scratch;
+        if(const char *env = getenv("EPICS_IOCSH_HISTFILE")) {
+            scratch = env;
+        } else {
+            scratch = ".iocsh_history";
+        }
+        const char *home = getenv("HOME");
+        if(home && scratch.size()>=2 && scratch[0]=='~' && scratch[1]=='/') {
+            std::ostringstream strm;
+            strm<<home<<'/'<<scratch.substr(2);
+            scratch = strm.str();
+        }
+        hist_file.swap(scratch);
+    }
+#endif // USE_READLINE
 };
 
 } // namespace
@@ -755,6 +792,13 @@ void epicsStdCall iocshFree(void)
     iocshTableUnlock ();
 }
 
+/*
+ * Parse argument input based on the arg type specified.
+ * It is worth noting that depending on type this argument may 
+ * be defaulted if a value is not specified. For example, a 
+ * double/int with no value will default to 0 which may allow
+ * you to add optional arguments to the end of your argument list.
+ */
 static int
 cvtArg (const char *filename, int lineno, char *arg, iocshArgBuf *argBuf,
     const iocshArg *piocshArg)
@@ -888,15 +932,19 @@ static void helpCallFunc(const iocshArgBuf *args)
                 "Type 'help <command>' to see the arguments of <command>.  eg. 'help db*'\n");
     }
     else {
+        bool firstFunction = true;
         for (int iarg = 1 ; iarg < argc ; iarg++) {
             for (pcmd = iocshCommandHead ; pcmd != NULL ; pcmd = pcmd->next) {
                 piocshFuncDef = pcmd->def.pFuncDef;
                 if (epicsStrGlobMatch(piocshFuncDef->name, argv[iarg]) != 0) {
-                    if(piocshFuncDef->usage) {
-                        fputs("\nUsage: ", epicsGetStdout());
+
+                    if (! firstFunction) {
+                        fprintf(epicsGetStdout(), 
+                            ANSI_UNDERLINE("                                                            \n"));
                     }
+
                     fprintf(epicsGetStdout(),
-                            ANSI_BOLD("%s"),
+                            ANSI_BOLD("\n%s"),
                             piocshFuncDef->name);
 
                     for (int a = 0 ; a < piocshFuncDef->nargs ; a++) {
@@ -909,11 +957,14 @@ static void helpCallFunc(const iocshArgBuf *args)
                             fprintf(epicsGetStdout(), " '%s'", cp);
                         }
                     }
-                    fprintf(epicsGetStdout(),"\n");;
+                    fprintf(epicsGetStdout(),"\n");
                     if(piocshFuncDef->usage) {
                         fprintf(epicsGetStdout(), "\n%s", piocshFuncDef->usage);
                     }
+                    
+                    firstFunction = false;
                 }
+
             }
         }
     }
@@ -1383,12 +1434,12 @@ static void varCallFunc(const iocshArgBuf *args)
                 found = 1;
             }
         if (!found && name != NULL)
-            fprintf(epicsGetStderr(), "No var matching %s found.\n", name);
+            fprintf(epicsGetStderr(), ANSI_RED("No var matching") " %s found.\n", name);
     }
     else {
         v = (iocshVariable *)registryFind(iocshVarID, args[0].sval);
         if (v == NULL) {
-            fprintf(epicsGetStderr(), "Var %s not found.\n", name);
+            fprintf(epicsGetStderr(), "Var %s " ANSI_RED("not found.") "\n", name);
         }
         else {
             varHandler(v->pVarDef, value);

modules/libcom/src/iocsh/iocsh.h

@@ -66,12 +66,16 @@ typedef enum {
     iocshArgPdbbase,
     iocshArgArgv,
     iocshArgPersistentString,
-    /** Equivalent to iocshArgString with a hint for tab completion as a record name.
-     *  @since UNRELEASED
+    /**
+     * Equivalent to iocshArgString with a hint for tab completion that the
+     * argument is a record name.
+     * @since 7.0.8
      */
     iocshArgStringRecord,
-    /** Equivalent to iocshArgString with a hint for tab completion as a file system path.
-     *  @since UNRELEASED
+    /**
+     * Equivalent to iocshArgString with a hint for tab completion that the
+     * argument is a file system path.
+     * @since 7.0.8
      */
     iocshArgStringPath,
 }iocshArgType;

modules/libcom/src/iocsh/libComRegister.c

@@ -193,7 +193,7 @@ static const iocshFuncDef epicsEnvShowFuncDef = {"epicsEnvShow",1,epicsEnvShowAr
                                                  "  (default) - show all environment variables\n"
                                                  "   name     - show value of specific environment variable\n"
                                                  "Example: epicsEnvShow\n"
-                                                 "Example: epicsEnvShow PATH"};
+                                                 "Example: epicsEnvShow PATH\n"};
 static void epicsEnvShowCallFunc(const iocshArgBuf *args)
 {
     epicsEnvShow (args[0].sval);

modules/libcom/src/log/iocLogServer.c

@@ -43,7 +43,7 @@ static char ioc_log_file_command[256];
 
 
 struct iocLogClient {
-    int insock;
+    SOCKET insock;
     struct ioc_log_server *pserver;
     size_t nChar;
     char recvbuf[1024];

modules/libcom/src/misc/adjustment.c

@@ -15,40 +15,25 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-/* Up to now epicsShareThings have been declared as imports
- *   (Appropriate for other stuff)
- * After setting the following they will be declared as exports
- *   (Appropriate for what we implement)
- */
+#include <epicsAssert.h>
 #include "adjustment.h"
 
-LIBCOM_API size_t adjustToWorstCaseAlignment(size_t size)
+size_t adjustToWorstCaseAlignment(size_t size)
 {
-    int align_size, adjust;
-    struct test_long_word { char c; long lw; };
-    struct test_double { char c; double d; };
-    struct test_ptr { char c; void *p; };
-    int test_long_size = sizeof(struct test_long_word) - sizeof(long);
-    int test_double_size = sizeof(struct test_double) - sizeof(double);
-    int test_ptr_size = sizeof(struct test_ptr) - sizeof(void *);
-    size_t adjusted_size = size;
+    union aline {
+        /* largest primative types (so far...) */
+        double dval;
+        size_t uval;
+        char *ptr;
+    };
 
-    /*
-     * Use Jeff's alignment tests to determine worst case of long,
-     * double or pointer alignment requirements.
-    */
-    align_size = test_long_size > test_ptr_size ?
-                  test_long_size : test_ptr_size;
+    /* assert that alignment size is a power of 2 */
+    STATIC_ASSERT((sizeof(union aline) & (sizeof(union aline)-1))==0);
 
-    align_size = align_size > test_double_size ?
-                  align_size : test_double_size;
+    /* round up to aligment size */
+    size--;
+    size |= sizeof(union aline)-1;
+    size++;
 
-    /*
-     * Increase the size to fit worst case alignment if not already
-     * properly aligned.
-     */
-    adjust = align_size - size%align_size;
-    if (adjust != align_size) adjusted_size += adjust;
-
-    return (adjusted_size);
+    return size;
 }

modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp

@@ -17,6 +17,7 @@
 #include <climits>
 #include <stdexcept>
 #include <cstdio>
+#include <vector>
 
 //#define EPICS_FREELIST_DEBUG
 #define EPICS_PRIVATE_API
@@ -82,7 +83,6 @@ struct ipAddrToAsciiGlobal : public epicsThreadRunable {
 
     virtual void run ();
 
-    char nameTmp [1024];
     tsFreeList
         < ipAddrToAsciiTransactionPrivate, 0x80 >
             transactionFreeList;
@@ -297,6 +297,8 @@ ipAddrToAsciiTransaction & ipAddrToAsciiEnginePrivate::createTransaction ()
 
 void ipAddrToAsciiGlobal::run ()
 {
+    std::vector<char> nameTmp(1024);
+
     epicsGuard < epicsMutex > guard ( this->mutex );
     while ( ! this->exitFlag ) {
         {
@@ -313,14 +315,13 @@ void ipAddrToAsciiGlobal::run ()
 
             if ( this->exitFlag )
             {
-                sockAddrToDottedIP ( & addr.sa, this->nameTmp,
-                    sizeof ( this->nameTmp ) );
+                sockAddrToDottedIP ( & addr.sa, &nameTmp[0], nameTmp.size() );
             }
             else {
                 epicsGuardRelease < epicsMutex > unguard ( guard );
                 // depending on DNS configuration, this could take a very long time
                 // so we release the lock
-                sockAddrToA ( &addr.sa, this->nameTmp, sizeof ( this->nameTmp ) );
+                sockAddrToA ( &addr.sa, &nameTmp[0], nameTmp.size() );
             }
 
             // the ipAddrToAsciiTransactionPrivate destructor is allowed to
@@ -339,7 +340,7 @@ void ipAddrToAsciiGlobal::run ()
             {
                 epicsGuardRelease < epicsMutex > unguard ( guard );
                 // don't call callback with lock applied
-                pCur->pCB->transactionComplete ( this->nameTmp );
+                pCur->pCB->transactionComplete ( &nameTmp[0] );
             }
 
             this->callbackInProgress = false;

modules/libcom/src/osi/epicsAssert.h

@@ -78,14 +78,22 @@ LIBCOM_API void epicsAssert (const char *pFile, const unsigned line,
 #if __cplusplus>=201103L
 #define STATIC_ASSERT(expr) static_assert(expr, #expr)
 #else
-#define STATIC_JOIN(x, y) STATIC_JOIN2(x, y)
-#define STATIC_JOIN2(x, y) x ## y
+
+#define STATIC_JOIN(x, y, z, w) STATIC_JOIN4(x, y, z, w)
+#define STATIC_JOIN4(x, y, z, w) x ## y ## z ## w
+
+/* Compilers that do not support __COUNTER__ (e.g. GCC 4.1) will not be able to use unique static assert typedefs */
+#ifdef __COUNTER__
+#   define STATIC_ASSERT_MSG(l) STATIC_JOIN(static_assert_, __COUNTER__, _failed_at_line_, l)
+#else
+#   define STATIC_ASSERT_MSG(l) STATIC_JOIN(static_assert_, 0, _failed_at_line_, l)
+#endif
 
 /**\brief Declare a condition that should be true at compile-time.
  * \param expr A C/C++ const-expression that should evaluate to True.
  */
 #define STATIC_ASSERT(expr) \
-    typedef int STATIC_JOIN(static_assert_failed_at_line_, __LINE__) \
+    typedef int STATIC_ASSERT_MSG(__LINE__) \
     [ (expr) ? 1 : -1 ] EPICS_UNUSED
 #endif
 

modules/libcom/src/osi/epicsStackTrace.h

@@ -25,6 +25,8 @@ extern "C" {
 /** \brief Dump a stack trace
  *
  * Dump a stack trace to the errlog.
+ *
+ * \since 3.15.0.2 Added
  */
 LIBCOM_API void epicsStackTrace(void);
 

modules/libcom/src/osi/epicsTime.cpp

@@ -238,7 +238,7 @@ size_t epicsStdCall epicsTimeToStrftime (char *pBuff, size_t bufLength, const ch
                     // convert nanosecs to integer of correct range
                     frac /= div[fracWid];
                     char fracFormat[32];
-                    sprintf ( fracFormat, "%%0%lulu", fracWid );
+                    epicsSnprintf ( fracFormat, sizeof ( fracFormat ), "%%0%lulu", fracWid );
                     int status = epicsSnprintf ( pBufCur, bufLenLeft, fracFormat, frac );
                     if ( status > 0 ) {
                         unsigned long nChar = static_cast < unsigned long > ( status );

modules/libcom/src/osi/os/Linux/osdThread.h

@@ -36,6 +36,7 @@ typedef struct epicsThreadOSD {
     int                isEpicsThread;
     int                isRealTimeScheduled;
     int                isOnThreadList;
+    int                isRunning;
     unsigned int       osiPriority;
     int                joinable;
     char               name[1];     /* actually larger */

modules/libcom/src/osi/os/Linux/osdThreadExtra.c

@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <sys/prctl.h>
 
+#include "epicsAtomic.h"
 #include "epicsStdio.h"
 #include "ellLib.h"
 #include "epicsEvent.h"
@@ -45,11 +46,12 @@ void epicsThreadShowInfo(epicsThreadId pthreadInfo, unsigned int level)
             if (!status)
                 priority = param.sched_priority;
         }
-        fprintf(epicsGetStdout(),"%16.16s %14p %8lu    %3d%8d %8.8s\n",
+        fprintf(epicsGetStdout(),"%16.16s %14p %8lu    %3d%8d %8.8s%s\n",
              pthreadInfo->name,(void *)
              pthreadInfo,(unsigned long)pthreadInfo->lwpId,
              pthreadInfo->osiPriority,priority,
-             pthreadInfo->isSuspended ? "SUSPEND" : "OK");
+             pthreadInfo->isSuspended ? "SUSPEND" : "OK",
+             epicsAtomicGetIntT(&pthreadInfo->isRunning) ? "" : " ZOMBIE");
     }
 }
 

modules/libcom/src/osi/os/RTEMS-score/osdThread.c

@@ -53,6 +53,7 @@ struct taskVar {
     rtems_id             join_barrier; /* only valid if joinable */
     int                refcnt;
     int                joinable;
+    int                isRunning;
     EPICSTHREADFUNC              funptr;
     void                *parm;
     unsigned int        threadVariableCapacity;
@@ -197,6 +198,7 @@ threadWrapper (rtems_task_argument arg)
     osdThreadHooksRun((epicsThreadId)v->id);
     (*v->funptr)(v->parm);
     epicsExitCallAtThreadExits ();
+    epicsAtomicSetIntT(&v->isRunning, 0);
     taskVarLock ();
     if (v->back)
         v->back->forw = v->forw;
@@ -239,6 +241,7 @@ setThreadInfo(rtems_id tid, const char *name, EPICSTHREADFUNC funptr,
     v->refcnt = joinable ? 2 : 1;
     v->threadVariableCapacity = 0;
     v->threadVariables = NULL;
+    v->isRunning = 1;
     if (joinable) {
         char c[3];
         strncpy(c, v->name, 3);
@@ -797,7 +800,11 @@ epicsThreadShowInfo (struct taskVar *v, unsigned int level)
         fprintf(epicsGetStdout(),"+--------+-----------+--------+--------+---------------------+\n");
     } else {
         fprintf(epicsGetStdout(),"%9.8x", (int)v->id);
-        showInternalTaskInfo (v->id);
+        if(epicsAtomicGetIntT(&v->isRunning)) {
+            showInternalTaskInfo (v->id);
+        } else {
+            fprintf(epicsGetStdout(),"%-30s",  "  *** ZOMBIE task!     ***");
+        }
         fprintf(epicsGetStdout()," %s\n", v->name);
     }
 }

modules/libcom/src/osi/os/WIN32/osdSock.c

@@ -119,8 +119,8 @@ LIBCOM_API SOCKET epicsStdCall epicsSocketCreate (
     return socket ( domain, type, protocol );
 }
 
-LIBCOM_API int epicsStdCall epicsSocketAccept ( 
-    int sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
+LIBCOM_API SOCKET epicsStdCall epicsSocketAccept (
+    SOCKET sock, struct sockaddr * pAddr, osiSocklen_t * addrlen )
 {
     return accept ( sock, pAddr, addrlen );
 }

modules/libcom/src/osi/os/WIN32/osdThread.c

@@ -102,6 +102,7 @@ typedef struct epicsThreadOSD {
     unsigned epicsPriority;
     char isSuspended;
     int joinable;
+    int isRunning;
     HANDLE timer; /* waitable timer */
 } win32ThreadParam;
 
@@ -499,8 +500,6 @@ static unsigned WINAPI epicsWin32ThreadEntry ( LPVOID lpParameter )
     BOOL success;
 
     if ( pGbl )  {
-        setThreadName ( pParm->id, pParm->pName );
-
         success = FlsSetValue ( pGbl->flsIndexThreadLibraryEPICS, pParm );
         if ( success ) {
             osdThreadHooksRun ( ( epicsThreadId ) pParm );
@@ -519,6 +518,8 @@ static unsigned WINAPI epicsWin32ThreadEntry ( LPVOID lpParameter )
 
     epicsExitCallAtThreadExits ();
 
+    epicsAtomicSetIntT(&pParm->isRunning, 0);
+
     /* On Windows we could omit this and rely on the callback given to FlsAlloc() to free.
      * However < vista doesn't implement FLS at all, and WINE (circa 5.0.3) doesn't
      * implement fully (dtor never runs).  So for EPICS threads, we explicitly
@@ -540,6 +541,7 @@ static win32ThreadParam * epicsThreadParmCreate ( const char *pName )
         pParmWIN32->pName = (char *) ( pParmWIN32 + 1 );
         strcpy ( pParmWIN32->pName, pName );
         pParmWIN32->isSuspended = 0;
+        pParmWIN32->isRunning = 1;
         epicsAtomicIncrIntT(&pParmWIN32->refcnt);
 #ifdef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
         pParmWIN32->timer = CreateWaitableTimerEx(NULL, NULL, CREATE_WAITABLE_TIMER_HIGH_RESOLUTION, TIMER_ALL_ACCESS);
@@ -655,6 +657,7 @@ epicsThreadId epicsThreadCreateOpt (
         pParmWIN32->id = ( DWORD ) threadId ;
     }
 
+    setThreadName ( pParmWIN32->id, pParmWIN32->pName );
     osdPriority = epicsThreadGetOsdPriorityValue (opts->priority);
     bstat = SetThreadPriority ( pParmWIN32->handle, osdPriority );
     if (!bstat) {
@@ -1044,6 +1047,8 @@ static void epicsThreadShowInfo ( epicsThreadId id, unsigned level )
             fprintf (epicsGetStdout(), " %-8p %-8p ",
                 (void *) pParm->handle, (void *) pParm->parm );
         }
+        if(!epicsAtomicGetIntT(&pParm->isRunning))
+            fprintf (epicsGetStdout(), " ZOMBIE");
     }
     else {
         fprintf (epicsGetStdout(),

modules/libcom/src/osi/os/WIN32/osdTime.cpp

@@ -215,6 +215,7 @@ void currentTime :: startPLL ()
                 CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION,
                 & this->threadId );
         assert ( this->threadHandle );
+        setThreadName ( this->threadId, "EPICS Time PLL" );
         BOOL bstat = SetThreadPriority (
             this->threadHandle, THREAD_PRIORITY_HIGHEST );
         assert ( bstat );
@@ -496,7 +497,6 @@ static unsigned __stdcall _pllThreadEntry ( void * pCurrentTimeIn )
 {
     currentTime * pCT =
         reinterpret_cast < currentTime * > ( pCurrentTimeIn );
-    setThreadName ( pCT->threadId, "EPICS Time PLL" );
     while ( ! pCT->threadShutdownCmd ) {
         Sleep ( currentTime :: pllDelay * 1000 /* mS */ );
         pCT->updatePLL ();

modules/libcom/src/osi/os/default/osdMessageQueue.cpp

@@ -40,7 +40,16 @@ struct threadNode {
     struct eventNode   *evp;
     void               *buf;
     unsigned int        size;
-    volatile bool       eventSent;
+    bool                eventSent;
+    inline
+    threadNode()
+        :evp(NULL)
+        ,buf(NULL)
+        ,size(0u)
+        ,eventSent(false)
+    {
+        memset(&link, 0, sizeof(link));
+    }
 };
 
 /*
@@ -366,9 +375,10 @@ myReceive(epicsMessageQueueId pmsg, void *message, unsigned int size,
 
     freeEventNode(pmsg, threadNode.evp, status);
 
+    bool wasSent = threadNode.eventSent;
     epicsMutexUnlock(pmsg->mutex);
 
-    if (threadNode.eventSent && (threadNode.size <= size))
+    if (wasSent && (threadNode.size <= size))
         return threadNode.size;
     return -1;
 }