Creating R3.14.12.3

Also show the other COMMANDLINE_LIBRARY choices.

configure/CONFIG_BASE_VERSION

@@ -34,7 +34,7 @@ EPICS_PATCH_LEVEL = 3
 
 # This will end in -DEV between official releases
 #EPICS_DEV_SNAPSHOT=-DEV
-EPICS_DEV_SNAPSHOT=-pre1
+#EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
 #EPICS_DEV_SNAPSHOT=-pre2-DEV
@@ -42,7 +42,7 @@ EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
-#EPICS_DEV_SNAPSHOT=
+EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_COMMON

@@ -371,6 +371,7 @@ INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))
 # Installed file permissions
 BIN_PERMISSIONS = 555
 LIB_PERMISSIONS = 444
+SHRLIB_PERMISSIONS = 555
 INSTALL_PERMISSIONS = 444
 
 #---------------------------------------------------------------

configure/CONFIG_SITE

@@ -72,6 +72,7 @@
 #       linux-cris              (Axis GNU crosscompiler on linux-x86 host)
 #       linux-cris_v10          (Axis GNU crosscompiler on linux-x86 host)
 #       linux-cris_v32          (Axis GNU crosscompiler on linux-x86 host)
+#       linux-microblaze
 #       linux-xscale_be
 #       vxWorks-486
 #       vxWorks-68040
@@ -119,9 +120,9 @@ CROSS_COMPILER_HOST_ARCHS=
 #     NOTE: os/CONFIG.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files and
 #     os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files may override
 #
-#     NOTE WIN32: YES results in a DLL.  Valid settings are
-#                   SHARED_LIBRARIES=YES and STATIC_BUILD=NO
-#                   SHARED_LIBRARIES=NO  and STATIC_BUILD=YES
+#     NOTE Windows: YES results in a DLL.  Valid settings are
+#        SHARED_LIBRARIES=YES  and  STATIC_BUILD=NO
+#        SHARED_LIBRARIES=NO   and  STATIC_BUILD=YES
 #
 SHARED_LIBRARIES=YES
 

configure/RULES.Db

@@ -228,7 +228,7 @@ $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
 $(COMMON_DIR)/%Record.h: %Record.dbd
 	@$(RM) $(notdir $@)$(DEP)
 	@$(DBDDEPENDS_CMD)
-	echo "$< : ../Makefile" >> $(notdir $@)$(DEP)
+	echo "$@ : ../Makefile" >> $(notdir $@)$(DEP)
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) $(DBDFLAGS) $< $(notdir $@)
 	@$(MV) $(notdir $@) $@
