fix for RHEL8

(non-portable) CPU-affinity extensions only available in glibc 2.4 and
  higher.

Makefile

@@ -24,3 +24,17 @@ config_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
 
+
+ifneq ($(INSTALL_LOCATION),$(TOP))
+UNINSTALL_DIRS += $(INSTALL_LOCATION)/src
+copysrc:
+	tar cf - --exclude=CVS --exclude=O.* src | tar xf - -C $(INSTALL_LOCATION)
+else
+copysrc:
+	@echo "Not doing anything (INSTALL_LOCATION==TOP)"
+endif
+
+tar:
+	tar cfjP epics_base-$(EPICS_VERSION_NUMBER).tar.bz2 --exclude=*.o $(INSTALL_LOCATION)
+
+.PHONY: copysrc tar

configure/CONFIG.gnuCommon

@@ -27,7 +27,7 @@ GPROF_CFLAGS_YES = -pg
 CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
 WARN_CFLAGS_YES = -Wall
 WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O3
+OPT_CFLAGS_YES = -O3 -g
 OPT_CFLAGS_NO = -g
 
 PROF_CXXFLAGS_YES = -p
@@ -35,7 +35,7 @@ GPROF_CXXFLAGS_YES = -pg
 CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 WARN_CXXFLAGS_YES = -Wall
 WARN_CXXFLAGS_NO = -w
-OPT_CXXFLAGS_YES = -O3
+OPT_CXXFLAGS_YES = -O3 -g
 OPT_CXXFLAGS_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))

configure/CONFIG_BASE

@@ -35,7 +35,7 @@ EPICS_BASE_HOST_LIBS += ca Com
 # Version number for base shared libraries (and win32 products)
 
 ifdef BASE_TOP
-SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
+#SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
 PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
 endif # BASE_TOP
 

configure/CONFIG_ENV

@@ -54,3 +54,6 @@ EPICS_IOC_LOG_PORT=7004
 EPICS_CMD_PROTO_PORT=
 EPICS_AR_PORT=7002
 
+# libCom
+# Whether to enable priority inheritance -- must be set to Y[ES]/y[es]/T[RUE]/t[rue]/1
+EPICS_MUTEX_USE_PRIORITY_INHERITANCE="NO"

configure/CONFIG_SITE

@@ -170,7 +170,7 @@ CROSS_WARN=YES
 #  NOTE: Set to YES only if you have existing R3.13 extensions to be
 #  built with this base
 #
-#COMPAT_TOOLS_313=YES
+COMPAT_TOOLS_313=YES
 
 #  Create and/or install files for R3.13 ioc application and extension builds?
 #  must be either YES or NO
@@ -178,19 +178,20 @@ CROSS_WARN=YES
 #  NOTE: Set to YES only if you have existing R3.13 ioc applications
 #  and extensions to be built with this base
 #
-COMPAT_313=NO
+COMPAT_313=YES
 
 #  Installation directory
 # If you don't want to install into $(TOP) dir then
 # define INSTALL_LOCATION here
 #INSTALL_LOCATION=<fullpathname>
+INSTALL_LOCATION=/usr/local/epics/base-3.14.12
 
 # Use POSIX thread priority scheduling (YES or NO)
 USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES
 
 #  Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools
-EPICS_SITE_VERSION =
+EPICS_SITE_VERSION=$(shell $(PERL) -MPOSIX -e 'print strftime "%Y-%m-%d_$(shell git describe --tags --dirty)", localtime')
 
 # For GNU compiler, use pipes rather than temporary files for communication 
 # between the various stages of compilation.

configure/RULES_BUILD

@@ -438,6 +438,9 @@ ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 	ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 endif # SHRLIB_VERSION
+else
+	@$(RM) $@.3.14
+	ln -s $< $@.3.14
 endif # SHRLIB_SUFFIX
 
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))

configure/os/CONFIG.Common.RHEL7-x86_64

@@ -0,0 +1,2 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64

configure/os/CONFIG.Common.RHEL7-x86_64-clang

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang

configure/os/CONFIG.Common.RHEL8-x86_64

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64

configure/os/CONFIG.Common.RHEL8-x86_64-clang

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang

configure/os/CONFIG.Common.SL5-x86

@@ -0,0 +1,6 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+ARCH_DEP_CFLAGS += -march=i686

configure/os/CONFIG.Common.SL5-x86_64

@@ -0,0 +1,4 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES

configure/os/CONFIG.Common.SL6-x86

@@ -0,0 +1,4 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86
+
+ARCH_DEP_CFLAGS += -march=i686

configure/os/CONFIG.Common.SL6-x86_64

@@ -0,0 +1,2 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64

configure/os/CONFIG.Common.SL6-x86_64-clang

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang

configure/os/CONFIG.Common.T2-ppc604

@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 5.5
+WIND_BASE = /afs/psi.ch/project/vxworks/Tornado2.2.1
+
+#there is a problem with our ccppc and optimization
+# -O0 works, -O and -O1 and higher are buggy
+OPT_CFLAGS_YES = -O0
+OPT_CXXFLAGS_YES = -O0

configure/os/CONFIG.Common.V62-ppc604

@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.2

configure/os/CONFIG.Common.V63-ppc603

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized

configure/os/CONFIG.Common.V63-ppc604

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized

configure/os/CONFIG.Common.V66-ppc603

@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.6

configure/os/CONFIG.Common.V66-ppc604

@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.6

configure/os/CONFIG.Common.V67-ppc604

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.7
+
+#needed when including memPartLib.h, e.g. through moduleLib.h or loadLib.h
+ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>'

configure/os/CONFIG.Common.V69-ppc32

@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
+VXWORKS_VERSION = 6.9
+#export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

configure/os/CONFIG.Common.V69-ppc604

@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.9
+#export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

configure/os/CONFIG.Common.eldk42-ppc4xxFP

@@ -0,0 +1,22 @@
+# DeltaTau PowerPMAC with ELDK 4.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+ARCH_CLASS = ppc
+
+ELDK=/opt/eldk-4.2
+GNU_TARGET=ppc_4xxFP
+GNU_DIR=$(ELDK)/usr
+
+# This cross tool chain is installed in a somehow weired way
+# Without the following lines it does not work on RHEL7
+# but it worked on SL6
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2 
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux 
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward 
+
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib

configure/os/CONFIG.Common.eldk51-ppc4xxSF

@@ -0,0 +1,14 @@
+# Virtex FPGA embedded Processor with ELDK 5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.1
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-4xx-softfloat
+GNU_ARCH = ppc405-linux
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)

configure/os/CONFIG.Common.eldk52-e500v2

@@ -0,0 +1,15 @@
+# IOxOS IFC1210 with ELDK 5.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.2
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-e500v2
+GNU_ARCH = ppce500v2-linux-gnuspe
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =

configure/os/CONFIG.Common.eldk53-ppc4xxFP

@@ -0,0 +1,21 @@
+# DeltaTau PowerPMAC with ELDK 5.3
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.3
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_ARCH = ppc440e-linux
+SDKTARGETSYSROOT=$(SDK_DIR)/powerpc-4xx/sysroots
+GNU_DIR = $(SDKTARGETSYSROOT)/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=powerpc-linux
+
+ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
+ARCH_DEP_CPPFLAGS += --sysroot=$(SDKTARGETSYSROOT)/$(GNU_ARCH)
+ARCH_DEP_LDFLAGS =   --sysroot=$(SDKTARGETSYSROOT)/$(GNU_ARCH)
+AS=$(GNU_BIN)/$(GNU_TARGET)-as

configure/os/CONFIG.Common.fslqoriq20-e6500_64

@@ -0,0 +1,23 @@
+# IOxOS IFC1211 and IFC14xx with Freescale QorIQ 2.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = fslsdk
+SDK_DIR = /opt/fsl-qoriq/2.0
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = ppc64e6500-fsl-linux
+GNU_TARGET = powerpc64-fsl-linux
+SDKTARGETSYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+ARCH_DEP_CFLAGS = -mcpu=e6500 -m64 -mhard-float
+ARCH_DEP_LDFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+
+# warning -O2 and higher are broken!
+#OPT_CFLAGS_YES = -O1
+#OPT_CXXFLAGS_YES = -O1

configure/os/CONFIG.Common.linux-clang

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++

configure/os/CONFIG.Common.linuxCommon

@@ -42,3 +42,5 @@ LDLIBS_READLINE_CURSES = -lreadline -lcurses
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.linuxCommon
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).linuxCommon
+
+CODE_CPPFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.moxa42-armv6l

@@ -0,0 +1,16 @@
+# Moxa DA-66x with SDK 4.2 and ARM7 processor
+
+# Include definitions common to all Linux ARM targets
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+
+GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/arm-linux-4.4.2-v4
+GNU_TARGET=arm
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# suppress note "the mangling of 'va_list' has changed in GCC 4.4"
+ARCH_DEP_CXXFLAGS += -Wno-psabi
+
+ARCH_DEP_CFLAGS += -funwind-tables

configure/os/CONFIG.Common.mvl40-xscale_be

@@ -0,0 +1,12 @@
+# Moxa DA-66x with Montavista Linux 4.0
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_CURSES
+
+ARCH_CLASS = xscale
+
+GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-linuxeabi
+
+ARCH_DEP_CFLAGS += -funwind-tables

configure/os/CONFIG.Common.nilrt7-armv7a

@@ -0,0 +1,18 @@
+# National Instruments CompactRIO running LabView RT 19.5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm
+
+GNU_TARGET = arm-linux-gnu
+
+SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
+
+ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
+ARCH_DEP_CPPFLAGS += --sysroot=$(SYSROOT)
+ARCH_DEP_CPPFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/
+ARCH_DEP_CPPFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/
+ARCH_DEP_LDFLAGS  += --sysroot=$(SYSROOT)
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES

configure/os/CONFIG.Common.raspbian-arm

@@ -0,0 +1,41 @@
+# RaspberryPi with github.com/raspberrypi/tools toolchain
+# Tested on:
+# * Raspberry 3B+ Raspbian 9
+# * Raspberry 2   Raspbian 7
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+# Using readline:
+# Due to missing/messed up libs in the toolchain, readline needs copies of
+# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs
+# /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
+# $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
+# and manually created links libtinfo.so.5 and libreadline.so.
+# For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
+# libtinfo.so.5 is in the way. Remove it.
+# (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
+# Also copy /usr/include/readline/ directory from some readline 6 installation
+# to $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/usr/include/
+
+ARCH_CLASS = arm
+
+SDK_DIR = /opt/raspberrypi/arm-bcm2708
+
+# Available SDK_TARGETs:
+
+# gcc 4.8.3 for 32 bit hosts with GLIBC 2.3 or higher
+SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
+
+# gcc 4.8.3 for 64 bit hosts with GLIBC 2.14 or higher
+# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
+
+# gcc 4.7.1 for 64 bit hosts with GLIBC 2.8 or higher
+# SDK_TARGET = arm-linux-gnueabihf
+
+# gcc 4.7.1 for 32 bit hosts with GLIBC 2.4 or higher
+# SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi
+# SDK_TARGET = arm-bcm2708-linux-gnueabi
+
+GNU_DIR = $(SDK_DIR)/$(SDK_TARGET)
+GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)

configure/os/CONFIG.Common.vxWorks-ppc604

@@ -14,9 +14,11 @@ ARCH_CLASS = ppc
 
 # Architecture specific build flags
 ARCH_DEP_CPPFLAGS = -DCPU=PPC604
-ARCH_DEP_CFLAGS_2 = -mcpu=604 -mstrict-align -mno-implicit-fp
-ARCH_DEP_CFLAGS_3 = -mcpu=604 -mstrict-align -mno-implicit-fp
-ARCH_DEP_CFLAGS_4 = -mcpu=604 -mstrict-align -fno-implicit-fp
-ARCH_DEP_CFLAGS = $(ARCH_DEP_CFLAGS_$(VX_GNU_MAJOR_VERSION))
+ARCH_DEP_CFLAGS   = -mcpu=604 -mstrict-align
+
+CODE_CFLAGS_2 = -mno-implicit-fp
+CODE_CFLAGS_3 = -mno-implicit-fp
+CODE_CFLAGS_4 = -fno-implicit-fp
+CODE_CFLAGS += $(CODE_CFLAGS_$(VX_GNU_MAJOR_VERSION))
 
 GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorksCommon

@@ -161,7 +161,9 @@ OPT_CXXFLAGS_YES = -O2
 
 #--------------------------------------------------
 # code flags
-CODE_CFLAGS =
+CODE_CPPFLAGS_6 = $(CODE_CPPFLAGS_$(VXWORKS_VERSION))
+CODE_CPPFLAGS_6 += -fno-strict-aliasing
+CODE_CPPFLAGS += $(CODE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
 #
 # For vxWorks versions before 6.3 we need this g++ compiler flag
 CODE_CXXFLAGS_5 = -fno-implicit-templates
@@ -169,7 +171,7 @@ 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))
+CODE_CXXFLAGS += $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # no shared libs for vxWorks

configure/os/CONFIG.Common.yocto21-aarch64

@@ -0,0 +1,18 @@
+# XILINX Zynq with Yocto 2.1 / Petalinux toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm64
+
+SDK = petalinux
+SDK_DIR = /opt/petalinux-gfa/2018.1
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = aarch64-xilinx-linux
+GNU_TARGET = $(SDK_TARGET)
+SDKTARGETSYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = --sysroot=$(SDKTARGETSYSROOT)
+ARCH_DEP_LDFLAGS = --sysroot=$(SDKTARGETSYSROOT)

configure/os/CONFIG.Cross_64.RHEL7-x86_64

@@ -0,0 +1,21 @@
+# "cross compile" for RHEL7-x86_64 on other 64 bit Linux version
+# Expects RHEL7 RPMs c++ and readline-devel installed in $(SYSROOT)
+# This can be installed on RHEL7 with:
+#    yum install --installroot=$(SYSROOT) <packages>
+# (Assuming $(SYSROOT) is on a shared network volume.)
+# Optionally use a newer toolset (installed on $(SYSROOT)).
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+
+SYSROOT          = /opt/RHEL7
+TOOLSET_LOCATION = /opt/rh
+
+# Do NOT set GNU_BIN (or else ...)!
+TOOLSET_DIR      = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
+CC  = $(SYSROOT)$(TOOLSET_DIR)/bin/gcc
+CCC = $(SYSROOT)$(TOOLSET_DIR)/bin/g++
+# Set LD_LIBRARY_PATH and BFLAG only with TOOLSET
+LD_LIBRARY_PATH  = $(if $(TOOLSET),$(SYSROOT)$(TOOLSET_DIR)/lib64)
+BFLAG            = $(if $(TOOLSET),-B$(SYSROOT)$(TOOLSET_DIR)/bin)
+TARGET_CPPFLAGS += --sysroot=$(SYSROOT) $(BFLAG)
+TARGET_LDFLAGS  += --sysroot=$(SYSROOT) $(BFLAG)

configure/os/CONFIG.RHEL7-x86_64.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.RHEL7-x86_64.SL6-x86

@@ -0,0 +1,14 @@
+# "cross compile" for older Linux version
+# Use older compiler and older libraries
+# Used packages:
+# compat-gcc-44-c++-4.4
+# compat-gcc-44-4.4
+# compat-glibc-headers-2.12-4
+# It was neccessary to install 32 bit compatibility libraries manually
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
+TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib 
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo

configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64

@@ -0,0 +1,14 @@
+# "cross compile" for older Linux version
+# Use older compiler and older libraries
+# Used packages:
+# compat-gcc-44-c++-4.4
+# compat-gcc-44-4.4
+# compat-glibc-headers-2.12-4
+# compat-glibc-2.12-4
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
+TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib64
+LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo

configure/os/CONFIG.RHEL8-x86_64.Common

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Cross_64.RHEL7-x86_64

configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a

@@ -0,0 +1 @@
+GNU_BIN=/opt/RHEL7/bin

configure/os/CONFIG.SL5-x86.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86.Common

configure/os/CONFIG.SL5-x86.SL5-x86

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.SL5-x86_64.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.SL5-x86_64.SL5-x86_64

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.SL6-x86.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86.Common

