Merge ~dirk.zimoch/epics-base:vxWorks5 into ~epics-core/epics-base/+git/epics-base:7.0

[Dirk Zimoch]

Allow to build for vxWorks 5.

This change brings back the possibility to compile EPICS 7 for vxWorks versions 5.5 up to 6.2.
It introduces a method to skip modules for certain architectures using the Makefile variable SKIP_BUILDS which accepts a list of name patterns.
For vxWorks versions using gcc versions before 3.4 (i.e. up to vxWorks 6.2) the following setting is applied automatically to skip the pvAccess modules which are incompatible with the old compilers:

SKIP_BUILDS=pv% normativeTypes

00406dc... by Dirk Zimoch on 2018-10-23

Merge branch '7.0' into vxWorks5

[mdavidsaver (mdavidsaver)]

Dirk, are you proposing that vxWorks 5.5 be considered supported in 7.0.2? So far, "official support" for a vxWorks version has been code for "Andrew support". Similarly for Makefile. Are you/PSI willing to take up the burden of supporting the remaining 5.5 user community?

For my part, I'd like to encourage EPICS users to move away from this 16 year old, end of life, release. The idea of SKIP_BUILDS does not appeal to me either.

Maybe it would be better to maintain this as a branch to emphasize the AS IS nature of support?

This said, I don't have much stake in vxWorks support one way or the other. So mine is not the deciding vote.

[Dirk Zimoch (dirk.zimoch)]

Hello Michael,
Often the reasons for keeping an old os version are not purely technical and beyond our influence. This may affect other institutes as well. I don't know if anyone else still uses vxWorks 5, but we do and we will probably continue doing so for a while (in parallel with vxWorks 6 and Linux systems).

As much as I value your attempt to "march forward", I likewise see a value in "no one left behind". I would like to go forward to EPICS 7 and prefer if this could be supported by EPICS.

I have my Jenkins server set up, so I can test if any change still compiles, and I can fix new things that are problematic. At the moment, I only test the main branches (e.g. "7.0"). I can add your development branches if you like, so that I can test before you merge.

If vxWorks 5.5 support is not officially accepted, I can still keep the changes local. I have published my changes in this merge request not for the benefit of PSI but for the benefit of those parts of the EPICS community who still use vxWorks 5.5 like us, or rather vxWorks versions from 5.5 up to 6.3. (And I do not attempt to support vxWorks 5.3.)

I have one embedded Linux target architecture which has an old C++ compiler/library as well and cannot build PVA but has no problems with the rest of EPICS 7. I use the same approach for that architecture.

BTW, I'm not a fiend of any reasoning along the line "Works for me, so simply use my setup." With the same reasoning I could drop any attempts to keep my software compatible with Windows or RTEMS. But in my opinion in a community it is better to try to support as many systems as possible and not to exclude people simply because they have reasons not to use my setup.

[Andrew Johnson (anj)]

Hi Dirk,

So you are looking to run the IOC and RSRV server from 7.0 on older VxWorks versions, but not the PVA modules. You appear to have showed that there are no major source code changes needed to do that other than one minor code change and restoring the templateInstance.cpp source files that were deleted before the 3.16.1 release back in 2016.

As long as you have your Jenkins building the 7.0 branch against those versions and you're willing to work with the other developers to fix any issues that it brings up I think that should be a reasonable request and I'd be okay with restoring the source files.

However I don't like your SKIP_BUILDS mechanism. It seems too arbitrary, and I'm not sure if it is even necessary to automate this in the build system at all.

My preferred solution would be for you to use a separate checkout of Base *without* checking out the git submodules, which would give you a tree that includes none of the PVA modules but does contain the libcom, ca and database modules since they are now part of the 7.0 branch again. The rules in the modules directory check for the presence of a Makefile in the submodule directories before trying to build in them, so this approach works fine.

If a separate checkout isn't acceptable and you really want to build everything in a single tree I would want to try filtering out the target architectures that can't be built from the CROSS_COMPILER_TARGET_ARCHS list inside the individual modules. You can add a file configure/CONFIG_SITE.local to each submodule that does something like this:

  CROSS_COMPILER_TARGET_ARCHS := $(filter-out vxWorks-68040, $(CROSS_COMPILER_TARGET_ARCHS))

