merge

.hgtags

@@ -31,3 +31,17 @@ c6df866bf6ca8f9385c91dd74b65fea34bab58ca 4.0.0
 9b26817264fe1d44b6cb2076ac0ba13cd09d63d1 4.0.0
 f9d4bcb4bd1d37c1c9046a89d2dd5c53842f5386 4.0.0
 46bd8146413cd5e201d6cc04fbf8574083be3d3a 4.0.1
+46bd8146413cd5e201d6cc04fbf8574083be3d3a 4.0.1
+70bc28ce0d9c7f9e71e4838b6a096eb44cc72178 4.0.1
+6ac0b65c229f073c3ea2d2476881dccc84c29261 4.0.2
+3ccaf3163a47c3abd61d6ce4a420a7d92241e2b9 4.0.3
+3ccaf3163a47c3abd61d6ce4a420a7d92241e2b9 4.0.3
+1d3ec1c0ff4ded3a7455776ba069882b05b6af89 4.0.3
+1d3ec1c0ff4ded3a7455776ba069882b05b6af89 4.0.3
+9447c8d124bdb6978f7fc67a8aee2206acc4c71f 4.0.3
+9447c8d124bdb6978f7fc67a8aee2206acc4c71f 4.0.3
+a5ba4f78859fe2f664c8d476bb5936fcc0738cc0 4.0.3
+a5ba4f78859fe2f664c8d476bb5936fcc0738cc0 4.0.3
+9447c8d124bdb6978f7fc67a8aee2206acc4c71f 4.0.3
+b5cb51859dcc4287f7c20df7e33117b4d40f4a5c 4.0.4
+f10ffdf0b8f55d8089a4182dc609e6e018cdb7f7 4.0.5

configure/CONFIG_SITE

@@ -20,8 +20,8 @@ CHECK_RELEASE = YES
 #   INSTALL_LOCATION here.
 #INSTALL_LOCATION=</path/name/to/install/top>
 
+-include $(TOP)/../CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local
--include $(TOP)/../CONFIG.local
 
 ifdef WITH_COVERAGE
 USR_CPPFLAGS += --coverage

configure/RELEASE

@@ -22,5 +22,5 @@
 #   PVDATA = /home/install/epicsV4/pvDataCPP
 #   EPICS_BASE = /home/install/epics/base
 
--include $(TOP)/configure/RELEASE.local
 -include $(TOP)/../RELEASE.local
+-include $(TOP)/configure/RELEASE.local

pvtoolsSrc/pvlist.cpp

@@ -453,10 +453,10 @@ void usage (void)
 //    "  -F <ofs>:          Use <ofs> as an alternate output field separator\n"
 //    "  -f <input file>:   Use <input file> as an input that provides a list input parameters(s) to be read, use '-' for stdin\n"
     "\nexamples:\n"
-             "\tpvinfo\n"
-             "\tpvinfo ioc0001\n"
-             "\tpvinfo 10.5.1.205:10000\n"
-             "\tpvinfo 0x83DE3C540000000000BF351F\n\n"
+             "\tpvlist\n"
+             "\tpvlist ioc0001\n"
+             "\tpvlist 10.5.1.205:10000\n"
+             "\tpvlist 0x83DE3C540000000000BF351F\n\n"
              , DEFAULT_TIMEOUT);
 }
 

src/pva/pvaVersion.h

@@ -26,7 +26,7 @@
 // TODO to be generated, etc.
 #define EPICS_PVA_MAJOR_VERSION 4
 #define EPICS_PVA_MINOR_VERSION 0
-#define EPICS_PVA_MAINTENANCE_VERSION 3
+#define EPICS_PVA_MAINTENANCE_VERSION 5
 #define EPICS_PVA_DEVELOPMENT_FLAG 0
 
 namespace epics {

src/remote/codec.cpp

@@ -1242,7 +1242,11 @@ namespace epics {
       }
 
       // wait read thread to die
-      bac->_shutdownEvent.wait();
+      // TODO rewise
+      // this timeout is needed where close() is initiated from the send thread,
+      // and not from the read thread as usualy - recv() does not exit until socket is not destroyed,
+      // which is done the internalDestroy() call below
+      bac->_shutdownEvent.wait(3.0);
 
       // call internal destroy
       bac->internalDestroy();
@@ -1449,7 +1453,7 @@ namespace epics {
        if (IS_LOGGABLE(logLevelDebug))
        {
            LOG(logLevelDebug,
-               "TCP socket to %s closed.",
+               "TCP socket to %s is to be closed.",
                inetAddressToString(_socketAddress).c_str());
        }
    }

src/remoteClient/clientContextImpl.cpp

@@ -2452,11 +2452,13 @@ namespace epics {
                                             );
                 m_monitorStrategy->init(structure);
                 
+                bool restoreStartedState = m_started;
+
                 // notify
                 Monitor::shared_pointer thisChannelMonitor = dynamic_pointer_cast<Monitor>(shared_from_this());
                 EXCEPTION_GUARD(m_monitorRequester->monitorConnect(status, thisChannelMonitor, structure));
 
-                if (m_started)
+                if (restoreStartedState)
                     start();
             }