@@ -244,7 +244,7 @@ $(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd
 $(COMMON_DIR)/menu%.h: menu%.dbd
 	@$(RM) $(notdir $@)$(DEP)
 	@$(DBDDEPENDS_CMD)
-	echo "$< : ../Makefile" >> $(notdir $@)$(DEP)
+	echo "$@ : ../Makefile" >> $(notdir $@)$(DEP)
 	@$(RM) $(notdir $@)
 	$(DBTOMENUH) $(DBDFLAGS) $< $(notdir $@)
 	@$(MV) $(notdir $@) $@
@@ -269,7 +269,7 @@ $(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd
 $(COMMON_DIR)/%.dbd: %Include.dbd 
 	@$(RM) $(notdir $@)$(DEP)
 	@$(DBDDEPENDS_CMD)
-	echo "$< : ../Makefile" >> $(notdir $@)$(DEP)
+	echo "$@ : ../Makefile" >> $(notdir $@)$(DEP)
 	$(ECHO) "Expanding dbd"
 	@$(RM) $(notdir $@)
 	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $<

configure/RULES_BUILD

@@ -383,7 +383,7 @@ $(INSTALL_LIB)/%.lib: %.lib
 
 $(INSTALL_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	$(ECHO) "Installing shared library $@"
-	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_SHRLIB)
+	@$(INSTALL_LIBRARY) -d -m $(SHRLIB_PERMISSIONS) $< $(INSTALL_SHRLIB)
 ifneq ($(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE))
 ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)

configure/os/CONFIG.Common.cygwin-x86

@@ -14,7 +14,7 @@ OS_CLASS = cygwin32
 ARCH_CLASS = x86
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-LDLIBS_READLINE = -lreadline -lcurses
+LDLIBS_READLINE = -lreadline
 
 POSIX_CPPFLAGS = -D_POSIX_THREADS -D_POSIX_TIMERS
 #POSIX_CPPFLAGS += -D_POSIX_SOURCE

configure/os/CONFIG_SITE.Common.RTEMS

@@ -5,21 +5,22 @@
 
 # Where to find RTEMS
 #
-RTEMS_VERSION=4.9.2
-RTEMS_BASE=/usr/local/rtems/rtems-$(RTEMS_VERSION)
+RTEMS_VERSION = 4.10.2
+RTEMS_BASE = /usr/local/rtems/rtems-$(RTEMS_VERSION)
 
 # Cross-compile toolchain in $(RTEMS_TOOLS)/bin
 #
-RTEMS_TOOLS=$(RTEMS_BASE)
+RTEMS_TOOLS = $(RTEMS_BASE)
 
 
 # If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC
-# network configuration you must uncomment and specify your Internet 
+# network configuration you must uncomment and specify your Internet
 # Domain Name here
 #
 #OP_SYS_CFLAGS += -DRTEMS_NETWORK_CONFIG_DNS_DOMAINNAME=<domainname>
 
-#
-# Specify your desired command-line-input library
+# Select the command-line-input library to use
 #
 COMMANDLINE_LIBRARY = EPICS
+#COMMANDLINE_LIBRARY = LIBTECLA
+#COMMANDLINE_LIBRARY = READLINE

configure/os/CONFIG_SITE.Common.cygwin-x86

@@ -7,4 +7,7 @@
 
 # If readline is installed uncomment the following line
 # to add command-line editing and history support
-COMMANDLINE_LIBRARY = READLINE
+#COMMANDLINE_LIBRARY = READLINE
+
+# Uncomment the following line if readline has problems
+#LDLIBS_READLINE= -lreadline -lcurses

documentation/RELEASE_NOTES.html

@@ -3,16 +3,37 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-  <title>EPICS Base R3.14.12.3-pre1 Release Notes</title>
+  <title>EPICS Base R3.14.12.3 Release Notes</title>
 </head>
 
 <body lang="en">
-<h1 align="center">EPICS Base Release 3.14.12.3-pre1</h1>
+<h1 align="center">EPICS Base Release 3.14.12.3</h1>
 
 <h2 align="center">Changes between 3.14.12.2 and 3.14.12.3</h2>
 
 <!-- Insert new items immediately below here ... -->
 
+<h4>Hex literals in CALC expressions</h4>
+
+<p>In previous releases, CALC expressions could contain hexadecimal literal
+integers on a target if the OS implementation of strtod() allows them (the
+vxWorks implementation does not). Now hex literal integers can be used in CALC
+expressions on all architectures. Hexadecimal floating point literals may have
+worked on some architectures in the past, but will no longer be accepted.</p>
+
+<h4>CAS: Added propertyEventMask support</h4>
+
+<p>Server tools should now be able to detect subscriptions to and send updates
+for DBE_PROPERTY events, using a casEventMask value returned by the new
+caServer::propertyEventMask() method.</p>
+
+<h4>caRepeater now built by default</h4>
+
+<p>Previously caRepeater was only built for host architectures, so builds for
+cross-compiled but workstation-type targets like linux-arm did not build it.
+Explicit exceptions prevent it being built on architectures like vxWorks, RTEMS
+and iOS which do not support normal executable programs.</p>
+
 <h4>Array Subroutine (aSub) record type fixes</h4>
 
 <ul>
@@ -69,6 +90,9 @@ has trailing whitespace characters.</p>
 fixed in this release:</p>
 
 <ul>
+<li>1090009
+  <a href="https://bugs.launchpad.net/bugs/1090009">
+    osdSufficentSpaceInPoolQuery fails on vxWorks 2 GB system</a></li>
 <li>999167
   <a href="https://launchpad.net/bugs/999167">
     Missing epicsShareFunc for casStatsFetch</a></li>
@@ -82,7 +106,19 @@ fixed in this release:</p>
     error</a></li>
 <li>903448
   <a href="https://launchpad.net/bugs/903448">
-    RHEL5 nss ldap update cause stack size related failure</a></li>
+    RHEL5 nss ldap update cause stack size related failure</a>
+  <p>
+    This bug fix changed the stack sizes for both Posix and Windows targets as
+    follows:</p>
+  <table>
+    <tr><th>epicsThreadStackSizeClass</th><th>New Stack Size</th></tr>
+    <tr><td>epicsThreadStackSmall</td>
+      <td>0x10000 &times; sizeof (void *)</td></tr>
+    <tr><td>epicsThreadStackMedium</td>
+      <td>0x20000 &times; sizeof (void *)</td></tr>
+    <tr><td>epicsThreadStackBig</td>
+      <td>0x40000 &times; sizeof (void *)</td></tr>
+  </table></li>
 
 </ul>
 

src/ca/CAref.html

@@ -455,7 +455,7 @@ Environment</a> below.</p>
 <h3><a name="firewall">Firewalls</a></h3>
 
 <p>If you want channel access clients on a machine to be able to see
-beacons and replies to broadcast PV search requests you need to permit
+beacons and replies to broadcast PV search requests, you need to permit
 inbound UDP packets with source port EPICS_CA_SERVER_PORT (default is 5064)
 or destination port EPICS_CA_REPEATER_PORT (default is 5065). On systems
 using iptables this can be accomplished by rules like</p>
@@ -466,9 +466,9 @@ using iptables this can be accomplished by rules like</p>
 </pre>
 
 <p>If you want channel access servers (e.g. "soft IOCs") on a machine to be
-able to see clients you need to permit inbound TCP or UDP packets with source
-port EPICS_CA_SERVER_PORT (default is 5064).  On systems using iptables this
-can be accomplished by rules like</p>
+able to be seen by clients, you need to permit inbound TCP or UDP packets with
+destination port EPICS_CA_SERVER_PORT (default is 5064).
+On systems using iptables this can be accomplished by rules like</p>
 
 <pre>
      -A INPUT -s 192.168.0.0/22 -p udp --dport 5064 -j ACCEPT

src/ca/Makefile

@@ -91,14 +91,19 @@ PROD_LIBS = ca Com
 # needed when its an object library build
 PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
 
-PROD_HOST += caRepeater catime acctst caConnTest casw caEventRate
-OBJS_IOC += catime acctst caConnTest casw caEventRate acctstRegister
+PROD_DEFAULT += caRepeater catime acctst caConnTest casw caEventRate
+PROD_vxWorks = -nil-
+PROD_RTEMS = -nil-
+PROD_iOS = -nil-
+
+OBJS_vxWorks = catime acctst caConnTest casw caEventRate acctstRegister
+
 caRepeater_SRCS = caRepeater.cpp
-catime_SRCS = catimeMain.c catime.c 
-acctst_SRCS = acctstMain.c acctst.c 
+catime_SRCS = catimeMain.c catime.c
+acctst_SRCS = acctstMain.c acctst.c
 caEventRate_SRCS = caEventRateMain.cpp caEventRate.cpp
 casw_SRCS = casw.cpp
-caConnTest_SRCS = caConnTestMain.cpp caConnTest.cpp 
+caConnTest_SRCS = caConnTestMain.cpp caConnTest.cpp
 
 casw_SYS_LIBS_solaris = socket
 

src/cas/generic/caServer.cc

@@ -3,9 +3,8 @@
 *     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. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *      $Revision-Id$
@@ -15,8 +14,8 @@
  *              505 665 1831
  */
 
-#include "dbMapper.h"		// ait to dbr types 
-#include "gddAppTable.h"	// EPICS application type table
+#include "dbMapper.h"       // ait to dbr types 
+#include "gddAppTable.h"    // EPICS application type table
 #include "fdManager.h"
 
 #define epicsExportSharedSymbols
@@ -37,67 +36,67 @@ caServer::caServer ()
 
 caServer::~caServer()
 {
-	if (this->pCAS) {
-		delete this->pCAS;
+    if (this->pCAS) {
+        delete this->pCAS;
         this->pCAS = NULL;
-	}
+    }
 }
 
 pvExistReturn caServer::pvExistTest ( const casCtx & ctx, 
-	const caNetAddr & /* clientAddress */, const char * pPVAliasName )
+    const caNetAddr & /* clientAddress */, const char * pPVAliasName )
 {
     return this->pvExistTest ( ctx, pPVAliasName );
 }
 
 pvExistReturn caServer::pvExistTest ( const casCtx &, const char * )
 {
-	return pverDoesNotExistHere;
+    return pverDoesNotExistHere;
 }
 
 pvCreateReturn caServer::createPV ( const casCtx &, const char * )
 {
-	return S_casApp_pvNotFound;
+    return S_casApp_pvNotFound;
 }
 
 pvAttachReturn caServer::pvAttach ( const casCtx &ctx, const char *pAliasName )
 {
-	// remain backwards compatible (call deprecated routine)
-	return this->createPV ( ctx, pAliasName );
+    // remain backwards compatible (call deprecated routine)
+    return this->createPV ( ctx, pAliasName );
 }
 