Repeat that line for as many cross-target arch's as necessary. Note that you might need to modify the very first setting of CROSS_COMPILER_TARGET_ARCHS to make sure that it uses := instead of = (+= is fine for either after the first setting). I have used this approach before to disable building troublesome architectures on certain modules.

- Andrew

[Andrew Johnson (anj)]

We think the best way to suppress building a particular module is to filter out the target from the CROSS_COMPILER_TARGET_ARCHS inside the the module's configure/CONFIG_SITE (or a .local version of that) file.

However we're not going to re-add the template instances to the EPICS 7 tree, so you're going to have to maintain local patches if you want this.

- Core meeting

review: Disapprove

Unmerged commits

00406dc... by Dirk Zimoch on 2018-10-23

Merge branch '7.0' into vxWorks5

7738b68... by Dirk Zimoch on 2018-09-24

fix missing template instances for old vxWorks (uses -fno-implicit-templates)

1199fab... by Dirk Zimoch on 2018-09-21

Fix strange compiler errors with gcc 2.96:
using <namespace::function>; seems not to work but
using namespace <namespace>; works
Also 'add' only works with explicit namespace. Why?

1aefc5f... by Dirk Zimoch on 2018-09-21

re-enable building vxWorks 5

6f666c6... by Dirk Zimoch on 2018-09-21

Add mechanism to skip modules for selected architectures

diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 9b8cbf0..daaae86 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -84,6 +84,23 @@ endif
 -include $(CONFIG)/RULES.Db
 
 #---------------------------------------------------------------
+# Do not build anything if current path matches SKIP_BUILD
+
+ifneq (,$(strip $(SKIP_BUILDS)))
+CURRENT_MODULE=$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..)))
+ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
+$(info Skipping $(CURRENT_MODULE) for $(T_A))
+PROD=
+TESTPROD=
+LIBRARY=
+TESTLIBRARY=
+LOADABLE_LIBRARY=
+TESTS=
+SRC_FILES=
+endif
+endif
+
+#---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
 
 #ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) ))
diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon
index 50f6269..8b950cf 100644
--- a/configure/os/CONFIG.Common.vxWorksCommon
+++ b/configure/os/CONFIG.Common.vxWorksCommon
@@ -63,6 +63,7 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
 
 # These are needed for vxWorks 6.x; the GNU toolset version number
 # is in the path to the compiler tools:
+VX_GNU_VERSION_5   = 2.96
 VX_GNU_VERSION_6.0 = 3.3.2
 VX_GNU_VERSION_6.1 = 3.3.2
 VX_GNU_VERSION_6.2 = 3.3.2
@@ -73,9 +74,17 @@ VX_GNU_VERSION_6.6 = 4.1.2
 VX_GNU_VERSION_6.7 = 4.1.2
 VX_GNU_VERSION_6.8 = 4.1.2
 VX_GNU_VERSION_6.9 = 4.3.3
-VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
 
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
+VX_GNU_MINOR_VERSION = $(basename $(patsubst $(VX_GNU_MAJOR_VERSION).%,%,$(VX_GNU_VERSION)))
+
+# gcc version before 3.4 are "old" and need special treatment
+VX_OLD_GCC_2   = OLD
+VX_OLD_GCC_3.3 = OLD
+VX_OLD_GCC_3   = $(VX_OLD_GCC_3.$(VX_GNU_MINOR_VERSION))
+VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
 
 #--------------------------------------------------
 # Fix old Linux WIND_HOST_TYPE
@@ -85,14 +94,20 @@ endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR_5 = $(WIND_BASE)
+VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
 
-GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # vxWorks GNU directories
 
-GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # This finds nm on any supported VxWorks version
@@ -133,12 +148,23 @@ OPT_CXXFLAGS_YES = -O2
 # code flags
 CODE_CFLAGS =
 #