configure/os/CONFIG.SL6-x86.SL6-x86

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.SL6-x86_64.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.SL6-x86_64.SL6-x86

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.SL6-x86_64.SL6-x86_64

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -0,0 +1,4 @@
+COMMANDLINE_LIBRARY = READLINE
+ifeq ($(filter SL% RHEL%,$(T_A)),)
+VALID_BUILDS = Ioc
+endif

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -32,5 +32,6 @@ VXWORKS_VERSION = 6.9
 
 #WIND_BASE = /usr/local/vw/tornado202p1
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
+WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

@@ -0,0 +1,20 @@
+# Build 32 bit version as a cross architecture
+#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
+
+# Build for old SL6 64 bit
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
+
+# Build for old SL6 32 bit
+#CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+
+# Zynq
+CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
+
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common

configure/os/CONFIG_SITE.RHEL8-x86_64.Common

@@ -0,0 +1,15 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Improved error checking with clang
+# Does not compile with clang 13!
+#CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang
+
+# Build for old RHEL7 64 bit
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
+
+# Zynq
+CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

configure/os/CONFIG_SITE.SL5-x86.Common

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common

configure/os/CONFIG_SITE.SL5-x86_64.Common

@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+# Build 32 bit version as a cross architecture
+CROSS_COMPILER_TARGET_ARCHS += SL5-x86

configure/os/CONFIG_SITE.SL6-x86.Common

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common

configure/os/CONFIG_SITE.SL6-x86_64.Common

@@ -0,0 +1,7 @@
+# Build 32 bit version as a cross architecture
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+
+# Improved error checking with clang
+#CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64-clang
+
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common

configure/os/CONFIG_SITE.linux-x86.Common

@@ -3,7 +3,46 @@
 # Site override definitions for linux-x86 host builds
 #-------------------------------------------------------
 
-# JBA test override values
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
-#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167
+GNU_HOST_ARCH=i686
+GNU_HOST_OS=linux
+
+# LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
+LD_LIBRARY_PATH=
+
+# vxWorks 5.5 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
+
+# vxWorks 6.7 for MVxxxx boards
+#CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
+
+# vxWorks 6.9 for MVxxxx boards
+CROSS_COMPILER_TARGET_ARCHS += V69-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V69-ppc32
+
+# NI compact RIO
+CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
+
+# MOXA montavista linux
+CROSS_COMPILER_TARGET_ARCHS += mvl40-xscale_be
+
+# MOXA SDK 4.2
+CROSS_COMPILER_TARGET_ARCHS += moxa42-armv6l
+
+# Virtex embedded PPC
+CROSS_COMPILER_TARGET_ARCHS += eldk51-ppc4xxSF
+
+# IOxOS IFC1210
+CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
+
+# DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
+CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
+
+# Test other vxWorks versions
+#CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
+#CROSS_COMPILER_TARGET_ARCHS += V66-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V63-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
+
+# Raspberry Pi
+CROSS_COMPILER_TARGET_ARCHS += raspbian-arm

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -7,3 +7,9 @@
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
 
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+
+GNU_HOST_ARCH_64=x86_64
+
+# IOxOS IFC1211
+CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64

documentation/RELEASE_NOTES.html

@@ -1415,6 +1415,10 @@ giving correct initial monitor behavior in some circumstances.</p>
 
 <p>Fixed a crash when ALG (algorithm) was changed to Average at runtime.</p>
 
+<h4>Named Soft Events</h4>
+
+<p>Soft events can now be meaningful strings instead of numbers 1-255. 
+
 <h4>configure/RELEASE Enhancements</h4>
 
 <p>Variable definitions in a <tt>configure/RELEASE</tt> file may now use the

src/ca/access.cpp

@@ -765,6 +765,12 @@ void epicsShareAPI ca_detach_context ()
     }
 }
 