-casEventMask caServer::registerEvent (const char *pName) // X aCC 361
+casEventMask caServer::registerEvent (const char *pName)
 {
-	if (this->pCAS) {
-		return this->pCAS->registerEvent(pName);
-	}
-	else {
-		casEventMask emptyMask;
-		printf("caServer:: no server internals attached\n");
-		return emptyMask;
-	}
+    if (this->pCAS) {
+        return this->pCAS->registerEvent(pName);
+    }
+    else {
+        casEventMask emptyMask;
+        printf("caServer:: no server internals attached\n");
+        return emptyMask;
+    }
 }
 
 void caServer::show(unsigned level) const
 {
-	if (this->pCAS) {
-		this->pCAS->show(level);
-	}
-	else {
-		printf("caServer:: no server internals attached\n");
-	}
+    if (this->pCAS) {
+        this->pCAS->show(level);
+    }
+    else {
+        printf("caServer:: no server internals attached\n");
+    }
 }
 
 void caServer::setDebugLevel (unsigned level)
 {
-	if (pCAS) {
-		this->pCAS->setDebugLevel(level);
-	}
-	else {
-		printf("caServer:: no server internals attached\n");
-	}
+    if (pCAS) {
+        this->pCAS->setDebugLevel(level);
+    }
+    else {
+        printf("caServer:: no server internals attached\n");
+    }
 }
 