-# For vxWorks versions before 6.3 we need this g++ compiler flag
-CODE_CXXFLAGS_6.0 = -fno-implicit-templates
-CODE_CXXFLAGS_6.1 = -fno-implicit-templates
-CODE_CXXFLAGS_6.2 = -fno-implicit-templates
-CODE_CXXFLAGS_6 = $(CODE_CXXFLAGS_$(VXWORKS_VERSION))
-CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION))
+# For gcc versions before 3.4 we need this g++ compiler flag
+# However WindRiver says gcc 3.3 does not need it any more
+# which would allow to build vxWorks 6 without this flag.
+# Maybe we can live without it at the penalty of larger code.
+# See vxWorks 5 docs/gnu2.96+ppc/gcc.html
+# chapter 4.5 "Where's the Template?"
+CODE_CXXFLAGS_OLD = -fno-implicit-templates
+CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VX_OLD_GCC))
+
+#--------------------------------------------------
+# Modules we cannot build with old compiler
+
+PV_MODULES = pv% normativeTypes
+SKIP_BUILDS_5 = $(PV_MODULES)
+SKIP_BUILDS_OLD = $(PV_MODULES)
+SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC))
+SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # no shared libs for vxWorks
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index c60ab95..7ec1fa6 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -18,6 +18,16 @@
 
 -->
 
+<h3>Skipping build of modules and re-enabling vxWorks 5</h3>
+
+<p>Any module can be skipped during the build for a given architecture by setting
+the Makfile variable <tt>SKIP_BUILDS</tt> to a list of patterns matching the
+module directories to skip. For example to skip building any pvAccess related
+modules set <code>SKIP_BUILDS=pv%&nbsp;normativeTypes</code> in the
+CONFIG.Common.&lt;arch&gt; file for that architecture.
+The builds for vxWorks 5 and up to 6.2 do that.
+</p>
+
 <h3>Git Branches Recombined</h3>
 
 <p>The four separate Git branches <tt>core/master</tt>, <tt>libcom/master</tt>,
@@ -28,7 +38,6 @@ more than one of these modules. The layout of the source files has not changed
 at all however, so the source code for libcom, ca and the database are still
 found separately under the module subdirectory.</p>
 
-
 <h1 align="center">EPICS Release 7.0.1.1</h1>
 
 <h3>Changed SIML failure behavior</h3>
diff --git a/modules/ca/src/client/Makefile b/modules/ca/src/client/Makefile
index 6a7f690..8686a8b 100644
--- a/modules/ca/src/client/Makefile
+++ b/modules/ca/src/client/Makefile
@@ -72,6 +72,7 @@ LIBSRCS += comQueSend.cpp
 LIBSRCS += comBuf.cpp
 LIBSRCS += hostNameCache.cpp
 LIBSRCS += msgForMultiplyDefinedPV.cpp
+LIBSRCS_vxWorks += templateInstances.cpp
 
 LIBRARY=ca
 