+// backward compatibility with 3.14.8
+extern "C" void _Z17ca_detach_contextv ()
+{
+    ca_detach_context();
+}
+
 int epicsShareAPI ca_preemtive_callback_is_enabled ()
 {
     ca_client_context *pcac = (ca_client_context *) epicsThreadPrivateGet ( caClientContextId );

src/cas/build/Makefile

@@ -26,6 +26,8 @@ SRC_DIRS += $(CA)
 INC += casdef.h
 INC += casEventMask.h
 INC += caNetAddr.h
+INC += casCtx.h
+INC += caHdrLargeArray.h
 
 LIBSRCS += caServer.cc
 LIBSRCS += caServerI.cc

src/catools/camonitor.c

@@ -38,6 +38,7 @@ static unsigned long reqElems = 0;
 static unsigned long eventMask = DBE_VALUE | DBE_ALARM;   /* Event mask used */
 static int floatAsString = 0;                             /* Flag: fetch floats as string */
 static int nConn = 0;                                     /* Number of connected PVs */
+static int caDebug = 0;
 
 
 void usage (void)
@@ -83,6 +84,9 @@ void usage (void)
     "  -0b:      Print as binary number\n"
     "Alternate output field separator:\n"
     "  -F <ofs>: Use <ofs> to separate fields in output\n"
+    "Debuging:\n"
+    "  Default:  Do not print debug messages\n"
+    "  -d:       Print debug messages to stderr\n"
     "\n"
     "Example: camonitor -f8 my_channel another_channel\n"
     "  (doubles are printed as %%f with precision of 8)\n\n"
@@ -106,6 +110,11 @@ static void event_handler (evargs args)
 {
     pv* pv = args.usr;
 
+    if (caDebug)
+    {
+        fprintf(stderr, "event_handler(%s) %s[%ld]\n %s\n",
+            ca_name(args.chid), dbr_type_to_text(args.type), args.count, ca_message(args.status));
+    }
     pv->status = args.status;
     if (args.status == ECA_NORMAL)
     {
@@ -134,9 +143,30 @@ static void event_handler (evargs args)
 static void connection_handler ( struct connection_handler_args args )
 {
     pv *ppv = ( pv * ) ca_puser ( args.chid );
+    if (caDebug)
+    {
+        fprintf(stderr, "connection_handler(%s) %s\n",
+            ca_name(args.chid),
+            args.op == CA_OP_CONN_UP ? "UP" :
+            args.op == CA_OP_CONN_DOWN ? "DOWN" :
+            "unknown op");
+    }
     if ( args.op == CA_OP_CONN_UP ) {
         nConn++;
-        if (!ppv->onceConnected) {
+        
+        if (ppv->onceConnected && ppv->dbfType != ca_field_type(ppv->chid)) {
+            /* Data type has changed. Rebuild connection with new type. */
+            if (caDebug)
+            {
+                fprintf(stderr, "  Data type changed %s -> %s\n",
+                    dbr_type_to_text(ppv->dbfType),
+                    dbr_type_to_text(ca_field_type(ppv->chid)));
+            }
+            ca_clear_subscription(ppv->evid);
+            ppv->evid = NULL;
+        }
+            
+        if (!ppv->evid) {
             ppv->onceConnected = 1;
                                 /* Set up pv structure */
                                 /* ------------------- */
@@ -167,7 +197,7 @@ static void connection_handler ( struct connection_handler_args args )
                                                 eventMask,
                                                 event_handler,
                                                 (void*)ppv,
-                                                NULL);
+                                                &ppv->evid);
         }
     }
     else if ( args.op == CA_OP_CONN_DOWN ) {
@@ -209,11 +239,14 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
-    while ((opt = getopt(argc, argv, ":nhm:sSe:f:g:l:#:0:w:t:p:F:")) != -1) {
+    while ((opt = getopt(argc, argv, ":ndhm:sSe:f:g:l:#:0:w:t:p:F:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
             usage();
             return 0;
+        case 'd':
+            caDebug=1;
+            break;
         case 'n':               /* Print ENUM as index numbers */
             enumAsNr=1;
             break;

src/catools/tool_lib.h

@@ -78,6 +78,7 @@ typedef struct
     epicsTimeStamp tsPreviousS;
     char firstStampPrinted;
     char onceConnected;
+    evid  evid;
 } pv;
 
 

src/db/Makefile

@@ -33,6 +33,7 @@ INC += dbIocRegister.h
 # The following go away what old database access goes away
 INC += db_access_routines.h
 INC += db_convert.h
+INC += dbCaPvt.h
 
 DBDINC += menuAlarmSevr
 DBDINC += menuAlarmStat

src/db/callback.c

@@ -110,9 +110,7 @@ static void callbackShutdown(void *arg)
     int i;
 
     for (i = 0; i < NUM_CALLBACK_PRIORITIES; i++) {
-        int lockKey = epicsInterruptLock();
         int ok = epicsRingPointerPush(callbackQ[i], &exitCallback);
-        epicsInterruptUnlock(lockKey);
         epicsEventSignal(callbackSem[i]);
         if (ok) epicsEventWait(startStopEvent);
     }
@@ -128,7 +126,7 @@ static void callbackInitOnce(void *arg)
         epicsThreadId tid;
 
         callbackSem[i] = epicsEventMustCreate(epicsEventEmpty);
-        callbackQ[i] = epicsRingPointerCreate(callbackQueueSize);
+        callbackQ[i] = epicsRingPointerLockedCreate(callbackQueueSize);
         if (callbackQ[i] == 0)
             cantProceed("epicsRingPointerCreate failed for %s\n",
                 threadName[i]);
@@ -154,7 +152,6 @@ void callbackRequest(CALLBACK *pcallback)
 {
     int priority;
     int pushOK;
-    int lockKey;
 
     if (!pcallback) {
         epicsInterruptContextMessage("callbackRequest: pcallback was NULL\n");
@@ -167,9 +164,7 @@ void callbackRequest(CALLBACK *pcallback)
     }
     if (ringOverflow[priority]) return;
 
-    lockKey = epicsInterruptLock();
     pushOK = epicsRingPointerPush(callbackQ[priority], pcallback);
-    epicsInterruptUnlock(lockKey);
 
     if (!pushOK) {
         epicsInterruptContextMessage(fullMessage[priority]);

src/db/dbAccess.c

@@ -675,6 +675,8 @@ long epicsShareAPI dbNameToAddr(const char *pname, DBADDR *paddr)
     status = dbFindFieldPart(&dbEntry, &pname);
     if (status == S_dbLib_fieldNotFound)
         status = dbGetAttributePart(&dbEntry, &pname);
+    if (status == S_dbLib_fieldNotFound)
+        status = dbFindInfoPart(&dbEntry, &pname);
     if (status) goto finish;
 
     paddr->precord = dbEntry.precnode->precord;

src/db/dbCommon.dbd

@@ -43,10 +43,11 @@
 		special(SPC_SCAN)
 		interest(1)
 	}
-	field(EVNT,DBF_SHORT) {
-		prompt("Event Number")
+	field(EVNT,DBF_STRING) {
+		prompt("Event Name")
 		promptgroup(GUI_SCAN)
 		special(SPC_SCAN)
+		size(40)
 		interest(1)
 	}
 	field(TSE,DBF_SHORT) {

src/db/dbEvent.c

@@ -90,7 +90,8 @@ struct event_user {
     epicsMutexId        lock;
     epicsEventId        ppendsem;       /* Wait while empty */
     epicsEventId        pflush_sem;     /* wait for flush */
-        
+    epicsEventId        pexitsem;       /* wait for event task to join */
+
     EXTRALABORFUNC      *extralabor_sub;/* off load to event task */
     void                *extralabor_arg;/* parameter to above */
     
@@ -293,36 +294,45 @@ dbEventCtx epicsShareAPI db_init_events (void)
     if (!evUser) {
         return NULL;
     }
-    
+
+    /* Flag will be cleared when event task starts */
+    evUser->pendexit = TRUE;
+
     evUser->firstque.evUser = evUser;
     evUser->firstque.writelock = epicsMutexCreate();
-    if (!evUser->firstque.writelock) {
-        return NULL;
-    }
+    if (!evUser->firstque.writelock)
+        goto fail;
 
     evUser->ppendsem = epicsEventCreate(epicsEventEmpty);
-    if (!evUser->ppendsem) {
-        epicsMutexDestroy (evUser->firstque.writelock);
-        return NULL;
-    }    
+    if (!evUser->ppendsem)
+        goto fail;
     evUser->pflush_sem = epicsEventCreate(epicsEventEmpty);
-    if (!evUser->pflush_sem) {
-        epicsMutexDestroy (evUser->firstque.writelock);
-        epicsEventDestroy (evUser->ppendsem);
-        return NULL;
-    }
+    if (!evUser->pflush_sem)
+        goto fail;
     evUser->lock = epicsMutexCreate();
-    if (!evUser->lock) {
-        epicsMutexDestroy (evUser->firstque.writelock);
-        epicsEventDestroy (evUser->pflush_sem);
-        epicsEventDestroy (evUser->ppendsem);
-        return NULL;
-    }
+    if (!evUser->lock)
+        goto fail;
+    evUser->pexitsem = epicsEventCreate(epicsEventEmpty);
+    if (!evUser->pexitsem)
+        goto fail;
 
     evUser->flowCtrlMode = FALSE;
     evUser->extraLaborBusy = FALSE;
     evUser->pSuicideEvent = NULL;
     return (dbEventCtx) evUser;
+fail:
+    if(evUser->lock)
+        epicsMutexDestroy (evUser->lock);
+    if(evUser->firstque.writelock)
+        epicsMutexDestroy (evUser->firstque.writelock);
+    if(evUser->ppendsem)
+        epicsEventDestroy (evUser->ppendsem);
+    if(evUser->pflush_sem)
+        epicsEventDestroy (evUser->pflush_sem);
+    if(evUser->pexitsem)
+        epicsEventDestroy (evUser->pexitsem);
+    freeListFree(dbevEventUserFreeList,evUser);
+    return NULL;
 }
 
 /*
@@ -346,10 +356,26 @@ void epicsShareAPI db_close_events (dbEventCtx ctx)
      * hazardous to the system's health.
      */
     epicsMutexMustLock ( evUser->lock );
-    evUser->pendexit = TRUE;
+    if(!evUser->pendexit) { /* event task running */
+        evUser->pendexit = TRUE;
+        epicsMutexUnlock ( evUser->lock );
+
+        /* notify the waiting task */
+        epicsEventSignal(evUser->ppendsem);
+        /* wait for task to exit */
+        epicsEventMustWait(evUser->pexitsem);
+
+        epicsMutexMustLock ( evUser->lock );
+    }
+
     epicsMutexUnlock ( evUser->lock );
-    /* notify the waiting task */
-    epicsEventSignal(evUser->ppendsem);
+
+    epicsEventDestroy(evUser->pexitsem);
+    epicsEventDestroy(evUser->ppendsem);
+    epicsEventDestroy(evUser->pflush_sem);
+    epicsMutexDestroy(evUser->lock);
+
+    freeListFree(dbevEventUserFreeList, evUser);
 }
 
 /*
@@ -964,6 +990,7 @@ static void event_task (void *pParm)
     } while( ! pendexit );
 
     epicsMutexDestroy(evUser->firstque.writelock);
+    evUser->firstque.writelock = (epicsMutexId)0xdeadbeef;
 
     {
         struct event_que    *nextque;
@@ -972,19 +999,16 @@ static void event_task (void *pParm)
         while(ev_que){ 
             nextque = ev_que->nextque;
             epicsMutexDestroy(ev_que->writelock);
+            ev_que->writelock = (epicsMutexId)0xdeadbeef;
             freeListFree(dbevEventQueueFreeList, ev_que);
             ev_que = nextque;
         }
     }
 
-    epicsEventDestroy(evUser->ppendsem);
-    epicsEventDestroy(evUser->pflush_sem);
-    epicsMutexDestroy(evUser->lock);
-
-    freeListFree(dbevEventUserFreeList, evUser);
-
     taskwdRemove(epicsThreadGetIdSelf());
 
+    epicsEventSignal(evUser->pexitsem);
+
     return;
 }
 
@@ -1008,7 +1032,6 @@ int epicsShareAPI db_start_events (
          return DB_EVENT_OK;
      }
 
-     evUser->pendexit = FALSE;
      evUser->init_func = init_func;
      evUser->init_func_arg = init_func_arg;
      if (!taskname) {
@@ -1022,6 +1045,7 @@ int epicsShareAPI db_start_events (
          epicsMutexUnlock ( evUser->lock );
          return DB_EVENT_ERROR;
      }
+     evUser->pendexit = FALSE;
      epicsMutexUnlock ( evUser->lock );
      return DB_EVENT_OK;
 }

src/db/dbIocRegister.c

@@ -277,16 +277,26 @@ static void scanpplCallFunc(const iocshArgBuf *args)
 { scanppl(args[0].dval);}
 
 /* scanpel */
-static const iocshArg scanpelArg0 = { "event number",iocshArgInt};
+static const iocshArg scanpelArg0 = { "event name",iocshArgString};
 static const iocshArg * const scanpelArgs[1] = {&scanpelArg0};
 static const iocshFuncDef scanpelFuncDef = {"scanpel",1,scanpelArgs};
 static void scanpelCallFunc(const iocshArgBuf *args)
-{ scanpel(args[0].ival);}
+{ scanpel(args[0].sval);}
 
 /* scanpiol */
 static const iocshFuncDef scanpiolFuncDef = {"scanpiol",0};
 static void scanpiolCallFunc(const iocshArgBuf *args) { scanpiol();}
 
+/* postEvent */
+static const iocshArg postEventArg0 = { "event name",iocshArgString};
+static const iocshArg * const postEventArgs[1] = {&postEventArg0};
+static const iocshFuncDef postEventFuncDef = {"postEvent",1,postEventArgs};
+static void postEventCallFunc(const iocshArgBuf *args)
+{
+    EVENTPVT pel = eventNameToHandle(args[0].sval);
+    postEvent(pel);
+}
+
 /* callbackSetQueueSize */
 static const iocshArg callbackSetQueueSizeArg0 = { "bufsize",iocshArgInt};
 static const iocshArg * const callbackSetQueueSizeArgs[1] =
@@ -340,6 +350,7 @@ void epicsShareAPI dbIocRegister(void)
     iocshRegister(&scanOnceSetQueueSizeFuncDef,scanOnceSetQueueSizeCallFunc);
     iocshRegister(&scanpplFuncDef,scanpplCallFunc);
     iocshRegister(&scanpelFuncDef,scanpelCallFunc);
+    iocshRegister(&postEventFuncDef,postEventCallFunc);
     iocshRegister(&scanpiolFuncDef,scanpiolCallFunc);
 
     iocshRegister(&callbackSetQueueSizeFuncDef,callbackSetQueueSizeCallFunc);

src/db/dbScan.c

@@ -19,12 +19,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
-#include <math.h>
+#include <ctype.h>
 
 #include "epicsStdioRedirect.h"
+#include "epicsString.h"
 #include "dbDefs.h"
 #include "ellLib.h"
 #include "taskwd.h"
+#include "epicsMath.h"
 #include "epicsMutex.h"
 #include "epicsEvent.h"
 #include "epicsExit.h"
@@ -105,13 +107,14 @@ static char *priorityName[NUM_CALLBACK_PRIORITIES] = {
 
 /* EVENT */
 
-#define MAX_EVENTS 256
-typedef struct event_scan_list {
-    CALLBACK            callback;
-    scan_list           scan_list;
-} event_scan_list;
-static event_scan_list *pevent_list[NUM_CALLBACK_PRIORITIES][MAX_EVENTS];
-
+typedef struct event_list {
+    CALLBACK            callback[NUM_CALLBACK_PRIORITIES];
+    scan_list           scan_list[NUM_CALLBACK_PRIORITIES];
+    struct event_list   *next;
+    char                eventname[1]; /* actually arbitrary size */
+} event_list;
+static event_list * volatile pevent_list[256];
+static epicsMutexId event_lock;
 
 /* IO_EVENT*/
 
@@ -219,35 +222,19 @@ void scanAdd(struct dbCommon *precord)
         recGblRecordError(-1, (void *)precord,
             "scanAdd detected illegal SCAN value");
     } else if (scan == menuScanEvent) {
-        int evnt;
+        char* eventname;
         int prio;
-        event_scan_list *pesl;
+        event_list *pel;
 
-        evnt = precord->evnt;
-        if (evnt < 0 || evnt >= MAX_EVENTS) {
-            recGblRecordError(S_db_badField, (void *)precord,
-                "scanAdd detected illegal EVNT value");
-            precord->scan = menuScanPassive;
-            return;
-        }
+        eventname = precord->evnt;
         prio = precord->prio;
         if (prio < 0 || prio >= NUM_CALLBACK_PRIORITIES) {
             recGblRecordError(-1, (void *)precord,
                 "scanAdd: illegal prio field");
-            precord->scan = menuScanPassive;
             return;
         }
-        pesl = pevent_list[prio][evnt];
-        if (pesl == NULL) {
-            pesl = dbCalloc(1, sizeof(event_scan_list));
-            pevent_list[prio][evnt] = pesl;
-            pesl->scan_list.lock = epicsMutexMustCreate();
-            callbackSetCallback(eventCallback, &pesl->callback);
-            callbackSetPriority(prio, &pesl->callback);
-            callbackSetUser(pesl, &pesl->callback);
-            ellInit(&pesl->scan_list.list);
-        }
-        addToList(precord, &pesl->scan_list);
+        pel = eventNameToHandle(eventname);
+        if (pel) addToList(precord, &pel->scan_list[prio]);
     } else if (scan == menuScanI_O_Intr) {
         io_scan_list *piosl = NULL;
         int prio;
@@ -304,31 +291,18 @@ void scanDelete(struct dbCommon *precord)
         recGblRecordError(-1, (void *)precord,
             "scanDelete detected illegal SCAN value");
     } else if (scan == menuScanEvent) {
-        int evnt;
         int prio;
-        event_scan_list *pesl;
+        event_list *pel;
         scan_list *psl = 0;
 
-        evnt = precord->evnt;
-        if (evnt < 0 || evnt >= MAX_EVENTS) {
-            recGblRecordError(S_db_badField, (void *)precord,
-                "scanAdd detected illegal EVNT value");
-            precord->scan = menuScanPassive;
-            return;
-        }
         prio = precord->prio;
         if (prio < 0 || prio >= NUM_CALLBACK_PRIORITIES) {
             recGblRecordError(-1, (void *)precord,
-                "scanAdd: illegal prio field");
-            precord->scan = menuScanPassive;
+                "scanDelete detected illegal PRIO field");
             return;
         }
-        pesl = pevent_list[prio][evnt];
-        if (pesl) psl = &pesl->scan_list;
-        if (!pesl || !psl) 
-            recGblRecordError(-1, (void *)precord,
-                "scanDelete for bad evnt");
-        else
+        pel = eventNameToHandle(precord->evnt);
+        if (pel && (psl = &pel->scan_list[prio]))
             deleteFromList(precord, psl);
     } else if (scan == menuScanI_O_Intr) {
         io_scan_list *piosl=NULL;
@@ -410,21 +384,20 @@ int scanppl(double period)      /* print periodic scan list(s) */
     return 0;
 }
 
-int scanpel(int event_number)   /* print event list */
+int scanpel(const char* eventname)   /* print event list */
 {
     char message[80];
-    int prio, evnt;
-    event_scan_list *pesl;
-
-    for (evnt = 0; evnt < MAX_EVENTS; evnt++) {
-        if (event_number && evnt<event_number) continue;
-        if (event_number && evnt>event_number) break;
-        for (prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
-            pesl = pevent_list[prio][evnt];
-            if (!pesl) continue;
-            if (ellCount(&pesl->scan_list.list) == 0) continue;
-            sprintf(message, "Event %d Priority %s", evnt, priorityName[prio]);
-            printList(&pesl->scan_list, message);
+    int prio;
+    event_list *pel;
+    
+    for (pel = pevent_list[0]; pel; pel = pel->next) {
+        if (!eventname ||  epicsStrGlobMatch(pel->eventname, eventname)) {
+            printf("Event \"%s\"\n", pel->eventname);
+            for (prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
+                if (ellCount(&pel->scan_list[prio].list) == 0) continue;
+                sprintf(message, " Priority %s", priorityName[prio]);
+                printList(&pel->scan_list[prio], message);
+            }
         }
     }
     return 0;
@@ -450,39 +423,106 @@ int scanpiol(void)                  /* print io_event list */
 
 static void eventCallback(CALLBACK *pcallback)
 {
-    event_scan_list *pesl;
+    scan_list *psl;
 
-    callbackGetUser(pesl, pcallback);
-    scanList(&pesl->scan_list);
+    callbackGetUser(psl, pcallback);
+    scanList(psl);
 }
 
 static void initEvent(void)
 {
-    int evnt, prio;
+}
 
-    for (prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
-        for (evnt = 0; evnt < MAX_EVENTS; evnt++) {
-            pevent_list[prio][evnt] = NULL;
+static void eventOnce(void *arg)
+{
+    event_lock = epicsMutexMustCreate();
+}
+
+event_list *eventNameToHandle(const char *eventname)
+{
+    int prio;
+    event_list *pel;
+    static epicsThreadOnceId onceId = EPICS_THREAD_ONCE_INIT;
+    double eventnumber = 0;
+    size_t namelength;
+    char* p;
+
+    if (!eventname) return NULL;
+    while (isspace((unsigned char)eventname[0])) eventname++;
+    if (!eventname[0]) return NULL;
+    namelength = strlen(eventname);
+    while (isspace((unsigned char)eventname[namelength-1])) namelength--;
+
+    /* Backward compatibility with numeric events:
+       Treat any string that represents a double with an
+       integer part between 0 and 255 the same as the integer
+       because it is most probably a conversion from double
+       like from a calc record.
+    */
+    eventnumber = strtod(eventname, &p);
+    if (*p == 0)
+    {
+        if (!finite(eventnumber))
+            return NULL; /* Inf and NaN are no events */
+        if (eventnumber >= 0 && eventnumber < 256)
+        {
+            if (eventnumber < 1)
+                return NULL; /* 0 is no event */
+            if ((pel = pevent_list[(int)eventnumber]) != NULL)
+                return pel;
         }
+        else 
+            eventnumber = 0; /* not a numeric event */
+    }
+
+    epicsThreadOnce(&onceId, eventOnce, NULL);
+    epicsMutexMustLock(event_lock);
+    for (pel = pevent_list[0]; pel; pel=pel->next) {
+        if (strncmp(pel->eventname, eventname, namelength) == 0
+            && pel->eventname[namelength] == 0)
+            break;
+    }
+    if (pel == NULL) {
+        pel = dbCalloc(1, sizeof(event_list) + namelength);
+        if (eventnumber > 0)
+        {
+            /* backward compatibility: make all numeric events look like integers */
+            sprintf(pel->eventname, "%i", (int)eventnumber);
+            pevent_list[(int)eventnumber] = pel;
+        }
+        else
+            strncpy(pel->eventname, eventname, namelength);
+        for (prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
+            callbackSetUser(&pel->scan_list[prio], &pel->callback[prio]);
+            callbackSetPriority(prio, &pel->callback[prio]);
+            callbackSetCallback(eventCallback, &pel->callback[prio]);
+            pel->scan_list[prio].lock = epicsMutexMustCreate();
+            ellInit(&pel->scan_list[prio].list);
+        }
+        pel->next=pevent_list[0];
+        pevent_list[0]=pel;
+    }
+    epicsMutexUnlock(event_lock);
+    return pel;
+}
+
+void postEvent(event_list *pel)
+{
+    int prio;
+
+    if (scanCtl != ctlRun) return;
+    if (!pel) return;
+    for (prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
+        if (ellCount(&pel->scan_list[prio].list) >0)
+            callbackRequest(&pel->callback[prio]);
     }
 }
 
+/* backward compatibility */
 void post_event(int event)
 {
-    int prio;
-    event_scan_list *pesl;
-
-    if (scanCtl != ctlRun) return;
-    if (event < 0 || event >= MAX_EVENTS) {
-        errMessage(-1, "illegal event passed to post_event");
-        return;
-    }
-    for (prio=0; prio<NUM_CALLBACK_PRIORITIES; prio++) {
-        pesl = pevent_list[prio][event];
-        if (!pesl) continue;
-        if (ellCount(&pesl->scan_list.list) >0)
-            callbackRequest((void *)pesl);
-    }
+    if (event <= 0 || event > 255) return;
+    postEvent(pevent_list[event]);
 }
 
 void scanIoInit(IOSCANPVT *ppioscanpvt)

src/db/dbScan.h

@@ -31,10 +31,13 @@ extern "C" {
 #define MAX_PHASE           SHRT_MAX
 #define MIN_PHASE           SHRT_MIN
 
+#define HAVE_NAMED_SOFT_EVENTS
+
 /*definitions for I/O Interrupt Scanning */
 struct io_scan_list;
 
 typedef struct io_scan_list *IOSCANPVT;
+typedef struct event_list *EVENTPVT;
 
 struct dbCommon;
 
@@ -42,6 +45,8 @@ epicsShareFunc long scanInit(void);
 epicsShareFunc void scanRun(void);
 epicsShareFunc void scanPause(void);
 
+epicsShareFunc EVENTPVT eventNameToHandle(const char* event);
+epicsShareFunc void postEvent(EVENTPVT epvt);
 epicsShareFunc void post_event(int event);
 epicsShareFunc void scanAdd(struct dbCommon *);
 epicsShareFunc void scanDelete(struct dbCommon *);
@@ -53,7 +58,7 @@ epicsShareFunc int scanOnceSetQueueSize(int size);
 epicsShareFunc int scanppl(double rate);
 
 /*print event lists*/
-epicsShareFunc int scanpel(int event_number);
+epicsShareFunc int scanpel(const char *event_name);
 
 /*print io_event list*/
 epicsShareFunc int scanpiol(void);

src/dbStatic/dbBase.h

@@ -94,6 +94,7 @@ typedef struct dbInfoNode {	/*non-field per-record information*/
 	char		*name;
 	char		*string;
 	void		*pointer;
+	dbFldDes	*pdbFldDes;
 }dbInfoNode;
 
 #define DBRN_FLAGS_VISIBLE 1
@@ -106,6 +107,7 @@ typedef struct dbRecordNode {
 	char		*recordname;
 	ELLLIST		infoList;	/*LIST head of info nodes*/
 	int		flags;
+	struct dbRecordNode *aliasedRecnode; /* NULL unless flags|DBRN_FLAGS_ISALIAS */
 }dbRecordNode;
 
 /*dbRecordAttribute is for "psuedo" fields */

src/dbStatic/dbLexRoutines.c

@@ -47,6 +47,9 @@ epicsExportAddress(int,dbRecordsOnceOnly);
 epicsShareDef int dbBptNotMonotonic=0;
 epicsExportAddress(int,dbBptNotMonotonic);
 
+epicsShareDef int dbQuietMacroWarnings=0;
+epicsExportAddress(int,dbQuietMacroWarnings);
+
 /*private routines */
 static void yyerrorAbort(char *str);
 static void allocTemp(void *pvoid);
@@ -227,6 +230,7 @@ static long dbReadCOM(DBBASE **ppdbbase,const char *filename, FILE *fp,
 	    free((void *)macPairs);
 	    mac_input_buffer = dbCalloc(MY_BUFFER_SIZE,sizeof(char));
 	}
+        macSuppressWarning(macHandle,dbQuietMacroWarnings);
     }
     pinputFile = dbCalloc(1,sizeof(inputFile));
     if (filename) {

src/dbStatic/dbStaticLib.c

@@ -1548,7 +1548,7 @@ long epicsShareAPI dbCreateRecord(DBENTRY *pdbentry,const char *precordName)
     if((status = dbAllocRecord(pdbentry,precordName))) return(status);
     pNewRecNode->recordname = dbRecordName(pdbentry);
     ellInit(&pNewRecNode->infoList);
-    /* install record node in list in sorted postion */
+    /* install record node in list in sorted position */
     status = dbFirstRecord(pdbentry);
     while(status==0) {
         if(strcmp(precordName,dbGetRecordName(pdbentry)) < 0) break;
@@ -1816,37 +1816,44 @@ long epicsShareAPI dbCreateAlias(DBENTRY *pdbentry, const char *alias)
     dbRecordNode	*pnewnode;
     PVDENTRY    	*ppvd;
     ELLLIST     	*preclist = NULL;
+    DBENTRY     	dbEntry;
     long		status;
 
     if (!precordType) return S_dbLib_recordTypeNotFound;
+    /* alias of alias still references actual record */
+    while(precnode && (precnode->flags&DBRN_FLAGS_ISALIAS))
+        precnode = precnode->aliasedRecnode;
     if (!precnode) return S_dbLib_recNotFound;
-    zeroDbentry(pdbentry);
-    if (!dbFindRecord(pdbentry, alias)) return S_dbLib_recExists;
-    zeroDbentry(pdbentry);
-    pdbentry->precordType = precordType;
+    /* use copy to avoid later info fields being bound to the alias */
+    dbCopyEntryContents(pdbentry, &dbEntry);
+    zeroDbentry(&dbEntry);
+    if (!dbFindRecord(&dbEntry, alias)) return S_dbLib_recExists;
+    zeroDbentry(&dbEntry);
+    dbEntry.precordType = precordType;
     preclist = &precordType->recList;
     pnewnode = dbCalloc(1, sizeof(dbRecordNode));
     pnewnode->recordname = epicsStrDup(alias);
     pnewnode->precord = precnode->precord;
+    pnewnode->aliasedRecnode = precnode;
     pnewnode->flags = DBRN_FLAGS_ISALIAS;
-    if (!(precnode->flags & DBRN_FLAGS_ISALIAS))
-        precnode->flags |= DBRN_FLAGS_HASALIAS;
+    precnode->flags |= DBRN_FLAGS_HASALIAS;
     ellInit(&pnewnode->infoList);
-    /* install record node in list in sorted postion */
-    status = dbFirstRecord(pdbentry);
+    /* install alias node in list in sorted position */
+    status = dbFirstRecord(&dbEntry);
     while (!status) {
-        if (strcmp(alias, dbGetRecordName(pdbentry)) < 0) break;
-        status = dbNextRecord(pdbentry);
+        if (strcmp(alias, dbGetRecordName(&dbEntry)) < 0) break;
+        status = dbNextRecord(&dbEntry);
     }
     if (!status) {
-        precnode = pdbentry->precnode;
+        precnode = dbEntry.precnode;
         ellInsert(preclist, ellPrevious(&precnode->node), &pnewnode->node);
     } else {
         ellAdd(preclist, &pnewnode->node);
     }
     precordType->no_aliases++;
-    pdbentry->precnode = pnewnode;
-    ppvd = dbPvdAdd(pdbentry->pdbbase, precordType, pnewnode);
+    dbEntry.precnode = pnewnode;
+    ppvd = dbPvdAdd(dbEntry.pdbbase, precordType, pnewnode);
+    dbFinishEntry(&dbEntry);
     if (!ppvd) {errMessage(-1,"Logic Err: Could not add to PVD");return(-1);}
     return 0;
 }
@@ -2808,6 +2815,32 @@ long epicsShareAPI dbFindInfo(DBENTRY *pdbentry,const char *name)
     return (S_dbLib_infoNotFound);
 }
 
+long dbFindInfoPart(DBENTRY *pdbentry, const char **ppname)
+{
+    dbRecordNode *precnode = pdbentry->precnode;
+    dbInfoNode *pinfo;
+    const char *pname = *ppname;
+    size_t len;
+
+    if (precnode->aliasedRecnode)
+        precnode=precnode->aliasedRecnode;
+    pinfo = (dbInfoNode *)ellFirst(&precnode->infoList);
+    while (pinfo) {
+        len = strlen(pinfo->name);
+        if (!strncmp(pinfo->name, pname, len) &&
+            (pname[len] == 0 || pname[len] == '$' || pname[len] == '{' || pname[len] == '['))
+        {
+            pdbentry->pinfonode = pinfo;
+            pdbentry->pflddes = pinfo->pdbFldDes;
+            pdbentry->pfield = pinfo->string;
+            *ppname = &pname[len];
+            return (0);
+        }
+        pinfo = (dbInfoNode *)ellNext(&pinfo->node);
+    }
+    return S_dbLib_fieldNotFound;
+}
+
 long epicsShareAPI dbDeleteInfo(DBENTRY *pdbentry)
 {
     dbRecordNode	*precnode = pdbentry->precnode;
@@ -2846,6 +2879,7 @@ long epicsShareAPI dbPutInfoString(DBENTRY *pdbentry,const char *string)
     if (!newstring) return (S_dbLib_outMem);
     strcpy(newstring, string);
     pinfo->string = newstring;
+    pinfo->pdbFldDes->size = strlen(newstring)+1;
     return (0);
 }
 
@@ -2872,6 +2906,7 @@ const char * epicsShareAPI dbGetInfo(DBENTRY *pdbentry,const char *name)
 
 long epicsShareAPI dbPutInfo(DBENTRY *pdbentry,const char *name,const char *string)
 {
+    dbFldDes *pdbFldDes;
     dbInfoNode *pinfo;
     dbRecordNode *precnode = pdbentry->precnode;
     if (!precnode) return (S_dbLib_recNotFound);
@@ -2896,6 +2931,20 @@ long epicsShareAPI dbPutInfo(DBENTRY *pdbentry,const char *name,const char *stri
 	return (S_dbLib_outMem);
     }
     strcpy(pinfo->string, string);
+    pdbFldDes = calloc(1,sizeof(dbFldDes));
+    if (!pdbFldDes) {
+       free(pinfo->string);
+       free(pinfo->name);
+       free(pinfo);
+       return (S_dbLib_outMem);
+    }
+    pdbFldDes->name = pinfo->name;
+    pdbFldDes->pdbRecordType = pdbentry->precordType;
+    pdbFldDes->special = SPC_ATTRIBUTE;
+    pdbFldDes->field_type = DBF_STRING;
+    pdbFldDes->as_level = ASL1;
+    pdbFldDes->size = strlen(string)+1;
+    pinfo->pdbFldDes = pdbFldDes;
     ellAdd(&precnode->infoList,&pinfo->node);
     pdbentry->pinfonode = pinfo;
     return (0);

src/dbStatic/dbStaticLib.h

@@ -170,6 +170,8 @@ epicsShareFunc char * epicsShareAPI dbVerify(DBENTRY *pdbentry,
 epicsShareFunc char * epicsShareAPI dbGetRange(DBENTRY *pdbentry);
 epicsShareFunc int  epicsShareAPI dbIsDefaultValue(DBENTRY *pdbentry);
 
+epicsShareFunc long dbFindInfoPart(DBENTRY *pdbentry,
+    const char **ppname);
 epicsShareFunc long epicsShareAPI dbFirstInfo(DBENTRY *pdbentry);
 epicsShareFunc long epicsShareAPI dbNextInfo(DBENTRY *pdbentry);
 epicsShareFunc long epicsShareAPI dbFindInfo(DBENTRY *pdbentry,

src/dev/softDev/devEventSoft.c

@@ -50,7 +50,7 @@ static long init_record(eventRecord *prec)
     /* INP must be CONSTANT, PV_LINK, DB_LINK or CA_LINK*/
     switch (prec->inp.type) {
     case CONSTANT:
-        if (recGblInitConstantLink(&prec->inp, DBF_USHORT, &prec->val))
+        if (recGblInitConstantLink(&prec->inp, DBF_STRING, &prec->val))
             prec->udf = FALSE;
         break;
     case PV_LINK:
@@ -68,13 +68,20 @@ static long init_record(eventRecord *prec)
 static long read_event(eventRecord *prec)
 {
     long status;
+    char newEvent[MAX_STRING_SIZE];
 
-    status = dbGetLink(&prec->inp, DBR_USHORT, &prec->val, 0, 0);
-    if (!status) {
-        prec->udf = FALSE;
-        if (prec->tsel.type == CONSTANT &&
-            prec->tse == epicsTimeEventDeviceTime)
-            dbGetTimeStamp(&prec->inp, &prec->time);
+    if (prec->inp.type != CONSTANT)
+    {
+        status = dbGetLinkValue(&prec->inp, DBR_STRING, newEvent, 0, 0);
+        if (status) return status;
+        if (strcmp(newEvent, prec->val) != 0) {
+            strcpy(prec->val, newEvent);
+            prec->epvt = eventNameToHandle(prec->val);
+        }
     }
-    return status;
+    prec->udf = FALSE;
+    if (prec->tsel.type == CONSTANT &&
+        prec->tse == epicsTimeEventDeviceTime)
+        dbGetTimeStamp(&prec->inp, &prec->time);
+    return 0;
 }

src/libCom/Makefile

@@ -17,7 +17,9 @@ epicsReadline_INCLUDES += $(INCLUDES_$(COMMANDLINE_LIBRARY))
 
 #POSIX thread priority scheduling flag
 THREAD_CPPFLAGS_NO += -DDONT_USE_POSIX_THREAD_PRIORITY_SCHEDULING
+osdMutex_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING))
 osdThread_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING))
+osdSpin_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING))
 
 #epicsVersion is created by this Makefile
 INC += epicsVersion.h
@@ -160,6 +162,7 @@ INC += osdInterrupt.h
 
 INC += epicsMutex.h
 INC += osdMutex.h
+INC += epicsSpin.h
 INC += epicsEvent.h
 INC += osdEvent.h
 INC += epicsMath.h
@@ -224,6 +227,7 @@ SRCS += osdStdio.c
 
 SRCS += osdThread.c
 SRCS += osdMutex.c
+SRCS += osdSpin.c
 SRCS += osdEvent.c
 SRCS += osdTime.cpp
 SRCS += osdProcess.c

src/libCom/calc/calcPerform.c

@@ -48,7 +48,6 @@ epicsShareFunc long
     double *ptop;			/* stack pointer */
     double top; 			/* value from top of stack */
     epicsInt32 itop;			/* integer from top of stack */
-    epicsUInt32 utop;			/* unsigned integer from top of stack */
     int op;
     int nargs;
 
@@ -287,30 +286,36 @@ epicsShareFunc long
 	    *ptop = ! *ptop;
 	    break;
 
-        /* For bitwise operations on values with bit 31 set, double values
-         * must first be cast to unsigned to correctly set that bit; the
-         * double value must be negative in that case. The result must be
-         * cast to a signed integer before converting to the double result.
+        /* Be VERY careful converting double to int in case bit 31 is set!
+         * Out-of-range errors give very different results on different sytems.
+         * Convert negative doubles to signed and positive doubles to unsigned
+         * first to avoid overflows if bit 32 is set.
+         * The result is always signed, values with bit 31 set are negative
+         * to avoid problems when writing the value to signed integer fields
+         * like longout.VAL or ao.RVAL. However unsigned fields may give
+         * problems on some architectures. (Fewer than giving problems with
+         * signed integer. Maybe the conversion functions should handle
+         * overflows better.)
          */
+        #define d2i(x) ((x)<0?(epicsInt32)(x):(epicsInt32)(epicsUInt32)(x))
 
 	case BIT_OR:
-	    utop = *ptop--;
-	    *ptop = (epicsInt32) ((epicsUInt32) *ptop | utop);
+	    top = *ptop--;
+	    *ptop = (double)(d2i(*ptop) | d2i(top));
 	    break;
 
 	case BIT_AND:
-	    utop = *ptop--;
-	    *ptop = (epicsInt32) ((epicsUInt32) *ptop & utop);
+	    top = *ptop--;
+	    *ptop = (double)(d2i(*ptop) & d2i(top));
 	    break;
 
 	case BIT_EXCL_OR:
-	    utop = *ptop--;
-	    *ptop = (epicsInt32) ((epicsUInt32) *ptop ^ utop);
+	    top = *ptop--;
+	    *ptop = (double)(d2i(*ptop) ^ d2i(top));
 	    break;
 
 	case BIT_NOT:
-	    utop = *ptop;
-	    *ptop = (epicsInt32) ~utop;
+	    *ptop = (double)~d2i(*ptop);
 	    break;
 
         /* The shift operators use signed integers, so a right-shift will
@@ -319,13 +324,13 @@ epicsShareFunc long
          */
 
 	case RIGHT_SHIFT:
-	    utop = *ptop--;
-	    *ptop = ((epicsInt32) (epicsUInt32) *ptop) >> (utop & 31);
+	    top = *ptop--;
+	    *ptop = (double)(d2i(*ptop) >> (d2i(top) & 31));
 	    break;
 
 	case LEFT_SHIFT:
-	    utop = *ptop--;
-	    *ptop = ((epicsInt32) (epicsUInt32) *ptop) << (utop & 31);
+	    top = *ptop--;
+	    *ptop = (double)(d2i(*ptop) << (d2i(top) & 31));
 	    break;
 
 	case NOT_EQ:

src/libCom/calc/postfix.c

@@ -421,10 +421,12 @@ epicsShareFunc long
 		pstacktop--;
 	    }
 
-	    if (cond_count != 0) {
-		*perror = CALC_ERR_CONDITIONAL;
-		goto bad;
-	    }
+/*
+ * 	    if (cond_count != 0) {
+ * 		*perror = CALC_ERR_CONDITIONAL;
+ * 		goto bad;
+ * 	    }
+ */
 	    if (runtime_depth > 1) {
 		*perror = CALC_ERR_TOOMANY;
 		goto bad;
@@ -468,10 +470,12 @@ epicsShareFunc long
     }
     *pout = END_EXPRESSION;
 
-    if (cond_count != 0) {
-	*perror = CALC_ERR_CONDITIONAL;
-	goto bad;
-    }
+/*
+ *     if (cond_count != 0) {
+ * 	*perror = CALC_ERR_CONDITIONAL;
+ * 	goto bad;
+ *     }
+ */
     if (operand_needed || runtime_depth != 1) {
 	*perror = CALC_ERR_INCOMPLETE;
 	goto bad;

src/libCom/ellLib/ellLib.c

@@ -281,6 +281,13 @@ void ellFree2 (ELLLIST *pList, FREEFUNC freeFunc)
     pList->count = 0;
 }
 
+/* for backward compatibility provide a function ellFree() in addition to macro */
+#undef ellFree
+void ellFree (ELLLIST *pList)
+{
+    ellFree2 (pList, free);
+}
+
 /****************************************************************************
  *
  * This function verifies that the list is consistent.

src/libCom/env/envDefs.h

@@ -69,6 +69,7 @@ epicsShareExtern const ENV_PARAM EPICS_CMD_PROTO_PORT;
 epicsShareExtern const ENV_PARAM EPICS_AR_PORT;
 epicsShareExtern const ENV_PARAM IOCSH_PS1;
 epicsShareExtern const ENV_PARAM IOCSH_HISTSIZE;
+epicsShareExtern const ENV_PARAM EPICS_MUTEX_USE_PRIORITY_INHERITANCE;
 
 epicsShareExtern const ENV_PARAM *env_param_list[];
 

src/libCom/error/errSymLib.c

@@ -51,9 +51,8 @@ typedef struct errnumnode {
 #define NHASH 256
 
 
-static ELLLIST errnumlist = ELLLIST_INIT;
-static ERRNUMNODE **hashtable;
-static int initialized = FALSE;
+static ERRNUMNODE **hashtable = NULL;
+#define initialized (hashtable!=NULL)
 extern ERRSYMTAB_ID errSymTbl;
 
 /****************************************************************
@@ -67,12 +66,8 @@ extern ERRSYMTAB_ID errSymTbl;
 int epicsShareAPI errSymBld(void)
 {
     ERRSYMBOL      *errArray = errSymTbl->symbols;
-    ERRNUMNODE     *perrNumNode = NULL;
-    ERRNUMNODE     *pNextNode = NULL;
-    ERRNUMNODE    **phashnode = NULL;
     int             i;
     int             modnum;
-    unsigned short  hashInd;
 
     if(initialized) return(0);
     hashtable = (ERRNUMNODE**)callocMustSucceed
@@ -89,21 +84,6 @@ int epicsShareAPI errSymBld(void)
 	    continue;
 	}
     }
-    perrNumNode = (ERRNUMNODE *) ellFirst(&errnumlist);
-    while (perrNumNode) {
-	/* hash each perrNumNode->errNum */
-	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 = TRUE;
     return(0);
 }
 
@@ -125,16 +105,33 @@ unsigned short errnum;
 
 /****************************************************************
  * ERRSYMBOLADD
- * adds symbols to the master errnumlist as compiled from errSymTbl.c
+ * adds symbols to the master hashtable as compiled from errSymTbl.c
  ***************************************************************/
 int epicsShareAPI errSymbolAdd (long errNum,char *name)
 {
-    ERRNUMNODE     *pNew;
+    ERRNUMNODE     *perrNumNode;
+    ERRNUMNODE     *pNextNode = NULL;
+    ERRNUMNODE    **phashnode = NULL;
+    unsigned short  hashInd;
+
+    if(!initialized) errSymBld();
+
+    perrNumNode = (ERRNUMNODE*)callocMustSucceed(1,sizeof(ERRNUMNODE),"errSymbolAdd");
+    perrNumNode->errNum = errNum;
+    perrNumNode->message = name;
+
+    /* hash each perrNumNode->errNum */
+    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);
 
-    pNew = (ERRNUMNODE*)callocMustSucceed(1,sizeof(ERRNUMNODE),"errSymbolAdd");
-    pNew->errNum = errNum;
-    pNew->message = name;
-    ellAdd(&errnumlist,(ELLNODE*)pNew);
     return(0);
 }
 

src/libCom/logClient/iocLog.c

@@ -21,6 +21,7 @@
 #include "errlog.h"
 #include "logClient.h"
 #include "iocLog.h"
+#include "epicsExit.h"
 
 int iocLogDisable = 0;
 
@@ -75,6 +76,14 @@ void epicsShareAPI epicsShareAPI iocLogFlush (void)
     }
 }
 
+/*
+ * logClientDestroy()
+ */
+static void iocLogClientDestroy (logClientId id)
+{
+    errlogRemoveListener (logClientSendMessage);
+}
+
 /*
  *  iocLogClientInit()
  */
@@ -91,7 +100,8 @@ static logClientId iocLogClientInit (void)
     }
     id = logClientCreate (addr, port);
     if (id != NULL) {
-        errlogAddListener ( logClientSendMessage, id );
+        errlogAddListener (logClientSendMessage, id);
+        epicsAtExit (iocLogClientDestroy, id);
     }
     return id;
 }
@@ -139,13 +149,3 @@ logClientId epicsShareAPI logClientInit (void)
 {
     return iocLogClientInit ();
 }
-
-/* 
- * logClientSendMessage (); deprecated
- */
-void logClientSendMessage ( logClientId id, const char * message )
-{
-    if ( !iocLogDisable ) {
-        logClientSend (id, message);
-    }
-}

src/libCom/logClient/logClient.c

@@ -24,6 +24,7 @@
 #define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "epicsEvent.h"
+#include "iocLog.h"
 #include "epicsMutex.h"
 #include "epicsThread.h"
 #include "epicsTime.h"
@@ -42,6 +43,7 @@ typedef struct {
     SOCKET              sock;
     epicsThreadId       restartThreadId;
     epicsEventId        stateChangeNotify;
+    epicsEventId        shutdownNotify;
     unsigned            connectCount;
     unsigned            nextMsgIndex;
     unsigned            connected;
@@ -51,9 +53,13 @@ typedef struct {
 } logClient;
 
 static const double      LOG_RESTART_DELAY = 5.0; /* sec */
-static const double      LOG_SERVER_CREATE_CONNECT_SYNC_TIMEOUT = 5.0; /* sec */
 static const double      LOG_SERVER_SHUTDOWN_TIMEOUT = 30.0; /* sec */
 
+/*
+ * If set using iocLogPrefix() this string is prepended to all log messages:
+ */
+static char* logClientPrefix = NULL;
+
 /*
  * logClientClose ()
  */
@@ -77,8 +83,6 @@ static void logClientClose ( logClient *pClient )
         pClient->sock = INVALID_SOCKET;
     }
 
-    pClient->nextMsgIndex = 0u;
-    memset ( pClient->msgBuf, '\0', sizeof ( pClient->msgBuf ) );
     pClient->connected = 0u;
 
     /*
@@ -106,6 +110,7 @@ static void logClientDestroy (logClientId id)
     epicsMutexMustLock ( pClient->mutex );
     pClient->shutdown = 1u;
     epicsMutexUnlock ( pClient->mutex );
+    epicsEventSignal ( pClient->shutdownNotify );
 
     /* unblock log client thread blocking in send() or connect() */
     interruptInfo =
@@ -150,112 +155,109 @@ static void logClientDestroy (logClientId id)
     logClientClose ( pClient );
 
     epicsMutexDestroy ( pClient->mutex );
-   
     epicsEventDestroy ( pClient->stateChangeNotify );
+    epicsEventDestroy ( pClient->shutdownNotify );
 
     free ( pClient );
 }
 
+/*
+ * logClientCheckConnection
+ */
+static void logClientCheckConnection( logClient * pClient )
+{
+    epicsMutexMustLock ( pClient->mutex );
+    while ( pClient->connected ) {
+        struct timeval timeout = { 0, 0 };
+        fd_set set;
+        char buffer[256];
+
+        FD_ZERO ( &set );
+        FD_SET ( pClient->sock, &set );
+        if ( select ( pClient->sock + 1, &set, NULL, NULL, &timeout ) == 0)
+            break;
+        if ( recv ( pClient->sock, buffer, sizeof ( buffer ), 0 ) == 0 ) {
+            fprintf ( stderr, "log client: connection closed by server \"%s\"\n",
+                pClient->name );
+            logClientClose ( pClient );
+            break;
+        }
+    }
+    epicsMutexUnlock ( pClient->mutex );
+}
+
+/*
+ * This method requires the pClient->mutex be owned already.
+ */
+static void sendMessageChunk(logClient * pClient, const char * message) {
+    unsigned strSize;
+
+    strSize = strlen ( message );
+    while ( strSize ) {
+        unsigned msgBufBytesLeft = 
+            sizeof ( pClient->msgBuf ) - pClient->nextMsgIndex;
+
+        if ( msgBufBytesLeft < strSize && pClient->nextMsgIndex != 0u && pClient->connected)
+        {
+            /* buffer is full, thus flush it */
+            logClientCheckConnection( pClient );
+            logClientFlush ( pClient );
+            msgBufBytesLeft = sizeof ( pClient->msgBuf ) - pClient->nextMsgIndex;
+        }
+        if ( msgBufBytesLeft == 0u ) {
+            fprintf ( stderr, "log client: messages to \"%s\" are lost\n",
+                pClient->name );
+            break;
+        }
+        if ( msgBufBytesLeft > strSize) msgBufBytesLeft = strSize;
+        memcpy ( & pClient->msgBuf[pClient->nextMsgIndex],
+            message, msgBufBytesLeft );
+        pClient->nextMsgIndex += msgBufBytesLeft;
+        strSize -= msgBufBytesLeft;
+        message += msgBufBytesLeft;
+    }
+}
+
+
 /* 
  * logClientSend ()
  */
 void epicsShareAPI logClientSend ( logClientId id, const char * message )
 {
     logClient * pClient = ( logClient * ) id;
-    unsigned strSize;
 
     if ( ! pClient || ! message ) {
         return;
     }
 
-    strSize = strlen ( message );
-
     epicsMutexMustLock ( pClient->mutex );
 
-    while ( strSize ) {
-        unsigned msgBufBytesLeft = 
-            sizeof ( pClient->msgBuf ) - pClient->nextMsgIndex;
-
-        if ( strSize > msgBufBytesLeft ) {
-            int status;
-
-            if ( ! pClient->connected ) {
-                break;
-            }
-
-            if ( msgBufBytesLeft > 0u ) {
-                memcpy ( & pClient->msgBuf[pClient->nextMsgIndex],
-                    message, msgBufBytesLeft );
-                pClient->nextMsgIndex += msgBufBytesLeft;
-                strSize -= msgBufBytesLeft;
-                message += msgBufBytesLeft;
-            }
-
-            status = send ( pClient->sock, pClient->msgBuf, 
-                pClient->nextMsgIndex, 0 );
-            if ( status > 0 ) {
-                unsigned nSent = (unsigned) status;
-                if ( nSent < pClient->nextMsgIndex ) {
-                    unsigned newNextMsgIndex = pClient->nextMsgIndex - nSent;
-                    memmove ( pClient->msgBuf, & pClient->msgBuf[nSent], 
-                        newNextMsgIndex );
-                    pClient->nextMsgIndex = newNextMsgIndex;
-                }
-                else {
-                    pClient->nextMsgIndex = 0u;
-                }
-            }
-            else {
-                if ( ! pClient->shutdown ) {
-                    char sockErrBuf[64];
-                    if ( status ) {
-                        epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
-                    }
-                    else {
-                        strcpy ( sockErrBuf, "server initiated disconnect" );
-                    }
-                    fprintf ( stderr, "log client: lost contact with log server at \"%s\" because \"%s\"\n", 
-                        pClient->name, sockErrBuf );
-                }
-                logClientClose ( pClient );
-                break;
-            }
-        }
-        else {
-            memcpy ( & pClient->msgBuf[pClient->nextMsgIndex],
-                message, strSize );
-            pClient->nextMsgIndex += strSize;
-            break;
-        }
+    if (logClientPrefix) {
+        sendMessageChunk(pClient, logClientPrefix);
     }
-    
+    sendMessageChunk(pClient, message);
+
     epicsMutexUnlock (pClient->mutex);
 }
 
+
 void epicsShareAPI logClientFlush ( logClientId id )
 {
+    unsigned nSent = 0u;
+
     logClient * pClient = ( logClient * ) id;
 
-    if ( ! pClient ) {
+    if ( ! pClient || ! pClient->connected ) {
         return;
     }
 
     epicsMutexMustLock ( pClient->mutex );
 
-    while ( pClient->nextMsgIndex && pClient->connected ) {
-        int status = send ( pClient->sock, pClient->msgBuf, 
-            pClient->nextMsgIndex, 0 );
+    while ( nSent < pClient->nextMsgIndex && pClient->connected ) {
+        int status = send ( pClient->sock, pClient->msgBuf + nSent,
+            pClient->nextMsgIndex - nSent, 0 );
         if ( status > 0 ) {
-            unsigned nSent = (unsigned) status;
-            if ( nSent < pClient->nextMsgIndex ) {
-                unsigned newNextMsgIndex = pClient->nextMsgIndex - nSent;
-                memmove ( pClient->msgBuf, & pClient->msgBuf[nSent], 
-                    newNextMsgIndex );
-                pClient->nextMsgIndex = newNextMsgIndex;
-            }
-            else {
-                pClient->nextMsgIndex = 0u;
-            }
+            nSent += (unsigned) status;
         }
         else {
             if ( ! pClient->shutdown ) {
@@ -273,6 +275,11 @@ void epicsShareAPI logClientFlush ( logClientId id )
             break;
         }
     }
+    pClient->nextMsgIndex -= nSent;
+    if ( nSent > 0 && pClient->nextMsgIndex > 0 ) {
+        memmove ( pClient->msgBuf, & pClient->msgBuf[nSent],
+            pClient->nextMsgIndex );
+    }
     epicsMutexUnlock ( pClient->mutex );
 }
 
@@ -377,20 +384,6 @@ static void logClientConnect (logClient *pClient)
         fprintf (stderr, "log client: unable to enable keepalive option because \"%s\"\n", sockErrBuf);
     }
 
-    /*
-     * we don't need full-duplex (clients only write), so we shutdown
-     * the read end of our socket
-     */
-    status = shutdown (pClient->sock, SHUT_RD);
-    if (status < 0) {
-        char sockErrBuf[64];
-        epicsSocketConvertErrnoToString ( 
-            sockErrBuf, sizeof ( sockErrBuf ) );
-        fprintf (stderr, "%s:%d shutdown(%d,SHUT_RD) error was \"%s\"\n", 
-            __FILE__, __LINE__, pClient->sock, sockErrBuf);
-        /* not fatal (although it shouldn't happen) */
-    }
-
     /*
      * set how long we will wait for the TCP state machine
      * to clean up when we issue a close(). This
@@ -430,20 +423,21 @@ static void logClientRestart ( logClientId id )
     /* SMP safe state inspection */
     epicsMutexMustLock ( pClient->mutex );
     while ( ! pClient->shutdown ) {
-        unsigned isConn;
+        unsigned isConn, dataToSend;
+
+        logClientCheckConnection( pClient );
 
         isConn = pClient->connected;
+        dataToSend = pClient->nextMsgIndex;
 
         epicsMutexUnlock ( pClient->mutex );
 
-        if ( isConn ) {
+        if ( dataToSend ) {
+            if ( ! isConn ) logClientConnect ( pClient );
             logClientFlush ( pClient );
         }
-        else {
-            logClientConnect ( pClient );
-        }
-        
-        epicsThreadSleep ( LOG_RESTART_DELAY );
+
+        epicsEventWaitWithTimeout ( pClient->shutdownNotify, LOG_RESTART_DELAY);
 
         epicsMutexMustLock ( pClient->mutex );
     }
@@ -459,9 +453,7 @@ static void logClientRestart ( logClientId id )
 logClientId epicsShareAPI logClientCreate (
     struct in_addr server_addr, unsigned short server_port)
 {
-    epicsTimeStamp begin, current;
     logClient *pClient;
-    double diff;
 
     pClient = calloc (1, sizeof (*pClient));
     if (pClient==NULL) {
@@ -486,14 +478,22 @@ logClientId epicsShareAPI logClientCreate (
     pClient->shutdownConfirm = 0;
 
     epicsAtExit (logClientDestroy, (void*) pClient);
-    
+
     pClient->stateChangeNotify = epicsEventCreate (epicsEventEmpty);
     if ( ! pClient->stateChangeNotify ) {
         epicsMutexDestroy ( pClient->mutex );
         free ( pClient );
         return NULL;
     }
-   
+
+    pClient->shutdownNotify = epicsEventCreate (epicsEventEmpty);
+    if ( ! pClient->shutdownNotify ) {
+        epicsMutexDestroy ( pClient->mutex );
+        epicsEventDestroy ( pClient->stateChangeNotify );
+        free ( pClient );
+        return NULL;
+    }
+
     pClient->restartThreadId = epicsThreadCreate (
         "logRestart", epicsThreadPriorityLow, 
         epicsThreadGetStackSize(epicsThreadStackSmall),
@@ -501,33 +501,12 @@ logClientId epicsShareAPI logClientCreate (
     if ( pClient->restartThreadId == NULL ) {
         epicsMutexDestroy ( pClient->mutex );
         epicsEventDestroy ( pClient->stateChangeNotify );
+        epicsEventDestroy ( pClient->shutdownNotify );
         free (pClient);
         fprintf(stderr, "log client: unable to start log client connection watch dog thread\n");
         return NULL;
     }
 
-    /*
-     * attempt to synchronize with circuit connect
-     */
-    epicsTimeGetCurrent ( & begin );
-    epicsMutexMustLock ( pClient->mutex );
-    do {
-        epicsMutexUnlock ( pClient->mutex );
-        epicsEventWaitWithTimeout ( 
-            pClient->stateChangeNotify, 
-            LOG_SERVER_CREATE_CONNECT_SYNC_TIMEOUT / 10.0 ); 
-        epicsTimeGetCurrent ( & current );
-        diff = epicsTimeDiffInSeconds ( & current, & begin );
-        epicsMutexMustLock ( pClient->mutex );
-    }
-    while ( ! pClient->connected && diff < LOG_SERVER_CREATE_CONNECT_SYNC_TIMEOUT );
-    epicsMutexUnlock ( pClient->mutex );
-
-    if ( ! pClient->connected ) {
-        fprintf (stderr, "log client create: timed out synchronizing with circuit connect to \"%s\" after %.1f seconds\n",
-            pClient->name, LOG_SERVER_CREATE_CONNECT_SYNC_TIMEOUT );
-    }
-        
     return (void *) pClient;
 }
 
@@ -537,6 +516,9 @@ logClientId epicsShareAPI logClientCreate (
 void epicsShareAPI logClientShow (logClientId id, unsigned level)
 {
     logClient *pClient = (logClient *) id;
+    if ( ! pClient ) {
+        return;
+    }
 
     if ( pClient->connected ) {
         printf ("log client: connected to log server at \"%s\"\n", pClient->name);
@@ -550,5 +532,46 @@ void epicsShareAPI logClientShow (logClientId id, unsigned level)
             pClient->sock==INVALID_SOCKET?"INVALID":"OK",
             pClient->connectCount);
     }
+
+    if (logClientPrefix) {
+        printf ("log client: prefix is \"%s\"\n", logClientPrefix);
+    }
 }
 
+/*
+ * logClientSendMessage (); deprecated
+ */
+void logClientSendMessage ( logClientId id, const char * message )
+{
+    if ( !iocLogDisable ) {
+        logClientSend (id, message);
+    }
+}
+
+/*
+ * iocLogPrefix()
+ */
+void epicsShareAPI iocLogPrefix(const char * prefix)
+{
+
+    /* If we have already established a log prefix, don't let the user change
+     * it.  The iocLogPrefix command is expected to be run from the IOC startup
+     * script during initialization; the prefix can't be changed once it has
+     * been set.
+     */
+
+    if (logClientPrefix) {
+        printf ("iocLogPrefix: The prefix was already set to \"%s\" "
+            "and can't be changed.\n", logClientPrefix);
+        return;
+    }
+
+    if (prefix) {
+        unsigned prefixLen = strlen(prefix);
+        if (prefixLen > 0) {
+            char * localCopy = malloc(prefixLen+1);
+            strcpy(localCopy, prefix);
+            logClientPrefix = localCopy;
+        }
+    }
+}

src/libCom/logClient/logClient.h

@@ -33,6 +33,7 @@ epicsShareFunc logClientId epicsShareAPI logClientCreate (
 epicsShareFunc void epicsShareAPI logClientSend (logClientId id, const char *message);
 epicsShareFunc void epicsShareAPI logClientShow (logClientId id, unsigned level);
 epicsShareFunc void epicsShareAPI logClientFlush (logClientId id);
+epicsShareFunc void epicsShareAPI iocLogPrefix(const char* prefix);
 
 /* deprecated interface; retained for backward compatibility */
 /* note: implementations are in iocLog.c, not logClient.c */

src/libCom/macLib/macCore.c

@@ -558,6 +558,186 @@ static MAC_ENTRY *create( MAC_HANDLE *handle, const char *name, int special )
     return entry;
 }
 
+#define SUCCESS 0
+#define NOVALUE 1
+#define UNTERMINATED 2
+#define DIVZERO 3
+
+static int parseExpr( const char** pp, int* v, int level );
+
+/* Value is a number or an expression in () */
+static int parseValue( const char** pp, int* v )
+{
+    int status;
+    int val;
+    const char *p = *pp;
+    int neg = 0;
+
+    while (isspace((unsigned char)*p)) p++;
+    if (*p == '+' || *p == '-') neg = *p++ == '-';
+    while (isspace((unsigned char)*p)) p++;
+    if (*p == '(')
+    {
+        p++;
+        if ((status = parseExpr(&p, &val, 0)) != SUCCESS) return status;
+        if (*p++ != ')')
+        {
+            printf("macLib: missing ) after '%s'\n", *pp);
+            return UNTERMINATED;
+        }
+    }
+    else
+    {
+        char* e;
+        val = strtol(p, &e, 0);
+        if (e == p) return NOVALUE;
+        p = e;
+    }
+    if (neg) val = -val;
+    *pp = p;
+    *v = val;
+    return SUCCESS;
+}
+
+/* Expr is a sum or product of Values or a conditional */
+static int parseExpr( const char** pp, int* v, int level )
+{
+    const char *p = *pp;
+    int o = 0;
+    int val0, val1, val2;
+    int status = SUCCESS;
+    int stat1, stat2;
+
+    val0 = 0;
+    /* handle sums and differences */
+    do {
+        if ((stat1 = parseValue(&p, &val1)) != SUCCESS)
+        {
+            if (o && stat1 == NOVALUE)
+                printf ("macLib: missing operand after '%c'\n", o);
+            return stat1;
+        }
+        while (isspace((unsigned char)*p)) p++;
+        o = *p;
+        /* handle products and quotients */
+        while (o == '*' || o == '/' || o == '%')
+        {
+            p++;
+            if ((stat2 = parseValue(&p, &val2)) != SUCCESS)
+            {
+                if (stat2 == NOVALUE)
+                    printf ("macLib: missing operand after '%c'\n", o);
+                return stat2;
+            }
+            if (o == '*') val1 *= val2;
+            else if (val2 == 0)
+            {
+                status = DIVZERO;
+                val1 = 1;
+            }
+            else if (o == '/') val1 /= val2;
+            else val1 %= val2;
+            while (isspace((unsigned char)*p)) p++;
+            o = *p;
+        }
+        val0 += val1;
+    } while (o == '+' || o == '-');
+    
+    /* handle comparisons */
+    o = *p;
+    if (o == '<' || o == '>')
+    {
+        p++;
+        if ((stat1 = parseExpr(&p, &val1, 1)) != SUCCESS)
+        {
+            if (stat1 == NOVALUE)
+                printf ("macLib: missing expression after '%c'\n", o);
+            return stat1;
+        }
+        if (o == '<')
+            val0 = (val0 < val1);
+        else
+            val0 = (val0 > val1);
+    }
+
+    /* handle conditionals */
+    if (*p == '?' && level == 0)
+    {
+        p++;
+        while (isspace((unsigned char)*p)) p++;
+        if (*p != ':')
+        {
+            stat1 = parseExpr(&p, &val1, 0);
+        }
+        else
+        {
+            val1 = val0;
+            stat1 = status;
+        }
+        if (*p != ':')
+        {
+            printf("macLib: missing : after '%s'\n", *pp);
+            return UNTERMINATED;
+        }
+        p++;
+        stat2 = parseExpr(&p, &val2, 0);
+        status = val0 ? stat1 : stat2;
+        val0 = val0 ? val1 : val2;
+    }
+    
+    *v = val0;
+    *pp = p;
+    return status;
+}
+
+static MAC_ENTRY *evalExpr( MAC_HANDLE *handle, const char *expr )
+{
+    MAC_ENTRY *entry = NULL;
+    int status;
+    const char* p = expr;
+    int value;
+    char valuestr[40];
+    char format[20] = "%d";
+
+    while (isspace((unsigned char)*p)) p++;
+    if (*p == '%')
+    {
+        int i = 1;
+        p++;
+        while (i < sizeof(format) && strchr(" #-+0", *p))
+            format[i++] = *p++;
+        while (i < sizeof(format) && strchr("0123456789", *p))
+            format[i++] = *p++;
+        if (i < sizeof(format) && strchr("diouxXc", *p))
+        {
+            format[i++] = *p++;
+            format[i] = 0;
+        }
+        else
+            return NULL;
+    }
+    status = parseExpr(&p, &value, 0);
+    if (status == DIVZERO)
+        printf ("macLib: division by zero\n");
+    if (status != SUCCESS)
+        return NULL;
+    while (isspace((unsigned char)*p)) p++;
+    if (*p)
+    {
+        printf("macLib: rubbish at end of expression: %s\n", p);
+        return NULL;
+    }
+    sprintf(valuestr, format, value);
+    entry = create( handle, expr, TRUE );
+    if ( entry )
+    {
+        entry->type = "calculation";
+        if ( rawval( handle, entry, valuestr ) == NULL )
+            return NULL;
+    }
+    return entry;
+}
+
 /*
  * Look up macro entry with matching "special" attribute by name
  */
@@ -569,6 +749,10 @@ static MAC_ENTRY *lookup( MAC_HANDLE *handle, const char *name, int special )
         printf( "lookup-> level = %d, name = %s, special = %d\n",
                 handle->level, name, special );
 
+    if ( (special == FALSE) ) {
+        entry = evalExpr( handle, name );
+        if (entry) return entry;
+    }
     /* search backwards so scoping works */
     for ( entry = last( handle ); entry != NULL; entry = previous( entry ) ) {
         if ( entry->special != special )
@@ -688,6 +872,7 @@ static void trans( MAC_HANDLE *handle, MAC_ENTRY *entry, int level,
     /* return immediately if raw value is NULL */
     if ( *rawval == NULL ) return;
 
+
     /* discard quotes and escapes if level is > 0 (i.e. if these aren't
        the user's quotes and escapes) */
     discard = ( level > 0 );

src/libCom/osi/epicsSpin.h

@@ -0,0 +1,32 @@
+/*************************************************************************\
+* Copyright (c) 2012 Helmholtz-Zentrum Berlin
+*     fuer Materialien und Energie GmbH.
+* Copyright (c) 2012 ITER Organization.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+#ifndef epicsSpinh
+#define epicsSpinh
+
+#include "shareLib.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct epicsSpin *epicsSpinId;
+
+epicsShareFunc epicsSpinId epicsSpinCreate(void);
+epicsShareFunc epicsSpinId epicsSpinMustCreate(void);
+epicsShareFunc void epicsSpinDestroy(epicsSpinId);
+
+epicsShareFunc void epicsSpinLock(epicsSpinId);
+epicsShareFunc int epicsSpinTryLock(epicsSpinId);
+epicsShareFunc void epicsSpinUnlock(epicsSpinId);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* epicsSpinh */

src/libCom/osi/epicsStdioRedirect.h

@@ -12,12 +12,12 @@
 #ifndef epicsStdioRedirecth
 #define epicsStdioRedirecth
 
+#include <epicsStdio.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-#include <epicsStdio.h>
-
 #undef stdin
 #define stdin epicsGetStdin()
 #undef stdout

src/libCom/osi/os/Linux/osdThread.c

@@ -0,0 +1,876 @@
+/*************************************************************************\
+* 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. 
+\*************************************************************************/
+/* epicsThread.c */
+
+/* Author:  Marty Kraimer Date:    18JAN2000 */
+
+/* This is a posix implementation of epicsThread */
+#include <stddef.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <time.h>
+#include <pthread.h>
+#include <signal.h>
+#include <sched.h>
+#include <unistd.h>
+#include <sys/prctl.h>
+#include <sys/syscall.h>
+
+#define epicsExportSharedSymbols
+#include "epicsStdio.h"
+#include "ellLib.h"
+#include "epicsEvent.h"
+#include "epicsMutex.h"
+#include "epicsString.h"
+#include "epicsThread.h"
+#include "cantProceed.h"
+#include "errlog.h"
+#include "epicsAssert.h"
+#include "epicsExit.h"
+
+static int mutexLock(pthread_mutex_t *id)
+{
+    int status;
+
+    while(1) {
+        status = pthread_mutex_lock(id);
+        if(status!=EINTR) return status;
+        fprintf(stderr,"pthread_mutex_lock returned EINTR. Violates SUSv3\n");
+    }
+}
+
+#if defined DONT_USE_POSIX_THREAD_PRIORITY_SCHEDULING
+#undef _POSIX_THREAD_PRIORITY_SCHEDULING
+#endif
+
+typedef struct commonAttr{
+    pthread_attr_t     attr;
+    struct sched_param schedParam;
+    int                maxPriority;
+    int                minPriority;
+    int                schedPolicy;
+    int                usePolicy;
+} commonAttr;
+
+typedef struct epicsThreadOSD {
+    ELLNODE            node;
+    pthread_t          tid;
+    pid_t              lwpId;
+    pthread_attr_t     attr;
+    struct sched_param schedParam;
+    EPICSTHREADFUNC    createFunc;
+    void              *createArg;
+    epicsEventId       suspendEvent;
+    int                isSuspended;
+    int                isEpicsThread;
+    int                isFifoScheduled;
+    int                isOnThreadList;
+    unsigned int       osiPriority;
+    char              *name;
+} epicsThreadOSD;
+
+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
+typedef struct {
+    int min_pri, max_pri;
+    int policy;
+    int ok;
+} priAvailable;
+#endif
+
+static pthread_key_t getpthreadInfo;
+static pthread_mutex_t onceLock;
+static pthread_mutex_t listLock;
+static ELLLIST pthreadList = ELLLIST_INIT;
+static commonAttr *pcommonAttr = 0;
+static int epicsThreadOnceCalled = 0;
+
+static epicsThreadOSD *createImplicit(void);
+
+#define checkStatus(status,message) \
+if((status))  {\
+    errlogPrintf("%s error %s\n",(message),strerror((status))); \
+}
+
+#define checkStatusQuit(status,message,method) \
+if(status) { \
+    errlogPrintf("%s  error %s\n",(message),strerror((status))); \
+    cantProceed((method)); \
+}
+
+/* The following are for use by once, which is only invoked from epicsThreadInit*/
+/* Until epicsThreadInit completes errlogInit will not work                     */
+/* It must also be used by init_threadInfo otherwise errlogInit could get  */
+/* called recursively                                                      */
+#define checkStatusOnce(status,message) \
+if((status))  {\
+    fprintf(stderr,"%s error %s\n",(message),strerror((status))); }
+
+#define checkStatusOnceQuit(status,message,method) \
+if(status) { \
+    fprintf(stderr,"%s  error %s",(message),strerror((status))); \
+    fprintf(stderr," %s\n",method); \
+    fprintf(stderr,"epicsThreadInit cant proceed. Program exiting\n"); \
+    exit(-1);\
+}
+
+
+#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING)
+static int getOssPriorityValue(epicsThreadOSD *pthreadInfo)
+{
+    double maxPriority,minPriority,slope,oss;
+
+    if(pcommonAttr->maxPriority==pcommonAttr->minPriority)
+        return(pcommonAttr->maxPriority);
+    maxPriority = (double)pcommonAttr->maxPriority;
+    minPriority = (double)pcommonAttr->minPriority;
+    slope = (maxPriority - minPriority)/100.0;
+    oss = (double)pthreadInfo->osiPriority * slope + minPriority;
+    return((int)oss);
+}
+#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
+static void setSchedulingPolicy(epicsThreadOSD *pthreadInfo,int policy)
+{
+#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING)
+    int status;
+
+    if(!pcommonAttr->usePolicy) return;
+
+    status = pthread_attr_getschedparam(
+        &pthreadInfo->attr,&pthreadInfo->schedParam);
+    checkStatusOnce(status,"pthread_attr_getschedparam");
+    pthreadInfo->schedParam.sched_priority = getOssPriorityValue(pthreadInfo);
+    status = pthread_attr_setschedpolicy(
+        &pthreadInfo->attr,policy);
+    checkStatusOnce(status,"pthread_attr_setschedpolicy");
+    status = pthread_attr_setschedparam(
+        &pthreadInfo->attr,&pthreadInfo->schedParam);
+    checkStatusOnce(status,"pthread_attr_setschedparam");
+    status = pthread_attr_setinheritsched(
+        &pthreadInfo->attr,PTHREAD_EXPLICIT_SCHED);
+    checkStatusOnce(status,"pthread_attr_setinheritsched");
+#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
+}
+
+static epicsThreadOSD * create_threadInfo(const char *name)
+{
+    epicsThreadOSD *pthreadInfo;
+
+    pthreadInfo = callocMustSucceed(1,sizeof(*pthreadInfo),"create_threadInfo");
+    pthreadInfo->suspendEvent = epicsEventMustCreate(epicsEventEmpty);
+    pthreadInfo->name = epicsStrDup(name);
+    return pthreadInfo;
+}
+
+static epicsThreadOSD * init_threadInfo(const char *name,
+    unsigned int priority, unsigned int stackSize,
+    EPICSTHREADFUNC funptr,void *parm)
+{
+    epicsThreadOSD *pthreadInfo;
+    int status;
+
+    pthreadInfo = create_threadInfo(name);
+    pthreadInfo->createFunc = funptr;
+    pthreadInfo->createArg = parm;
+    status = pthread_attr_init(&pthreadInfo->attr);
+    checkStatusOnce(status,"pthread_attr_init");
+    if(status) return 0;
+    status = pthread_attr_setdetachstate(
+        &pthreadInfo->attr, PTHREAD_CREATE_DETACHED);
+    checkStatusOnce(status,"pthread_attr_setdetachstate");
+#if defined (_POSIX_THREAD_ATTR_STACKSIZE)
+#if ! defined (OSITHREAD_USE_DEFAULT_STACK)
+    status = pthread_attr_setstacksize( &pthreadInfo->attr,(size_t)stackSize);
+    checkStatusOnce(status,"pthread_attr_setstacksize");
+#endif /*OSITHREAD_USE_DEFAULT_STACK*/
+#endif /*_POSIX_THREAD_ATTR_STACKSIZE*/
+    status = pthread_attr_setscope(&pthreadInfo->attr,PTHREAD_SCOPE_PROCESS);
+    if(errVerbose) checkStatusOnce(status,"pthread_attr_setscope");
+    pthreadInfo->osiPriority = priority;
+    return(pthreadInfo);
+}
+
+static void free_threadInfo(epicsThreadOSD *pthreadInfo)
+{
+    int status;
+
+    status = mutexLock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_lock","free_threadInfo");
+    if(pthreadInfo->isOnThreadList) ellDelete(&pthreadList,&pthreadInfo->node);
+    status = pthread_mutex_unlock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_unlock","free_threadInfo");
+    epicsEventDestroy(pthreadInfo->suspendEvent);
+    status = pthread_attr_destroy(&pthreadInfo->attr);
+    checkStatusQuit(status,"pthread_attr_destroy","free_threadInfo");
+    free(pthreadInfo->name);
+    free(pthreadInfo);
+}
+
+#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) 
+/*
+ * The actually available range priority range (at least under linux)
+ * may be restricted by resource limitations (but that is ignored
+ * by sched_get_priority_max()). See bug #835138 which is fixed by
+ * this code.
+ */
+
+static int try_pri(int pri, int policy)
+{
+struct sched_param  schedp;
+
+    schedp.sched_priority = pri;
+    return pthread_setschedparam(pthread_self(), policy, &schedp);
+}
+
+static void*
+find_pri_range(void *arg)
+{
+priAvailable *prm = arg;
+int           min = sched_get_priority_min(prm->policy);
+int           max = sched_get_priority_max(prm->policy);
+int           low, try;
+
+    if ( -1 == min || -1 == max ) {
+        /* something is very wrong; maintain old behavior
+         * (warning message if sched_get_priority_xxx() fails
+         * and use default policy's sched_priority [even if
+         * that is likely to cause epicsThreadCreate to fail
+         * because that priority is not suitable for SCHED_FIFO]).
+         */
+        prm->min_pri = prm->max_pri = -1;
+        return 0;
+    }
+
+
+    if ( try_pri(min, prm->policy) ) {
+        /* cannot create thread at minimum priority;
+         * probably no permission to use SCHED_FIFO
+         * at all. However, we still must return
+         * a priority range accepted by the SCHED_FIFO
+         * policy. Otherwise, epicsThreadCreate() cannot
+         * detect the unsufficient permission (EPERM)
+         * and fall back to a non-RT thread (because
+         * pthread_attr_setschedparam would fail with
+         * EINVAL due to the bad priority).
+         */
+        prm->min_pri = prm->max_pri = min;
+        return 0;
+    }
+
+
+    /* Binary search through available priorities.
+     * The actually available range may be restricted
+     * by resource limitations (but that is ignored
+     * by sched_get_priority_max() [linux]).
+     */
+    low = min;
+
+    while ( low < max ) {
+        try = (max+low)/2;
+        if ( try_pri(try, prm->policy) ) {
+            max = try;
+        } else {
+            low = try + 1;
+        }
+    }
+
+    prm->min_pri = min;
+    prm->max_pri = try_pri(max, prm->policy) ? max-1 : max;
+    prm->ok = 1;
+
+    return 0;
+}
+
+static void findPriorityRange(commonAttr *a_p)
+{
+priAvailable arg;
+pthread_t    id;
+void         *dummy;
+int          status;
+
+    arg.policy = a_p->schedPolicy;
+    arg.ok = 0;
+
+    status = pthread_create(&id, 0, find_pri_range, &arg);
+    checkStatusQuit(status, "pthread_create","epicsThreadInit");
+
+    status = pthread_join(id, &dummy);
+    checkStatusQuit(status, "pthread_join","epicsThreadInit");
+
+    a_p->minPriority = arg.min_pri;
+    a_p->maxPriority = arg.max_pri;
+    a_p->usePolicy = arg.ok;
+}
+#endif
+
+
+static void once(void)
+{
+    epicsThreadOSD *pthreadInfo;
+    int status;
+
+    pthread_key_create(&getpthreadInfo,0);
+    status = epicsPosixMutexInit(&onceLock,posixMutexDefault);
+    checkStatusQuit(status,"pthread_mutex_init","epicsThreadInit");
+    status = epicsPosixMutexInit(&listLock,posixMutexDefault);
+    checkStatusQuit(status,"pthread_mutex_init","epicsThreadInit");
+    pcommonAttr = calloc(1,sizeof(commonAttr));
+    if(!pcommonAttr) checkStatusOnceQuit(errno,"calloc","epicsThreadInit");
+    status = pthread_attr_init(&pcommonAttr->attr);
+    checkStatusOnceQuit(status,"pthread_attr_init","epicsThreadInit");
+    status = pthread_attr_setdetachstate(
+        &pcommonAttr->attr, PTHREAD_CREATE_DETACHED);
+    checkStatusOnce(status,"pthread_attr_setdetachstate");
+    status = pthread_attr_setscope(&pcommonAttr->attr,PTHREAD_SCOPE_PROCESS);
+    if(errVerbose) checkStatusOnce(status,"pthread_attr_setscope");
+#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) 
+    status = pthread_attr_setschedpolicy(
+        &pcommonAttr->attr,SCHED_FIFO);
+    checkStatusOnce(status,"pthread_attr_setschedpolicy");
+    status = pthread_attr_getschedpolicy(
+        &pcommonAttr->attr,&pcommonAttr->schedPolicy);
+    checkStatusOnce(status,"pthread_attr_getschedpolicy");
+    status = pthread_attr_getschedparam(
+        &pcommonAttr->attr,&pcommonAttr->schedParam);
+    checkStatusOnce(status,"pthread_attr_getschedparam");
+
+    findPriorityRange(pcommonAttr);
+
+    if(pcommonAttr->maxPriority == -1) {
+        pcommonAttr->maxPriority = pcommonAttr->schedParam.sched_priority;
+        fprintf(stderr,"sched_get_priority_max failed set to %d\n",
+            pcommonAttr->maxPriority);
+    }
+    if(pcommonAttr->minPriority == -1) {
+        pcommonAttr->minPriority = pcommonAttr->schedParam.sched_priority;
+        fprintf(stderr,"sched_get_priority_min failed set to %d\n",
+            pcommonAttr->maxPriority);
+    }
+#else
+    if(errVerbose) fprintf(stderr,"task priorities are not implemented\n");
+#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
+    pthreadInfo = init_threadInfo("_main_",0,epicsThreadGetStackSize(epicsThreadStackSmall),0,0);
+    pthreadInfo->lwpId = syscall(SYS_gettid);
+    status = pthread_setspecific(getpthreadInfo,(void *)pthreadInfo);
+    checkStatusOnceQuit(status,"pthread_setspecific","epicsThreadInit");
+    status = mutexLock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_lock","epicsThreadInit");
+    ellAdd(&pthreadList,&pthreadInfo->node);
+    pthreadInfo->isOnThreadList = 1;
+    status = pthread_mutex_unlock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_unlock","epicsThreadInit");
+    status = atexit(epicsExitCallAtExits);
+    checkStatusOnce(status,"atexit");
+    epicsThreadOnceCalled = 1;
+}
+
+static void * start_routine(void *arg)
+{
+    epicsThreadOSD *pthreadInfo = (epicsThreadOSD *)arg;
+    int status;
+    sigset_t blockAllSig;
+    char comm[16];
+ 
+    /* Set the name of the thread's process. Limited to 16 characters. */
+    snprintf(comm, sizeof(comm), "%s", pthreadInfo->name);
+    prctl(PR_SET_NAME, comm, 0l, 0l, 0l);
+    pthreadInfo->lwpId = syscall(SYS_gettid);
+ 
+    sigfillset(&blockAllSig);
+    pthread_sigmask(SIG_SETMASK,&blockAllSig,NULL);
+    status = pthread_setspecific(getpthreadInfo,arg);
+    checkStatusQuit(status,"pthread_setspecific","start_routine");
+    status = mutexLock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_lock","start_routine");
+    ellAdd(&pthreadList,&pthreadInfo->node);
+    pthreadInfo->isOnThreadList = 1;
+    status = pthread_mutex_unlock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_unlock","start_routine");
+
+    (*pthreadInfo->createFunc)(pthreadInfo->createArg);
+
+    epicsExitCallAtThreadExits ();
+
+    free_threadInfo(pthreadInfo);
+    return(0);
+}
+
+static void epicsThreadInit(void)
+{
+    static pthread_once_t once_control = PTHREAD_ONCE_INIT;
+    int status = pthread_once(&once_control,once);
+    checkStatusQuit(status,"pthread_once","epicsThreadInit");
+}
+
+
+epicsShareFunc unsigned int epicsShareAPI epicsThreadGetStackSize (epicsThreadStackSizeClass stackSizeClass)
+{
+#if ! defined (_POSIX_THREAD_ATTR_STACKSIZE)
+    return 0;
+#elif defined (OSITHREAD_USE_DEFAULT_STACK)
+    return 0;
+#else
+    #define STACK_SIZE(f) (f * 0x10000 * sizeof(void *))
+    static const unsigned stackSizeTable[epicsThreadStackBig+1] = {
+        STACK_SIZE(1), STACK_SIZE(2), STACK_SIZE(4)
+    };
+    if (stackSizeClass<epicsThreadStackSmall) {
+        errlogPrintf("epicsThreadGetStackSize illegal argument (too small)");
+        return stackSizeTable[epicsThreadStackBig];
+    }
+
+    if (stackSizeClass>epicsThreadStackBig) {
+        errlogPrintf("epicsThreadGetStackSize illegal argument (too large)");
+        return stackSizeTable[epicsThreadStackBig];
+    }
+
+    return stackSizeTable[stackSizeClass];
+#endif /*_POSIX_THREAD_ATTR_STACKSIZE*/
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadOnce(epicsThreadOnceId *id, void (*func)(void *), void *arg)
+{
+    static struct epicsThreadOSD threadOnceComplete;
+    #define EPICS_THREAD_ONCE_DONE &threadOnceComplete
+    int status;
+
+    epicsThreadInit();
+    status = mutexLock(&onceLock);
+    if(status) {
+        fprintf(stderr,"epicsThreadOnce: pthread_mutex_lock returned %s.\n",
+            strerror(status));
+        exit(-1);
+    }
+
+    if (*id != EPICS_THREAD_ONCE_DONE) {
+        if (*id == EPICS_THREAD_ONCE_INIT) { /* first call */
+            *id = epicsThreadGetIdSelf();    /* mark active */
+            status = pthread_mutex_unlock(&onceLock);
+            checkStatusQuit(status,"pthread_mutex_unlock", "epicsThreadOnce");
+            func(arg);
+            status = mutexLock(&onceLock);
+            checkStatusQuit(status,"pthread_mutex_lock", "epicsThreadOnce");
+            *id = EPICS_THREAD_ONCE_DONE;    /* mark done */
+        } else if (*id == epicsThreadGetIdSelf()) {
+            status = pthread_mutex_unlock(&onceLock);
+            checkStatusQuit(status,"pthread_mutex_unlock", "epicsThreadOnce");
+            cantProceed("Recursive epicsThreadOnce() initialization\n");
+        } else
+            while (*id != EPICS_THREAD_ONCE_DONE) {
+                /* Another thread is in the above func(arg) call. */
+                status = pthread_mutex_unlock(&onceLock);
+                checkStatusQuit(status,"pthread_mutex_unlock", "epicsThreadOnce");
+                epicsThreadSleep(epicsThreadSleepQuantum());
+                status = mutexLock(&onceLock);
+                checkStatusQuit(status,"pthread_mutex_lock", "epicsThreadOnce");
+            }
+    }
+    status = pthread_mutex_unlock(&onceLock);
+    checkStatusQuit(status,"pthread_mutex_unlock","epicsThreadOnce");
+}
+
+epicsShareFunc epicsThreadId epicsShareAPI epicsThreadCreate(const char *name,
+    unsigned int priority, unsigned int stackSize,
+    EPICSTHREADFUNC funptr,void *parm)
+{
+    epicsThreadOSD *pthreadInfo;
+    int status;
+    sigset_t blockAllSig, oldSig;
+
+    epicsThreadInit();
+    assert(pcommonAttr);
+    sigfillset(&blockAllSig);
+    pthread_sigmask(SIG_SETMASK,&blockAllSig,&oldSig);
+    pthreadInfo = init_threadInfo(name,priority,stackSize,funptr,parm);
+    if(pthreadInfo==0) return 0;
+    pthreadInfo->isEpicsThread = 1;
+    setSchedulingPolicy(pthreadInfo,SCHED_FIFO);
+    pthreadInfo->isFifoScheduled = 1;
+    status = pthread_create(&pthreadInfo->tid,&pthreadInfo->attr,
+                start_routine,pthreadInfo);
+    if(status==EPERM){
+        /* Try again without SCHED_FIFO*/
+        free_threadInfo(pthreadInfo);
+        pthreadInfo = init_threadInfo(name,priority,stackSize,funptr,parm);
+        if(pthreadInfo==0) return 0;
+        pthreadInfo->isEpicsThread = 1;
+        status = pthread_create(&pthreadInfo->tid,&pthreadInfo->attr,
+                start_routine,pthreadInfo);
+    }
+    checkStatusOnce(status,"pthread_create");
+    if(status) {
+        free_threadInfo(pthreadInfo);
+        return 0;
+    }
+    status = pthread_sigmask(SIG_SETMASK,&oldSig,NULL);
+    checkStatusOnce(status,"pthread_sigmask");
+    return(pthreadInfo);
+}
+
+/*
+ * Cleanup routine for threads not created by epicsThreadCreate().
+ */
+/* static void nonEPICSthreadCleanup(void *arg)
+{
+    epicsThreadOSD *pthreadInfo = (epicsThreadOSD *)arg;
+
+    free(pthreadInfo->name);
+    free(pthreadInfo);
+} */
+
+/*
+ * Create dummy context for threads not created by epicsThreadCreate().
+ */
+static epicsThreadOSD *createImplicit(void)
+{
+    epicsThreadOSD *pthreadInfo;
+    char name[64];
+    pthread_t tid;
+    int status;
+
+    tid = pthread_self();
+    sprintf(name, "non-EPICS_%ld", (long)tid);
+    pthreadInfo = create_threadInfo(name);
+    pthreadInfo->tid = tid;
+    pthreadInfo->osiPriority = 0;
+#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) 
+    {
+    struct sched_param param;
+    int policy;
+    if(pthread_getschedparam(tid,&policy,&param) == 0)
+        pthreadInfo->osiPriority =
+                 (param.sched_priority - pcommonAttr->minPriority) * 100.0 /
+                    (pcommonAttr->maxPriority - pcommonAttr->minPriority + 1);
+    }
+#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
+    status = pthread_setspecific(getpthreadInfo,(void *)pthreadInfo);
+    checkStatusQuit(status,"pthread_setspecific","createImplicit");
+/*    pthread_cleanup_push(nonEPICSthreadCleanup, pthreadInfo); */
+    return pthreadInfo;
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadSuspendSelf(void)
+{
+    epicsThreadOSD *pthreadInfo;
+
+    epicsThreadInit();
+    pthreadInfo = (epicsThreadOSD *)pthread_getspecific(getpthreadInfo);
+    if(pthreadInfo==NULL)
+        pthreadInfo = createImplicit();
+    pthreadInfo->isSuspended = 1;
+    epicsEventMustWait(pthreadInfo->suspendEvent);
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadResume(epicsThreadOSD *pthreadInfo)
+{
+    assert(epicsThreadOnceCalled);
+    pthreadInfo->isSuspended = 0;
+    epicsEventSignal(pthreadInfo->suspendEvent);
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadExitMain(void)
+{
+    epicsThreadOSD *pthreadInfo;
+
+    epicsThreadInit();
+    pthreadInfo = (epicsThreadOSD *)pthread_getspecific(getpthreadInfo);
+    if(pthreadInfo==NULL)
+        pthreadInfo = createImplicit();
+    if(pthreadInfo->createFunc) {
+        errlogPrintf("called from non-main thread\n");
+        cantProceed("epicsThreadExitMain");
+    }
+    else {
+    free_threadInfo(pthreadInfo);
+    pthread_exit(0);
+    }
+}
+
+epicsShareFunc unsigned int epicsShareAPI epicsThreadGetPriority(epicsThreadId pthreadInfo)
+{
+    assert(epicsThreadOnceCalled);
+    return(pthreadInfo->osiPriority);
+}
+
+epicsShareFunc unsigned int epicsShareAPI epicsThreadGetPrioritySelf(void)
+{
+    epicsThreadInit();
+    return(epicsThreadGetPriority(epicsThreadGetIdSelf()));
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadSetPriority(epicsThreadId pthreadInfo,unsigned int priority)
+{
+#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) 
+    int status;
+#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
+
+    assert(epicsThreadOnceCalled);
+    assert(pthreadInfo);
+    if(!pthreadInfo->isEpicsThread) {
+        fprintf(stderr,"epicsThreadSetPriority called by non epics thread\n");
+        return;
+    }
+    pthreadInfo->osiPriority = priority;
+    if(!pthreadInfo->isFifoScheduled) return;
+#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) 
+    if(!pcommonAttr->usePolicy) return;
+    pthreadInfo->schedParam.sched_priority = getOssPriorityValue(pthreadInfo);
+    status = pthread_attr_setschedparam(
+        &pthreadInfo->attr,&pthreadInfo->schedParam);
+    if(errVerbose) checkStatus(status,"pthread_attr_setschedparam");
+    status = pthread_setschedparam(
+        pthreadInfo->tid,pcommonAttr->schedPolicy,&pthreadInfo->schedParam);
+    if(errVerbose) checkStatus(status,"pthread_setschedparam");
+#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
+}
+
+epicsShareFunc epicsThreadBooleanStatus epicsShareAPI epicsThreadHighestPriorityLevelBelow(
+    unsigned int priority, unsigned *pPriorityJustBelow)
+{
+    unsigned newPriority = priority - 1;
+#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) 
+    int diff;
+    diff = pcommonAttr->maxPriority - pcommonAttr->minPriority;
+    if(diff<0) diff = -diff;
+    if(diff>1 && diff <100) newPriority -=  100/(diff+1);
+#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
+    if (newPriority <= 99) {
+        *pPriorityJustBelow = newPriority;
+        return epicsThreadBooleanStatusSuccess;
+    }
+    return epicsThreadBooleanStatusFail;
+}
+
+epicsShareFunc epicsThreadBooleanStatus epicsShareAPI epicsThreadLowestPriorityLevelAbove(
+    unsigned int priority, unsigned *pPriorityJustAbove)
+{
+    unsigned newPriority = priority + 1;
+
+#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) 
+    int diff;
+    diff = pcommonAttr->maxPriority - pcommonAttr->minPriority;
+    if(diff<0) diff = -diff;
+    if(diff>1 && diff <100) newPriority += 100/(diff+1);
+#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
+    if (newPriority <= 99) {
+        *pPriorityJustAbove = newPriority;
+        return epicsThreadBooleanStatusSuccess;
+    }
+    return epicsThreadBooleanStatusFail;
+}
+
+epicsShareFunc int epicsShareAPI epicsThreadIsEqual(epicsThreadId p1, epicsThreadId p2)
+{
+    assert(epicsThreadOnceCalled);
+    assert(p1);
+    assert(p2);
+    return(pthread_equal(p1->tid,p2->tid));
+}
+
+epicsShareFunc int epicsShareAPI epicsThreadIsSuspended(epicsThreadId pthreadInfo) {
+    assert(epicsThreadOnceCalled);
+    assert(pthreadInfo);
+    return(pthreadInfo->isSuspended ? 1 : 0);
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadSleep(double seconds)
+{
+    struct timespec delayTime;
+    struct timespec remainingTime;
+    double nanoseconds;
+
+    if (seconds > 0) {
+        delayTime.tv_sec = seconds;
+        nanoseconds = (seconds - delayTime.tv_sec) *1e9;
+        delayTime.tv_nsec = nanoseconds;
+    }
+    else {
+        delayTime.tv_sec = 0;
+        delayTime.tv_nsec = 0;
+    }
+    while (nanosleep(&delayTime, &remainingTime) == -1 &&
+           errno == EINTR)
+        delayTime = remainingTime;
+}
+
+epicsShareFunc epicsThreadId epicsShareAPI epicsThreadGetIdSelf(void) {
+    epicsThreadOSD *pthreadInfo;
+
+    epicsThreadInit();
+    pthreadInfo = (epicsThreadOSD *)pthread_getspecific(getpthreadInfo);
+    if(pthreadInfo==NULL)
+        pthreadInfo = createImplicit();
+    assert ( pthreadInfo );
+    return(pthreadInfo);
+}
+
+epicsShareFunc pthread_t epicsShareAPI epicsThreadGetPosixThreadId ( epicsThreadId threadId )
+{
+    return threadId->tid;
+}
+
+epicsShareFunc epicsThreadId epicsShareAPI epicsThreadGetId(const char *name) {
+    epicsThreadOSD *pthreadInfo;
+    int status;
+
+    assert(epicsThreadOnceCalled);
+    status = mutexLock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_lock","epicsThreadGetId");
+    pthreadInfo=(epicsThreadOSD *)ellFirst(&pthreadList);
+    while(pthreadInfo) {
+    if(strcmp(name,pthreadInfo->name) == 0) break;
+        pthreadInfo=(epicsThreadOSD *)ellNext(&pthreadInfo->node);
+    }
+    status = pthread_mutex_unlock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_unlock","epicsThreadGetId");
+
+    return(pthreadInfo);
+}
+
+epicsShareFunc const char epicsShareAPI *epicsThreadGetNameSelf()
+{
+    epicsThreadOSD *pthreadInfo;
+
+    epicsThreadInit();
+    pthreadInfo = (epicsThreadOSD *)pthread_getspecific(getpthreadInfo);
+    if(pthreadInfo==NULL)
+        pthreadInfo = createImplicit();
+    return(pthreadInfo->name);
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadGetName(epicsThreadId pthreadInfo, char *name, size_t size)
+{
+    assert(epicsThreadOnceCalled);
+    strncpy(name, pthreadInfo->name, size-1);
+    name[size-1] = '\0';
+}
+
+static void showThreadInfo(epicsThreadOSD *pthreadInfo,unsigned int level)
+{
+    if(!pthreadInfo) {
+        fprintf(epicsGetStdout(),"            NAME           EPICS ID   "
+            "LWP ID   OSIPRI  OSSPRI  STATE\n");
+    } else {
+        struct sched_param param;
+        int policy;
+        int priority = 0;
+
+        if(pthreadInfo->tid) {
+            int status;
+            status = pthread_getschedparam(pthreadInfo->tid,&policy,&param);
+            if(!status) priority = param.sched_priority;
+        }
+        fprintf(epicsGetStdout(),"%16.16s %18p %8lu    %3d%8d %8.8s\n",
+             pthreadInfo->name,(void *)
+             pthreadInfo,(unsigned long)pthreadInfo->lwpId,
+             pthreadInfo->osiPriority,priority,
+             pthreadInfo->isSuspended?"SUSPEND":"OK");
+    }
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadShowAll(unsigned int level)
+{
+    epicsThreadOSD *pthreadInfo;
+    int status;
+
+    epicsThreadInit();
+    epicsThreadShow(0,level);
+    status = mutexLock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_lock","epicsThreadShowAll");
+    pthreadInfo=(epicsThreadOSD *)ellFirst(&pthreadList);
+    while(pthreadInfo) {
+        showThreadInfo(pthreadInfo,level);
+        pthreadInfo=(epicsThreadOSD *)ellNext(&pthreadInfo->node);
+    }
+    status = pthread_mutex_unlock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_unlock","epicsThreadShowAll");
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadShow(epicsThreadId showThread, unsigned int level)
+{
+    epicsThreadOSD *pthreadInfo;
+    int status;
+    int found = 0;
+
+    epicsThreadInit();
+    if(!showThread) {
+        showThreadInfo(0,level);
+        return;
+    }
+    status = mutexLock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_lock","epicsThreadShowAll");
+    pthreadInfo=(epicsThreadOSD *)ellFirst(&pthreadList);
+    while(pthreadInfo) {
+        if (((epicsThreadId)pthreadInfo == showThread)
+         || ((epicsThreadId)pthreadInfo->tid == showThread)) {
+            found = 1;
+            showThreadInfo(pthreadInfo,level);
+        }
+        pthreadInfo=(epicsThreadOSD *)ellNext(&pthreadInfo->node);
+    }
+    status = pthread_mutex_unlock(&listLock);
+    checkStatusQuit(status,"pthread_mutex_unlock","epicsThreadShowAll");
+    if (!found)
+        printf("Thread %#lx (%lu) not found.\n", (unsigned long)showThread, (unsigned long)showThread);
+}
+
+
+epicsShareFunc epicsThreadPrivateId epicsShareAPI epicsThreadPrivateCreate(void)
+{
+    pthread_key_t *key;
+    int status;
+
+    epicsThreadInit();
+    key = callocMustSucceed(1,sizeof(pthread_key_t),"epicsThreadPrivateCreate");
+    status = pthread_key_create(key,0);
+    checkStatusQuit(status,"pthread_key_create","epicsThreadPrivateCreate");
+    return((epicsThreadPrivateId)key);
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadPrivateDelete(epicsThreadPrivateId id)
+{
+    pthread_key_t *key = (pthread_key_t *)id;
+    int status;
+
+    assert(epicsThreadOnceCalled);
+    status = pthread_key_delete(*key);
+    checkStatusQuit(status,"pthread_key_delete","epicsThreadPrivateDelete");
+    free((void *)key);
+}
+
+epicsShareFunc void epicsShareAPI epicsThreadPrivateSet (epicsThreadPrivateId id, void *value)
+{
+    pthread_key_t *key = (pthread_key_t *)id;
+    int status;
+
+    assert(epicsThreadOnceCalled);
+    if(errVerbose && !value)
+        errlogPrintf("epicsThreadPrivateSet: setting value of 0\n");
+    status = pthread_setspecific(*key,value);
+    checkStatusQuit(status,"pthread_setspecific","epicsThreadPrivateSet");
+}
+
+epicsShareFunc void epicsShareAPI *epicsThreadPrivateGet(epicsThreadPrivateId id)
+{
+    pthread_key_t *key = (pthread_key_t *)id;
+
+    assert(epicsThreadOnceCalled);
+    return pthread_getspecific(*key);
+}
+
+epicsShareFunc double epicsShareAPI epicsThreadSleepQuantum ()
+{
+    double hz;
+    hz = sysconf ( _SC_CLK_TCK );
+    return 1.0 / hz;
+}
+

src/libCom/osi/os/RTEMS/osdSpin.c

@@ -0,0 +1,106 @@
+/*************************************************************************\
+* Copyright (c) 2012 Helmholtz-Zentrum Berlin
+*     fuer Materialien und Energie GmbH.
+* Copyright (c) 2012 ITER Organization.
+* Copyright (c) 2013 UChicago Argonne LLC, as Operator of Argonne
+*     National Laboratory.
+* Copyright (c) 2013 Brookhaven Science Assoc. as Operator of Brookhaven
+*     National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+/*
+ * Authors: Ralph Lange <Ralph.Lange@gmx.de>
+ *          Andrew Johnson <anj@aps.anl.gov>
+ *          Michael Davidsaver <mdavidsaver@bnl.gov>
+ *
+ * Inspired by Linux UP spinlocks implemention
+ *   include/linux/spinlock_api_up.h
+ */
+
+/*
+ * RTEMS (single CPU): LOCK INTERRUPT and DISABLE PREEMPTION
+ *
+ * CAVEAT:
+ * This implementation is intended for UP architectures only.
+ */
+
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ 1
+
+#include <stdlib.h>
+#include <rtems.h>
+
+#include "cantProceed.h"
+#include "epicsSpin.h"
+
+typedef struct epicsSpin {
+    rtems_interrupt_level level;
+    unsigned int locked;
+} epicsSpin;
+
+epicsSpinId epicsSpinCreate(void) {
+    return calloc(1, sizeof(epicsSpin));
+}
+
+epicsSpinId epicsSpinMustCreate(void)
+{
+    epicsSpinId ret = epicsSpinCreate();
+    if (!ret)
+        cantProceed("epicsSpinMustCreate: epicsSpinCreate failed.");
+    return ret;
+}
+
+void epicsSpinDestroy(epicsSpinId spin) {
+    free(spin);
+}
+
+void epicsSpinLock(epicsSpinId spin) {
+    rtems_interrupt_level level;
+
+    rtems_interrupt_disable(level);
+    _Thread_Disable_dispatch();
+    if (spin->locked) {
+        rtems_interrupt_enable(level);
+        _Thread_Enable_dispatch();
+        if (!rtems_interrupt_is_in_progress()) {
+            printk("epicsSpinLock(%p): Deadlock.\n", spin);
+            cantProceed("Recursive lock, missed unlock or block when locked.");
+        }
+        else {
+            printk("epicsSpinLock(%p): Deadlock in ISR.\n"
+                "Recursive lock, missed unlock or block when locked.\n",
+                spin);
+        }
+        return;
+    }
+    spin->level = level;
+    spin->locked = 1;
+}
+
+int epicsSpinTryLock(epicsSpinId spin) {
+    rtems_interrupt_level level;
+
+    rtems_interrupt_disable(level);
+    _Thread_Disable_dispatch();
+    if (spin->locked) {
+        rtems_interrupt_enable(level);
+        _Thread_Enable_dispatch();
+        return 1;
+    }
+    spin->level = level;
+    spin->locked = 1;
+    return 0;
+}
+
+void epicsSpinUnlock(epicsSpinId spin) {
+    rtems_interrupt_level level = spin->level;
+
+    if (!spin->locked) {
+        printk("epicsSpinUnlock(%p): not locked\n", spin);
+        return;
+    }
+    spin->level = spin->locked = 0;
+    rtems_interrupt_enable (level);
+    _Thread_Enable_dispatch();
+}

src/libCom/osi/os/default/osdSpin.c

@@ -0,0 +1,84 @@
+/*************************************************************************\
+* Copyright (c) 2012 Helmholtz-Zentrum Berlin
+*     fuer Materialien und Energie GmbH.
+* Copyright (c) 2012 ITER Organization.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+/*
+ * Author:  Ralph Lange <Ralph.Lange@gmx.de>
+ */
+
+#include <stdlib.h>
+
+#define epicsExportSharedSymbols
+#include "cantProceed.h"
+#include "errlog.h"
+#include "epicsMutex.h"
+#include "epicsSpin.h"
+
+/*
+ *  Default: EPICS MUTEX IMPLEMENTATION
+ */
+
+typedef struct epicsSpin {
+    epicsMutexId lock;
+} epicsSpin;
+
+epicsSpinId epicsSpinCreate(void) {
+    epicsSpin *spin;
+
+    spin = calloc(1, sizeof(*spin));
+    if (!spin)
+        goto fail;
+
+    spin->lock = epicsMutexCreate();
+    if (!spin->lock)
+        goto fail;
+
+    return spin;
+
+fail:
+    free(spin);
+    return NULL;
+}
+
+epicsSpinId epicsSpinMustCreate(void)
+{
+    epicsSpinId ret = epicsSpinCreate();
+    if(!ret)
+        cantProceed("epicsSpinMustCreate: epicsSpinCreate failed.");
+    return ret;
+}
+
+void epicsSpinDestroy(epicsSpinId spin) {
+    epicsMutexDestroy(spin->lock);
+    free(spin);
+}
+
+void epicsSpinLock(epicsSpinId spin) {
+    epicsMutexLockStatus status;
+
+    status = epicsMutexLock(spin->lock);
+    if (status != epicsMutexLockOK) {
+        errlogPrintf("epicsSpinLock(%p): epicsMutexLock returned %s\n", spin, 
+                     status == epicsMutexLockTimeout ?
+                         "epicsMutexLockTimeout" : "epicsMutexLockError");
+    }
+}
+
+int epicsSpinTryLock(epicsSpinId spin) {
+    epicsMutexLockStatus status;
+
+    status = epicsMutexTryLock(spin->lock);
+    if (status == epicsMutexLockOK) return 0;
+    if (status == epicsMutexLockTimeout) return 1;
+
+    errlogPrintf("epicsSpinTryLock(%p): epicsMutexTryLock returned epicsMutexLockError\n", spin);
+    return 2;
+}
+
+void epicsSpinUnlock(epicsSpinId spin) {
+    epicsMutexUnlock(spin->lock);
+}

src/libCom/osi/os/posix/osdEvent.c

@@ -25,6 +25,7 @@
 #include "epicsTime.h"
 #include "errlog.h"
 #include "epicsAssert.h"
+#include "osdMutex.h"
 
 /* Until these can be demonstrated to work leave them undefined*/
 #undef _POSIX_THREAD_PROCESS_SHARED
@@ -84,7 +85,7 @@ epicsShareFunc epicsEventId epicsShareAPI epicsEventCreate(epicsEventInitialStat
     int           status;
 
     pevent = callocMustSucceed(1,sizeof(*pevent),"epicsEventCreate");
-    status = pthread_mutex_init(&pevent->mutex,0);
+    status = epicsPosixMutexInit(&pevent->mutex,posixMutexDefault);
     checkStatusQuit(status,"pthread_mutex_init","epicsEventCreate");
     status = pthread_cond_init(&pevent->cond,0);
     checkStatusQuit(status,"pthread_cond_init","epicsEventCreate");