-unsigned caServer::getDebugLevel () const // X aCC 361
+unsigned caServer::getDebugLevel () const
 {
     if (pCAS) {
         return this->pCAS->getDebugLevel();
@@ -108,7 +107,7 @@ unsigned caServer::getDebugLevel () const // X aCC 361
     }
 }
 
-casEventMask caServer::valueEventMask () const // X aCC 361
+casEventMask caServer::valueEventMask () const
 {
     if (pCAS) {
         return this->pCAS->valueEventMask();
@@ -119,7 +118,7 @@ casEventMask caServer::valueEventMask () const // X aCC 361
     }
 }
 
-casEventMask caServer::logEventMask () const // X aCC 361
+casEventMask caServer::logEventMask () const
 {
     if (pCAS) {
         return this->pCAS->logEventMask();
@@ -130,7 +129,7 @@ casEventMask caServer::logEventMask () const // X aCC 361
     }
 }
 
-casEventMask caServer::alarmEventMask () const // X aCC 361
+casEventMask caServer::alarmEventMask () const
 {
     if ( pCAS ) {
         return this->pCAS->alarmEventMask ();
@@ -141,12 +140,23 @@ casEventMask caServer::alarmEventMask () const // X aCC 361
     }
 }
 
+casEventMask caServer::propertyEventMask () const
+{
+    if (pCAS) {
+        return this->pCAS->propertyEventMask();
+    }
+    else {
+        printf("caServer:: no server internals attached\n");
+        return casEventMask();
+    }
+}
+
 class epicsTimer & caServer::createTimer ()
 {
     return fileDescriptorManager.createTimer ();
 }
 
-unsigned caServer::subscriptionEventsProcessed () const // X aCC 361
+unsigned caServer::subscriptionEventsProcessed () const
 {
     if ( pCAS ) {
         return this->pCAS->subscriptionEventsProcessed ();
@@ -156,7 +166,7 @@ unsigned caServer::subscriptionEventsProcessed () const // X aCC 361
     }
 }
 