diff --git a/modules/ca/src/client/templateInstances.cpp b/modules/ca/src/client/templateInstances.cpp
new file mode 100644
index 0000000..c7263c5
--- /dev/null
+++ b/modules/ca/src/client/templateInstances.cpp
@@ -0,0 +1,66 @@
+/*************************************************************************\
+* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+*     National Laboratory.
+* Copyright (c) 2002 The Regents of the University of California, as
+*     Operator of Los Alamos National Laboratory.
+* EPICS BASE Versions 3.13.7
+* and higher are distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution. 
+\*************************************************************************/
+
+/*  
+ *
+ *                              
+ *                    L O S  A L A M O S
+ *              Los Alamos National Laboratory
+ *               Los Alamos, New Mexico 87545
+ *                                  
+ *  Copyright, 1986, The Regents of the University of California.
+ *                                  
+ *           
+ *	Author Jeffrey O. Hill
+ *	[e-mail]
+ *	505 665 1831
+ */
+
+#include "cac.h"
+#include "oldAccess.h"
+#include "repeaterClient.h"
+
+template class chronIntIdResTable < nciu >;
+template class chronIntIdResTable < baseNMIU >;
+template class chronIntIdResTable < CASG >;
+template class resTable < nciu, chronIntId >;
+template class resTable < baseNMIU, chronIntId >;
+template class resTable < CASG, chronIntId >;
+template class resTable < bhe, inetAddrID >;
+template class resTable < tcpiiu, caServerID >;
+template class tsFreeList < bhe, 0x100 >;
+template class tsFreeList < tcpiiu, 32, epicsMutexNOOP >;
+template class tsFreeList < netReadNotifyIO, 1024, epicsMutexNOOP >;
+template class tsFreeList < netWriteNotifyIO, 1024, epicsMutexNOOP >;
+template class tsFreeList < netSubscription, 1024, epicsMutexNOOP >;
+template class tsFreeList < CASG, 128, epicsMutexNOOP  >;
+template class tsFreeList < syncGroupReadNotify, 128, epicsMutexNOOP >;
+template class tsFreeList < syncGroupWriteNotify, 128, epicsMutexNOOP >;
+template class tsFreeList < comBuf, 0x20 >;
+template class tsFreeList < getCallback, 1024, epicsMutexNOOP >;
+template class tsFreeList < getCopy, 1024, epicsMutexNOOP >;
+template class tsFreeList < msgForMultiplyDefinedPV, 16 >;
+template class tsFreeList < nciu, 1024, epicsMutexNOOP>;
+template class tsFreeList < oldChannelNotify, 1024, epicsMutexNOOP >;
+template class tsFreeList < oldSubscription, 1024, epicsMutexNOOP >;
+template class tsFreeList < putCallback, 1024, epicsMutexNOOP >;
+template class tsFreeList < repeaterClient, 0x20 >;
+template class epicsSingleton < localHostName >;
+template unsigned comBuf :: push ( const double * pValue, unsigned nElem );
+template unsigned comBuf :: push ( const float * pValue, unsigned nElem );
+template unsigned comBuf :: push ( const int * pValue, unsigned nElem );
+template unsigned comBuf :: push ( const short * pValue, unsigned nElem );
+template comBuf :: popStatus comBuf :: pop ( unsigned int & returnVal );
+template comBuf :: popStatus comBuf :: pop ( unsigned short & returnVal );
+template comBuf :: popStatus comBuf :: pop ( unsigned char & returnVal );
+template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO
+    (epicsGuard < epicsMutex > &, syncGroupWriteNotify & );
+template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO
+    ( epicsGuard < epicsMutex > &, syncGroupReadNotify & );
diff --git a/modules/database/src/ioc/db/Makefile b/modules/database/src/ioc/db/Makefile
index c6f3355..d3b2f47 100644
--- a/modules/database/src/ioc/db/Makefile
+++ b/modules/database/src/ioc/db/Makefile
@@ -96,4 +96,5 @@ dbCore_SRCS += chfPlugin.c
 dbCore_SRCS += dbState.c
 dbCore_SRCS += dbUnitTest.c
 dbCore_SRCS += dbServer.c
+dbCore_SRCS_vxWorks += templateInstances.cpp
 
diff --git a/modules/database/src/ioc/db/templateInstances.cpp b/modules/database/src/ioc/db/templateInstances.cpp
new file mode 100644
index 0000000..2027016
--- /dev/null
+++ b/modules/database/src/ioc/db/templateInstances.cpp
@@ -0,0 +1,9 @@
+#include "dbCAC.h"
+#include "dbChannelIO.h"
+#include "dbPutNotifyBlocker.h"
+
+template class tsFreeList < dbSubscriptionIO, 256, epicsMutexNOOP >;
+template class tsFreeList < dbChannelIO, 256, epicsMutexNOOP >;
+template class tsFreeList < dbPutNotifyBlocker, 64, epicsMutexNOOP >;
+template class resTable < dbBaseIO, chronIntId >;
+template class chronIntIdResTable < dbBaseIO >;
diff --git a/modules/libcom/test/epicsAtomicTest.cpp b/modules/libcom/test/epicsAtomicTest.cpp
index fd9fc2e..d9a6c57 100644
--- a/modules/libcom/test/epicsAtomicTest.cpp
+++ b/modules/libcom/test/epicsAtomicTest.cpp
@@ -8,6 +8,8 @@
 #include "epicsUnitTest.h"
 #include "testMain.h"
 
+using namespace epics::atomic;
+
 namespace {
 
 template < class T >
@@ -52,7 +54,7 @@ static void add ( void *arg )
     using epics::atomic::increment;
     TestDataAddSub < T > * const pTestData = 
 	    reinterpret_cast < TestDataAddSub < T > * > ( arg );
-    add ( pTestData->m_testValue, TestDataAddSub < T > :: delta  );
+    epics::atomic::add ( pTestData->m_testValue, TestDataAddSub < T > :: delta  );
     increment ( pTestData->m_testIterations );
 }