From 1693625f0d669a8e9ba4ae3516a8d27e3e90123d Mon Sep 17 00:00:00 2001 From: Dave Hickin Date: Fri, 4 Mar 2016 19:16:19 +0000 Subject: [PATCH 1/3] Set version to 4.1.3-SNAPSHOT --- src/pva/pvaVersion.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pva/pvaVersion.h b/src/pva/pvaVersion.h index 4b63c18..9d1ce50 100644 --- a/src/pva/pvaVersion.h +++ b/src/pva/pvaVersion.h @@ -26,8 +26,8 @@ // TODO to be generated, etc. #define EPICS_PVA_MAJOR_VERSION 4 #define EPICS_PVA_MINOR_VERSION 1 -#define EPICS_PVA_MAINTENANCE_VERSION 2 -#define EPICS_PVA_DEVELOPMENT_FLAG 0 +#define EPICS_PVA_MAINTENANCE_VERSION 3 +#define EPICS_PVA_DEVELOPMENT_FLAG 1 namespace epics { namespace pvAccess { From c8e150874ea56055ff629510de57e9254a53792a Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Sat, 27 Feb 2016 19:54:57 +0100 Subject: [PATCH 2/3] monitor overrun double ref. fix (cherry picked from commit fea2e1c26390158ec1a93c14abcde58a6ebc8101) --- src/remoteClient/clientContextImpl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp index 8ead845..701939a 100644 --- a/src/remoteClient/clientContextImpl.cpp +++ b/src/remoteClient/clientContextImpl.cpp @@ -2295,7 +2295,8 @@ namespace epics { m_up2datePVStructure = pvStructure; - m_monitorQueue.push(newElement); + if (!m_overrunInProgress) + m_monitorQueue.push(newElement); } if (!m_overrunInProgress) From f1c2a3d5d46cc125ef55bad9b6f8e027e78fdade Mon Sep 17 00:00:00 2001 From: Dave Hickin Date: Fri, 4 Mar 2016 19:44:03 +0000 Subject: [PATCH 3/3] 4.1.3 release --- RELEASE_NOTES.md | 5 +++++ src/pva/pvaVersion.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d1252c7..159e04e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,8 @@ +Release 4.1.3 +========== + +* Monitor fix: element no longer queued when overrun in progress. + Release 4.1.2 ========== diff --git a/src/pva/pvaVersion.h b/src/pva/pvaVersion.h index 9d1ce50..24b4063 100644 --- a/src/pva/pvaVersion.h +++ b/src/pva/pvaVersion.h @@ -27,7 +27,7 @@ #define EPICS_PVA_MAJOR_VERSION 4 #define EPICS_PVA_MINOR_VERSION 1 #define EPICS_PVA_MAINTENANCE_VERSION 3 -#define EPICS_PVA_DEVELOPMENT_FLAG 1 +#define EPICS_PVA_DEVELOPMENT_FLAG 0 namespace epics { namespace pvAccess {