-unsigned caServer::subscriptionEventsPosted () const // X aCC 361
+unsigned caServer::subscriptionEventsPosted () const
 {
     if ( pCAS ) {
         return this->pCAS->subscriptionEventsPosted ();

src/cas/generic/caServerI.cc

@@ -47,22 +47,23 @@ caServerI::caServerI ( caServer & tool ) :
     nEventsPosted ( 0u ),
     ioInProgressCount ( 0u )
 {
-	assert ( & adapter != NULL );
+    assert ( & adapter != NULL );
 
     // create predefined event types
     this->valueEvent = registerEvent ( "value" );
-	this->logEvent = registerEvent ( "log" );
-	this->alarmEvent = registerEvent ( "alarm" );
+    this->logEvent = registerEvent ( "log" );
+    this->alarmEvent = registerEvent ( "alarm" );
+    this->propertyEvent = registerEvent ( "property" );
 
     this->locateInterfaces ();
 
-	if (this->intfList.count()==0u) {
-		errMessage (S_cas_noInterface, 
+    if (this->intfList.count()==0u) {
+        errMessage (S_cas_noInterface, 
             "- CA server internals init unable to continue");
         throw S_cas_noInterface;
-	}
+    }
 
-	return;
+    return;
 }
 
 caServerI::~caServerI()
@@ -70,22 +71,22 @@ caServerI::~caServerI()
     delete & this->beaconAnomalyGov;
     delete & this->beaconTmr;
 
-	// delete all clients
+    // delete all clients
     while ( casStrmClient * pClient = this->clientList.get() ) {
-		delete pClient;
-	}
+        delete pClient;
+    }
 
-	casIntfOS *pIF;
-	while ( ( pIF = this->intfList.get() ) ) {
-		delete pIF;
-	}
+    casIntfOS *pIF;
+    while ( ( pIF = this->intfList.get() ) ) {
+        delete pIF;
+    }
 }
 
 void caServerI::destroyClient ( casStrmClient & client )
 {
     {
         epicsGuard < epicsMutex > locker ( this->mutex );
-	    this->clientList.remove ( client );
+        this->clientList.remove ( client );
     }
     delete & client;
 }
@@ -143,11 +144,11 @@ caStatus caServerI::attachInterface ( const caNetAddr & addrIn,
 void caServerI::sendBeacon ( ca_uint32_t beaconNo )
 {
     epicsGuard < epicsMutex > locker ( this->mutex );
-	tsDLIter < casIntfOS > iter = this->intfList.firstIter ();
-	while ( iter.valid () ) {
-		iter->sendBeacon ( beaconNo );
-		iter++;
-	}
+    tsDLIter < casIntfOS > iter = this->intfList.firstIter ();
+    while ( iter.valid () ) {
+        iter->sendBeacon ( beaconNo );
+        iter++;
+    }
 }
 
 void caServerI::generateBeaconAnomaly ()
@@ -259,11 +260,11 @@ void caServerI::casMonitorDestroy ( casMonitor & cm )
 }
 
 //
-//	caServerI::dumpMsg()
+//  caServerI::dumpMsg()
 //
-//	Debug aid - print the header part of a message.
+//  Debug aid - print the header part of a message.
 //
-//	dp arg allowed to be null
+//  dp arg allowed to be null
 //
 //
 void caServerI::dumpMsg ( const char * pHostName, const char * pUserName,

src/cas/generic/caServerI.h

@@ -44,23 +44,24 @@ caStatus convertContainerMemberToAtomic ( class gdd & dd,
          aitUint32 appType, aitUint32 elemCount );
 
 class caServerI : 
-	public caServerIO, 
-	public ioBlockedList, 
-	public casEventRegistry {
+    public caServerIO, 
+    public ioBlockedList, 
+    public casEventRegistry {
 public:
-	caServerI ( caServer &tool );
-	~caServerI ();
-	bool roomForNewChannel() const;
-	unsigned getDebugLevel() const { return debugLevel; }
-	inline void setDebugLevel ( unsigned debugLevelIn );
-	void show ( unsigned level ) const;
+    caServerI ( caServer &tool );
+    ~caServerI ();
+    bool roomForNewChannel() const;
+    unsigned getDebugLevel() const { return debugLevel; }
+    inline void setDebugLevel ( unsigned debugLevelIn );
+    void show ( unsigned level ) const;
     void destroyMonitor ( casMonitor & );
-	caServer * getAdapter ();
-	caServer * operator -> ();
-	void connectCB ( casIntfOS & );
-	casEventMask valueEventMask () const; // DBE_VALUE registerEvent("value")
-	casEventMask logEventMask () const; 	// DBE_LOG registerEvent("log") 
-	casEventMask alarmEventMask () const; // DBE_ALARM registerEvent("alarm") 
+    caServer * getAdapter ();
+    caServer * operator -> ();
+    void connectCB ( casIntfOS & );
+    casEventMask valueEventMask () const; // DBE_VALUE registerEvent("value")
+    casEventMask logEventMask () const;     // DBE_LOG registerEvent("log") 
+    casEventMask alarmEventMask () const; // DBE_ALARM registerEvent("alarm") 
+    casEventMask propertyEventMask () const; // DBE_PROPERTY registerEvent("property") 
     unsigned subscriptionEventsProcessed () const;
     void incrEventsProcessedCounter ();
     unsigned subscriptionEventsPosted () const;
@@ -82,29 +83,30 @@ public:
 private:
     clientBufMemoryManager clientBufMemMgr;
     tsFreeList < casMonitor, 1024 > casMonitorFreeList;
-	tsDLList < casStrmClient > clientList;
+    tsDLList < casStrmClient > clientList;
     tsDLList < casIntfOS > intfList;
-	mutable epicsMutex mutex;
-	mutable epicsMutex diagnosticCountersMutex;
-	caServer & adapter;
+    mutable epicsMutex mutex;
+    mutable epicsMutex diagnosticCountersMutex;
+    caServer & adapter;
     beaconTimer & beaconTmr;
     beaconAnomalyGovernor & beaconAnomalyGov;
-	unsigned debugLevel;
+    unsigned debugLevel;
     unsigned nEventsProcessed; 
     unsigned nEventsPosted; 
     unsigned ioInProgressCount;
 
     casEventMask valueEvent; // DBE_VALUE registerEvent("value")
-	casEventMask logEvent; 	// DBE_LOG registerEvent("log") 
-	casEventMask alarmEvent; // DBE_ALARM registerEvent("alarm")
+    casEventMask logEvent;  // DBE_LOG registerEvent("log")
+    casEventMask alarmEvent; // DBE_ALARM registerEvent("alarm")
+    casEventMask propertyEvent;  // DBE_PROPERTY registerEvent("property")
 
-	caStatus attachInterface ( const caNetAddr & addr, bool autoBeaconAddr,
-			bool addConfigAddr );
+    caStatus attachInterface ( const caNetAddr & addr, bool autoBeaconAddr,
+            bool addConfigAddr );
 
     void sendBeacon ( ca_uint32_t beaconNo );
 
-	caServerI ( const caServerI & );
-	caServerI & operator = ( const caServerI & );
+    caServerI ( const caServerI & );
+    caServerI & operator = ( const caServerI & );
 
     friend class beaconAnomalyGovernor;
     friend class beaconTimer;
@@ -113,17 +115,17 @@ private:
 
 inline caServer * caServerI::getAdapter()
 {
-	return & this->adapter;
+    return & this->adapter;
 }
 
 inline caServer * caServerI::operator -> ()
 {
-	return this->getAdapter();
+    return this->getAdapter();
 }
 
 inline void caServerI::setDebugLevel(unsigned debugLevelIn)
 {
-	this->debugLevel = debugLevelIn;
+    this->debugLevel = debugLevelIn;
 }
 
 inline casEventMask caServerI::valueEventMask() const
@@ -141,6 +143,11 @@ inline casEventMask caServerI::alarmEventMask() const
     return this->alarmEvent;
 }
 
+inline casEventMask caServerI::propertyEventMask() const
+{
+    return this->propertyEvent;
+}
+
 inline bool caServerI :: ioIsPending () const
 {
     return ( ioInProgressCount > 0u );

src/cas/generic/casdef.h

@@ -245,6 +245,7 @@ public:
     epicsShareFunc casEventMask valueEventMask () const; // DBE_VALUE 
     epicsShareFunc casEventMask logEventMask () const;  // DBE_LOG 
     epicsShareFunc casEventMask alarmEventMask () const; // DBE_ALARM 
+    epicsShareFunc casEventMask propertyEventMask () const; // DBE_PROPERTY
 
     epicsShareFunc void setDebugLevel ( unsigned level );
     epicsShareFunc unsigned getDebugLevel () const;

src/libCom/calc/postfix.c

@@ -71,6 +71,7 @@ static const ELEMENT operands[] = {
 {"-",		7, 8,	0,	UNARY_OPERATOR,	UNARY_NEG},
 {".",		0, 0,	1,	LITERAL_OPERAND,LITERAL_DOUBLE},
 {"0",		0, 0,	1,	LITERAL_OPERAND,LITERAL_DOUBLE},
+{"0X",		0, 0,	1,	LITERAL_OPERAND,LITERAL_INT},
 {"1",		0, 0,	1,	LITERAL_OPERAND,LITERAL_DOUBLE},
 {"2",		0, 0,	1,	LITERAL_OPERAND,LITERAL_DOUBLE},
 {"3",		0, 0,	1,	LITERAL_OPERAND,LITERAL_DOUBLE},
@@ -237,29 +238,42 @@ epicsShareFunc long
 	    operand_needed = FALSE;
 	    break;
 
-	case LITERAL_OPERAND:
-	    runtime_depth += pel->runtime_effect;
+        case LITERAL_OPERAND:
+            runtime_depth += pel->runtime_effect;
 
-	    psrc -= strlen(pel->name);
-	    lit_d = epicsStrtod(psrc, &pnext);
-	    if (pnext == psrc) {
-		*perror = CALC_ERR_BAD_LITERAL;
-		goto bad;
-	    }
-	    psrc = pnext;
-	    lit_i = lit_d;
-	    if (lit_d != (double) lit_i) {
-		*pout++ = pel->code;
-		memcpy(pout, (void *)&lit_d, sizeof(double));
-		pout += sizeof(double);
-	    } else {
-		*pout++ = LITERAL_INT;
-		memcpy(pout, (void *)&lit_i, sizeof(int));
-		pout += sizeof(int);
-	    }
+            psrc -= strlen(pel->name);
+            if (pel->code == LITERAL_DOUBLE) {
+                lit_d = epicsStrtod(psrc, &pnext);
+                if (pnext == psrc) {
+                    *perror = CALC_ERR_BAD_LITERAL;
+                    goto bad;
+                }
+                psrc = pnext;
+                lit_i = lit_d;
+                if (lit_d != (double) lit_i) {
+                    *pout++ = pel->code;
+                    memcpy(pout, (void *)&lit_d, sizeof(double));
+                    pout += sizeof(double);
+                } else {
+                    *pout++ = LITERAL_INT;
+                    memcpy(pout, (void *)&lit_i, sizeof(int));
+                    pout += sizeof(int);
+                }
+            }
+            else {
+                lit_i = strtoul(psrc, &pnext, 0);
+                if (pnext == psrc) {
+                    *perror = CALC_ERR_BAD_LITERAL;
+                    goto bad;
+                }
+                psrc = pnext;
+                *pout++ = LITERAL_INT;
+                memcpy(pout, (void *)&lit_i, sizeof(int));
+                pout += sizeof(int);
+            }
 
-	    operand_needed = FALSE;
-	    break;
+            operand_needed = FALSE;
+            break;
 
 	case STORE_OPERATOR:
 	    if (pout == ppostfix || pstacktop > stack ||

src/libCom/cxxTemplates/epicsSingleton.h

@@ -51,7 +51,11 @@ public:
         reference ( epicsSingleton & );
         reference ( const reference & );
         ~reference ();
-        reference & operator = ( const reference & );
+	// this somewhat convoluted reference of the return
+	// type ref through the epicsSingleton template is
+	// required for the archaic Tornado gnu compiler
+        typename epicsSingleton < TYPE > :: reference & 
+	    operator = ( const reference & );
         TYPE * operator -> ();
         const TYPE * operator -> () const;
         TYPE & operator * ();
@@ -102,7 +106,7 @@ inline epicsSingleton < TYPE > :: reference ::
 }
 
 template < class TYPE >
-class epicsSingleton < TYPE > :: reference & 
+typename epicsSingleton < TYPE > :: reference & 
     epicsSingleton < TYPE > :: reference :: 
         operator = ( const reference & ref )
 {
@@ -195,14 +199,14 @@ void epicsSingleton < TYPE > ::
 }
 
 template < class TYPE >
-inline class epicsSingleton < TYPE > :: reference 
+inline typename epicsSingleton < TYPE > :: reference 
     epicsSingleton < TYPE > :: getReference ()
 {
     return reference ( * this );
 }
 
 template < class TYPE >
-inline const class epicsSingleton < TYPE > :: reference 
+inline const typename epicsSingleton < TYPE > :: reference 
     epicsSingleton < TYPE > :: getReference () const
 {
     epicsSingleton < TYPE > * pConstCastAway = 

src/libCom/osi/os/vxWorks/osdPoolStatus.c

@@ -30,9 +30,7 @@ static size_t osdMaxBlockSize = 0;
 
 static void osdSufficentSpaceInPoolQuery ()
 {
-    int temp = memFindMax ();
-
-    osdMaxBlockSize = ( temp > 0 ) ? (size_t) temp : 0;
+    osdMaxBlockSize = (size_t) memFindMax ();
 }
 
 static void osdSufficentSpaceInPoolPoll ( void *pArgIn )

src/libCom/test/cvtFastPerform.cpp

@@ -60,9 +60,9 @@ void Test :: execute ()
     
     for ( unsigned i = 0; i < 3; i++ ) {
         double mVal = rand ();
-        mVal /= (RAND_MAX + 1);
+        mVal /= (RAND_MAX + 1.0);
         double fEVal = rand ();
-        fEVal /= (RAND_MAX + 1);
+        fEVal /= (RAND_MAX + 1.0);
         fEVal *= DBL_MAX_EXP - DBL_MIN_EXP;
         fEVal += DBL_MIN_EXP;
         int eVal = static_cast < int > ( fEVal + 0.5 );
@@ -72,7 +72,7 @@ void Test :: execute ()
             _measure ();
         }
         _srcVal = rand ();
-        _srcVal /= (RAND_MAX + 1);
+        _srcVal /= (RAND_MAX + 1.0);
         _srcVal *= 10.0;
         _srcVal -= 5.0;
         for ( _prec = lowPrecision; 

src/libCom/test/epicsCalcTest.cpp

@@ -238,7 +238,7 @@ MAIN(epicsCalcTest)
     const double a=1.0, b=2.0, c=3.0, d=4.0, e=5.0, f=6.0,
 		 g=7.0, h=8.0, i=9.0, j=10.0, k=11.0, l=12.0;
     
-    testPlan(570);
+    testPlan(577);
     
     /* LITERAL_OPERAND elements */
     testExpr(0);
@@ -253,6 +253,11 @@ MAIN(epicsCalcTest)
     testExpr(9);
     testExpr(.1);
     testExpr(0.1);
+    testExpr(0X0);
+    testExpr(0x10);
+    testExpr(0x7fffffff);
+    testCalc("0x80000000", -2147483648.0);
+    testCalc("0xffffffff", -1);
     testExpr(Inf);
     testCalc("Infinity", Inf);
     testExpr(NaN);
@@ -287,6 +292,7 @@ MAIN(epicsCalcTest)
     testExpr(-1);
     testExpr(-Inf);
     testExpr(- -1);
+    testCalc("-0x80000000", 2147483648.0);
     
     /* UNARY_OPERATOR elements */
     testExpr((1));
@@ -855,6 +861,7 @@ MAIN(epicsCalcTest)
     testArgs("13.1;B:=A;A:=B;C:=D;D:=C", A_A|A_D, A_A|A_B|A_C|A_D);
     
     // Malformed expressions
+    testBadExpr("0x0.1", CALC_ERR_SYNTAX);
     testBadExpr("1*", CALC_ERR_INCOMPLETE);
     testBadExpr("*1", CALC_ERR_SYNTAX);
     testBadExpr("MIN", CALC_ERR_INCOMPLETE);