amps-python-client 5.3.4.3__zip → 5.3.4.4__zip

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/include/ampspy_defs.hpp

@@ -35,6 +35,7 @@
 #include <amps/ReconnectDelayStrategy.hpp>
 #include <amps/CompositeMessageBuilder.hpp>
 #include <amps/CompositeMessageParser.hpp>
+#include <amps/amps_ssl.h>
 #include <vector>
 #include <deque>
 
@@ -139,7 +140,16 @@ namespace ampspy
 
   extern bool _is_signaled;
 
-  AMPSDLL PyObject* ssl_init_internal(const char*);
+#if PY_MAJOR_VERSION >= 3
+  AMPSDLL PyObject* ampspy_ssl_init(PyObject* self, PyObject* args, PyObject* kwds = NULL);
+  AMPSDLL PyObject* ssl_init(PyObject* self, PyObject* args, PyObject* kwds = NULL);
+  AMPSDLL PyObject* ssl_init_internal(const char*, PyObject*, bool strictCiphersOnly = false);
+
+  AMPSDLL PyObject* ampspy_get_PySSLSocket_from_SSL(_amps_SSL* ssl_);
+#else
+  AMPSDLL PyObject* ampspy_ssl_init(PyObject* self, PyObject* args);
+  AMPSDLL PyObject* ssl_init(PyObject* self, PyObject* args);
+#endif
 
 // conversions from c++ types
   inline PyObject* ret(const char* returnValue)

amps-python-client-5.3.4.4/include/ampspy_ssl.hpp

@@ -0,0 +1,31 @@
+////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2010-2024 60East Technologies Inc., All Rights Reserved.
+//
+// This computer software is owned by 60East Technologies Inc. and is
+// protected by U.S. copyright laws and other laws and by international
+// treaties.  This computer software is furnished by 60East Technologies
+// Inc. pursuant to a written license agreement and may be used, copied,
+// transmitted, and stored only in accordance with the terms of such
+// license agreement and with the inclusion of the above copyright notice.
+// This computer software or any other copies thereof may not be provided
+// or otherwise made available to any other person.
+//
+// U.S. Government Restricted Rights.  This computer software: (a) was
+// developed at private expense and is in all respects the proprietary
+// information of 60East Technologies Inc.; (b) was not developed with
+// government funds; (c) is a trade secret of 60East Technologies Inc.
+// for all purposes of the Freedom of Information Act; and (d) is a
+// commercial item and thus, pursuant to Section 12.212 of the Federal
+// Acquisition Regulations (FAR) and DFAR Supplement Section 227.7202,
+// Government's use, duplication or disclosure of the computer software
+// is subject to the restrictions set forth by 60East Technologies Inc..
+//
+////////////////////////////////////////////////////////////////////////////
+#ifndef __AMPSPY_SSL_HPP
+#define __AMPSPY_SSL_HPP
+#include <amps/amps.h>
+namespace ampspy {
+    AMPSDLL void _ampspy_ssl_cleanup(void);
+}
+#endif //__AMPSPY_SSL_HPP

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/include/ampspyver.h

@@ -25,6 +25,6 @@
 #ifndef _AMPSPYVER_H_
 #define _AMPSPYVER_H_
 
-const char* AMPS_PYTHON_VERSION = "5.3.4.3.1c0da8e.656215";
+const char* AMPS_PYTHON_VERSION = "5.3.4.4.1b5ff54.964735";
 
 #endif //_AMPSPYVER_H_

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/index.html

@@ -34,7 +34,7 @@
         <div id="banner">
             <a href="http://documentation.crankuptheamps.com/"><img id="logo" src="./docs/resources/flag_logo.svg" alt="60East flags"/></a>
             <h1>AMPS Python Client Resources</h1>
-            <h3>Version: 5.3.4.3</h3>
+            <h3>Version: 5.3.4.4</h3>
         </div>
 
         <div class="divider"></div>

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/setup.py

@@ -13,8 +13,8 @@
 ## or otherwise made available to any other person.
 ##
 ## U.S. Government Restricted Rights.  This computer software: (a) was
-## 5.3.4.3ed at private expense and is in all respects the proprietary
-## information of 60East Technologies Inc.; (b) was not 5.3.4.3ed with
+## 5.3.4.4ed at private expense and is in all respects the proprietary
+## information of 60East Technologies Inc.; (b) was not 5.3.4.4ed with
 ## government funds; (c) is a trade secret of 60East Technologies Inc.
 ## for all purposes of the Freedom of Information Act; and (d) is a
 ## commercial item and thus, pursuant to Section 12.212 of the Federal
@@ -89,7 +89,7 @@ amps_client_sources=glob.glob(os.path.join(amps_cpp_dir, 'src','*.c'))
 libraries_list = []
 extra_args = []
 link_args = []
-PY_LIMITED_API_version = "Py_LIMITED_API=0x03040000"
+PY_LIMITED_API_version = "Py_LIMITED_API=0x03060000"
 if sys.platform != "win32":
     libraries_list.append("amps")
     if sys.platform[:5] == "linux":
@@ -173,7 +173,7 @@ AMPSModule = Extension('AMPS',
 AMPSModule.py_limited_api = True
 
 # Will be replaced with the actual version number by build.xml
-module_version="5.3.4.3"
+module_version="5.3.4.4"
 
 if module_version.startswith('@'):
     # Running this on a bare repository or source tree; try finding the branch name.
@@ -182,7 +182,7 @@ if module_version.startswith('@'):
         process = subprocess.Popen(["git","rev-parse","--abbrev-ref","HEAD"],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
         result = process.communicate()
         module_version = result[0].decode('utf-8').strip()
-        if module_version == "5.3.4.3" or module_version[:5] == "auto-":
+        if module_version == "5.3.4.4" or module_version[:5] == "auto-":
             module_version = "99.99.99.99"
         print("VERSION %s"%module_version)
     except:

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/setup_amps.py

@@ -13,8 +13,8 @@
 ## or otherwise made available to any other person.
 ##
 ## U.S. Government Restricted Rights.  This computer software: (a) was
-## 5.3.4.3ed at private expense and is in all respects the proprietary
-## information of 60East Technologies Inc.; (b) was not 5.3.4.3ed with
+## 5.3.4.4ed at private expense and is in all respects the proprietary
+## information of 60East Technologies Inc.; (b) was not 5.3.4.4ed with
 ## government funds; (c) is a trade secret of 60East Technologies Inc.
 ## for all purposes of the Freedom of Information Act; and (d) is a
 ## commercial item and thus, pursuant to Section 12.212 of the Federal
@@ -61,7 +61,15 @@ amps_client_sources=glob.glob(os.path.join(amps_cpp_dir, 'src','*.c'))
 
 if sys.platform != "win32":
     if os.path.exists('src/cpp/lib/libamps.a'):
-        sys.exit(0)
+        build = False
+        last_build_time = os.path.getmtime('src/cpp/lib/libamps.a')
+        for src in amps_client_sources:
+            build = build | (os.path.getmtime(src) >= last_build_time)
+        if not build:
+            for header in glob.glob(os.path.join(amps_cpp_dir, 'include', 'amps', '*.h*')):
+                build = build | (os.path.getmtime(header) >= last_build_time)
+            if not build:
+              sys.exit(0)
     import subprocess
     f = open("foo.c", "w+")
     f.write("#include <stdatomic.h>");
@@ -84,7 +92,7 @@ elif "shared" in sys.argv or "AMPS_SHARED" in os.environ:
 
 setup(name='amps-c-client',
       description='AMPS C Client',
-      version='5.3.4.3',
+      version='5.3.4.4',
       maintainer='60East Technologies, Incorporated',
       maintainer_email='support@crankuptheamps.com',
       url='https://crankuptheamps.com',

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/ampspy_shims.cpp

@@ -23,6 +23,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 #include <ampspy_shims.hpp>
+#include <ampspy_ssl.hpp>
 
 #ifdef _WIN32
   #include <Windows.h>
@@ -73,6 +74,7 @@ namespace ampspy
     }
     PyObject* _shimExitFunc(void)
     {
+      _ampspy_ssl_cleanup();
       Py_INCREF(Py_None);
       return Py_None;
     }
@@ -185,19 +187,27 @@ namespace ampspy
       {
         ampspy::shims::Py_IsFinalizing = &ampspy36IsFinalizing;
       }
-      else if (!getSymbol("_Py_IsFinalizing", &ampspy::shims::Py_IsFinalizing))
+      else if (!getSymbol("_Py_IsFinalizing", &ampspy::shims::Py_IsFinalizing)
+               && !getSymbol("Py_IsFinalizing", &ampspy::shims::Py_IsFinalizing))
       {
-        // Python 3.7+: use _Py_IsFinalizing function
+        // Python 3.7 - 3.12: use _Py_IsFinalizing function
+        // Python 3.13+: use Py_IsFinalizing function
         PyErr_SetString(PyExc_RuntimeError,
-                        "Error locating _Py_Finalizing or _Py_IsFinalizing; cannot load AMPS.");
+                        "Error locating _Py_Finalizing, _Py_IsFinalizing, or"
+                        " Py_IsFinalizing; cannot load AMPS.");
         return false;
       }
 
+      // Python 3.6 - 3.12: use _Py_UncheckedGet function
+      // Python 3.13+: use Py_GetUnchecked function
       if (!getSymbol("_PyThreadState_UncheckedGet",
-                     &ampspy::shims::PyThreadState_UncheckedGet))
+                     &ampspy::shims::PyThreadState_UncheckedGet)
+          && !getSymbol("PyThreadState_GetUnchecked",
+                        &ampspy::shims::PyThreadState_UncheckedGet))
       {
         PyErr_SetString(PyExc_RuntimeError,
-                        "Error locating _PyThreadState_UncheckedGet; cannot load AMPS.");
+                        "Error locating _PyThreadState_UncheckedGet or"
+                        " PyThreadState_GetUnchecked; cannot load AMPS.");
         return false;
       }
       if (!getSymbol("PyUnicode_AsUTF8AndSize",

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/client.cpp

@@ -378,6 +378,9 @@ namespace ampspy
         }
         delete pCallbackInfos;
       }
+      Py_CLEAR(self->threadCreatedCallback);
+      Py_CLEAR(self->message_args);
+      Py_CLEAR(self->message);
     }
 
     AMPSDLL void destructor(PyObject* self_)
@@ -535,7 +538,7 @@ namespace ampspy
       if (strlen(uri) > 3 && uri[0] == 't' && uri[1] == 'c' && uri[2] == 'p'
           && uri[3] == 's')
       {
-        PyObject* initResult = ssl_init_internal(NULL);
+        PyObject* initResult = ampspy_ssl_init(NULL, NULL);
         if (initResult == NULL)
         {
           return NULL;
@@ -2434,6 +2437,22 @@ namespace ampspy
                               msgHandler));
     }
 
+#if PY_MAJOR_VERSION >= 3
+//    def get_ssl(self)
+    static PyObject* get_ssl(obj* self, PyObject* args)
+    {
+      _amps_SSL* ssl = NULL;
+      {
+        UNLOCKGIL;
+        if (((AMPS::Client*)(self->pClient))->getURI().find("tcps") != std::string::npos)
+        {
+          ssl = (void*)(amps_tcps_get_SSL(amps_client_get_transport(((AMPS::Client*)(self->pClient))->getHandle())));
+        }
+      }
+      return ampspy_get_PySSLSocket_from_SSL(ssl);
+    }
+#endif
+
 ///
 /// This method is used by python internals for garbage collection.
 ///
@@ -2635,6 +2654,10 @@ namespace ampspy
       .addKeywordMethod("set_global_command_type_message_handler",
                         set_global_command_type_message_handler,
                         set_global_command_type_message_handler_doc)
+#if PY_MAJOR_VERSION >= 3
+      .addMethod("get_ssl", get_ssl,
+                 "For a tcps client, returns the PySSLSocket of the connection")
+#endif
       .addGetter("_as_parameter_", (void*)get_as_parameter,
                  "Underlying Client pointer for use with foreign functions and the ctypes module.")
       .createType()

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/include/amps/HAClient.hpp

@@ -358,7 +358,11 @@ namespace AMPS
     {
       haClient.connectAndLogonInternal();
     }
-    catch ( AMPSException& )
+    catch (RetryOperationException& )
+    {
+      throw;
+    }
+    catch (AMPSException& )
     {
       // -V565
     }

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/include/amps/HAClientImpl.hpp

@@ -162,6 +162,10 @@ namespace AMPS
           }
         }
       }
+      catch (const RetryOperationException&)
+      {
+        // pass - recv thread was started and is handling reconnect
+      }
       catch (...)
       {
         // Failure, make sure we're disconnected
@@ -185,19 +189,15 @@ namespace AMPS
       throw AlreadyConnectedException("Attempt to call logon on an HAClient. Use connectAndLogon() instead.");
     }
 
-    static void HADoNothingDisconnectHandler(amps_handle /*client*/,
-                                             void* /*data*/)
-    {
-      ;
-    }
-
     class DisconnectHandlerDisabler
     {
     public:
       DisconnectHandlerDisabler()
-        : _pClient(NULL), _queueAckTimeout(0)  { }
+        : _pClient(NULL), _queueAckTimeout(0), _disconnect(false)  { }
       DisconnectHandlerDisabler(HAClientImpl* pClient_)
         : _pClient(pClient_)
+        , _queueAckTimeout(0)
+        , _disconnect(false)
       {
         setHandler();
         _queueAckTimeout = _pClient->getAckTimeout();
@@ -205,9 +205,18 @@ namespace AMPS
       }
       ~DisconnectHandlerDisabler()
       {
-        clear();
+        _clear();
       }
       void clear()
+      {
+        _clear();
+        if (_disconnect)
+        {
+          _disconnect = false;
+          throw DisconnectedException("Client disconnected during logon.");
+        }
+      }
+      void _clear()
       {
         if (_pClient)
         {
@@ -232,18 +241,27 @@ namespace AMPS
           _queueAckTimeout = _pClient->getAckTimeout();
           _pClient->setAckTimeout(0);
           amps_client_disconnect(_pClient->getHandle());
+          _disconnect = false;
         }
       }
       void setHandler()
       {
+        _disconnect = false;
         amps_client_set_disconnect_handler(
           _pClient->getHandle(),
-          (amps_handler)HAClientImpl::HADoNothingDisconnectHandler,
-          _pClient);
+          (amps_handler)HAClientImpl::DisconnectHandlerDisabler::HADoNothingDisconnectHandler,
+          (void*)&_disconnect);
       }
+      static void HADoNothingDisconnectHandler(amps_handle /*client*/,
+                                               void* pDisconnect_)
+      {
+        *(bool*)pDisconnect_ = true;
+      }
+
     private:
       HAClientImpl* _pClient;
       int _queueAckTimeout;
+      bool _disconnect;
     };
 
     void connectAndLogonInternal()
@@ -254,6 +272,11 @@ namespace AMPS
       }
       {
         DisconnectHandlerDisabler disconnectDisabler;
+        TryLock<Mutex> l(_connectLock);
+        if (!l.isLocked())
+        {
+          throw RetryOperationException("Retry, another thread is handling reconnnect");
+        }
         while (!_disconnected)
         {
           std::string uri = _serverChooser.getCurrentURI();
@@ -262,8 +285,6 @@ namespace AMPS
             throw ConnectionException("No AMPS instances available for connection. " + _serverChooser.getError());
           }
           Authenticator& auth = _serverChooser.getCurrentAuthenticator();
-          // Begin locked section - see AC-1017
-          Lock<Mutex> l(_connectLock);
           _sleepBeforeConnecting(uri);
           try
           {
@@ -315,7 +336,6 @@ namespace AMPS
                 throw;
               }
             }
-            disconnectDisabler.clear();
             try
             {
               _serverChooser.reportSuccess(getConnectionInfo());
@@ -326,11 +346,11 @@ namespace AMPS
               ClientImpl::disconnect();
               throw;
             }
+            disconnectDisabler.clear();
             break;
           }
           catch (const AMPSException& ex)
           {
-            Unlock<Mutex> u(_connectLock);
             ConnectionInfo ci = getConnectionInfo();
             // Substitute the URI on the connection info with the one we attempted
             ci["client.uri"] = uri;
@@ -388,10 +408,9 @@ namespace AMPS
 
     void disconnect()
     {
-      {
-        Lock<Mutex> l(_connectLock);
-        _disconnected = true;
-      }
+      _disconnected = true;
+      // Grabbing this lock ensures no other thread is trying to reconnect
+      Lock<Mutex> l(_connectLock);
       ClientImpl::disconnect();
     }
     void _millisleep(unsigned int millis_)

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/include/amps/LoggedBookmarkStore.hpp

@@ -598,7 +598,7 @@ namespace AMPS
     }
 
 #ifdef _WIN32
-    typedef DWORD ERRTYPE ;
+    typedef DWORD ERRTYPE;
     ERRTYPE getErrorNo() const
     {
       return GetLastError();

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/include/amps/MMapStoreBuffer.hpp

@@ -54,9 +54,9 @@ namespace AMPS
     /// mapped file used for storage. If the file exists and contains valid
     /// messages, they will be available for replay.
     /// \param fileName_ The name of the file mapped to memory.
+#ifdef _WIN32
     MMapStoreBuffer(const std::string& fileName_)
       : MemoryStoreBuffer(MemoryStoreBuffer::EMPTY)
-#ifdef _WIN32
       , _mapFile(INVALID_HANDLE_VALUE), _file(INVALID_HANDLE_VALUE)
     {
       _file = CreateFileA(fileName_.c_str(), GENERIC_READ | GENERIC_WRITE, 0,
@@ -79,9 +79,12 @@ namespace AMPS
 #else
       size_t fileSize = liFileSize.LowPart;
 #endif
-      _setSize(AMPS_MEMORYBUFFER_DEFAULT_LENGTH > fileSize
-               ? AMPS_MEMORYBUFFER_DEFAULT_LENGTH : fileSize);
+      _setSize( AMPS_MEMORYBUFFER_DEFAULT_LENGTH > fileSize ?
+                AMPS_MEMORYBUFFER_DEFAULT_LENGTH : fileSize);
+    }
 #else
+    MMapStoreBuffer(const std::string& fileName_)
+      : MemoryStoreBuffer(MemoryStoreBuffer::EMPTY)
     {
       _fd = ::open(fileName_.c_str(), O_CREAT | O_RDWR, (mode_t)0644);
       struct stat statBuf;
@@ -96,8 +99,8 @@ namespace AMPS
       _setSize(recovery ? (size_t)statBuf.st_size
                         : AMPS_MEMORYBUFFER_DEFAULT_LENGTH,
                recovery);
-#endif
     }
+#endif
 
     ~MMapStoreBuffer()
     {

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/include/amps/MemoryBookmarkStore.hpp

@@ -162,28 +162,39 @@ namespace AMPS
           */
           {
             // Is this an attempt at a range?
-            if (!BookmarkRange::isRange(bookmark_))
+            bool isRange = BookmarkRange::isRange(bookmark_);
+            bool startExclusive = false;
+            if (isRange)
             {
-              _entries[_current]._val.deepCopy(bookmark_);
-            }
-            else
-            {
-              // Deep copy of the range is saved
               _range.set(bookmark_);
               // Stricter check on range syntax
               if (!_range.isValid())
               {
+                _range.clear();
                 throw CommandException("Invalid bookmark range specified.");
               }
-              if (!_range.isStartInclusive())
+              startExclusive = !_range.isStartInclusive();
+            }
+            if (isRange || _publishers.empty())
+            {
+              // Check validity and init publishers map for a range
+              Message::Field parseable = isRange ? _range.getStart() : bookmark_;
+              amps_uint64_t publisher, sequence;
+              std::vector<Field> bmList = Field::parseBookmarkList(parseable);
+              if (bmList.empty() && !Field::isTimestamp(parseable))
               {
-                // Put it in our publishers map
-                amps_uint64_t publisher, sequence;
-                std::vector<Field> bmList = Field::parseBookmarkList(_range.getStart());
-                for (std::vector<Field>::iterator bkmk = bmList.begin(); bkmk != bmList.end(); ++bkmk)
+                if (isRange)
+                {
+                  _range.clear();
+                }
+                return 0;
+              }
+              for (std::vector<Field>::iterator bkmk = bmList.begin(); bkmk != bmList.end(); ++bkmk)
+              {
+                parseBookmark(*bkmk, publisher, sequence);
+                if (publisher != (amps_uint64_t)0)
                 {
-                  parseBookmark(*bkmk, publisher, sequence);
-                  if (publisher != (amps_uint64_t)0)
+                  if (isRange && startExclusive)
                   {
                     // Compare it to our publishers map
                     PublisherIterator pub = _publishers.find(publisher);
@@ -193,7 +204,27 @@ namespace AMPS
                     }
                   }
                 }
+                else if (!Field::isTimestamp(*bkmk))
+                {
+                  // This is an invalid bookmark, so don't save anything
+                  if (isRange)
+                  {
+                    _range.clear();
+                    if (startExclusive)
+                    {
+                      _publishers.clear();
+                    }
+                  }
+                  return 0;
+                }
               }
+            }
+            if (!isRange)
+            {
+              _entries[_current]._val.deepCopy(bookmark_);
+            }
+            else
+            {
               Unlock<Mutex> unlock(_subLock);
               _store->updateAdapter(this);
               // Don't actually log a range
@@ -276,11 +307,18 @@ namespace AMPS
         {
           return false;
         }
-        // Check if we've already recovered this bookmark
-        size_t recoveredIdx = recover(bookmark_, false);
 
         amps_uint64_t publisher, sequence;
         parseBookmark(bookmark_, publisher, sequence);
+        // Bookmarks like EPOCH, NOW, or invalid bookmarks we ignore
+        // A timestamp could be logged as the first bookmark when starting
+        // a new subscription.
+        if (publisher == 0 && !Field::isTimestamp(bookmark_))
+        {
+          return true;
+        }
+        // Check if we've already recovered this bookmark
+        size_t recoveredIdx = recover(bookmark_, false);
         // Compare it to our publishers map
         PublisherIterator pub = _publishers.find(publisher);
         if (pub == _publishers.end() || pub->second < sequence)
@@ -421,9 +459,9 @@ namespace AMPS
             }
           }
           std::string recent = os.str();
-          totalLen = recent.length();
           if (!recent.empty())
           {
+            totalLen = recent.length();
             if (!_recoveryTimestamp.empty())
             {
               totalLen += _recoveryTimestamp.len();
@@ -794,22 +832,6 @@ namespace AMPS
         }
       };
 
-      struct EntryHash
-      {
-        Field::FieldHash _hasher;
-
-        size_t operator()(const Entry* entryPtr_) const
-        {
-          return _hasher(entryPtr_->_val);
-        }
-
-        bool operator()(const Entry* lhsPtr_, const Entry* rhsPtr_) const
-        {
-          return _hasher(lhsPtr_->_val, rhsPtr_->_val);
-        }
-      };
-
-      //typedef std::set<Entry*, EntryHash> EntryPtrList;
       typedef std::vector<Entry*> EntryPtrList;
 
       void getRecoveryEntries(EntryPtrList& list_)

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/include/amps/Message.hpp

@@ -1573,7 +1573,8 @@ namespace AMPS
       return _body.get().getIgnoreAutoAck();
     }
 
-    template <class T> // static
+    // static
+    template <class T>
     void throwFor(const T& /*context_*/, const std::string& ackReason_) const
     {
       switch (ackReason_[0])

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/include/amps/MessageRouter.hpp

@@ -402,23 +402,29 @@ namespace AMPS
       void invalidateCache(const std::atomic<uint_fast64_t>& generationCount_, amps_uint64_t hashVal_)
       {
         _generationCount.store(generationCount_);
+        _hashVal = hashVal_;
+        clear();
+      }
 #else
       void invalidateCache(const AMPS_ATOMIC_TYPE& generationCount_, amps_uint64_t hashVal_)
       {
         _generationCount = generationCount_;
-#endif
         _hashVal = hashVal_;
         clear();
       }
+#endif
 
 #if __cplusplus >= 201100L || _MSC_VER >= 1900
       bool isCacheHit(const std::atomic<uint_fast64_t>& generationCount_, amps_uint64_t hashVal_) const
+      {
+        return _generationCount == generationCount_ && _hashVal == hashVal_;
+      }
 #else
       bool isCacheHit(const AMPS_ATOMIC_TYPE& generationCount_, amps_uint64_t hashVal_) const
-#endif
       {
         return _generationCount == generationCount_ && _hashVal == hashVal_;
       }
+#endif
 
     private:
 #if __cplusplus >= 201100L || _MSC_VER >= 1900

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/include/amps/ReconnectDelayStrategy.hpp

@@ -23,8 +23,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-#ifndef _AMPS_RECONNECTDELAYSTRATEGY_HPP
-#define _AMPS_RECONNECTDELAYSTRATEGY_HPP
+#ifndef _AMPS_RECONNECTDELAYSTRATEGY_HPP_
+#define _AMPS_RECONNECTDELAYSTRATEGY_HPP_
 
 
 #include <amps/ReconnectDelayStrategyImpl.hpp>

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/include/amps/RingBookmarkStore.hpp

@@ -613,7 +613,7 @@ namespace AMPS
       return _positionMap[subId_];
     }
 
-    Subscription* find(const Message::Field& subId_)
+    MemoryBookmarkStore::Subscription* find(const Message::Field& subId_)
     {
       if (subId_.empty())
       {
@@ -647,6 +647,9 @@ namespace AMPS
         SYSTEM_INFO SYS_INFO;
         GetSystemInfo(&SYS_INFO);
         pageSize = SYS_INFO.dwPageSize;
+      }
+      return pageSize;
+    }
 #else
     static size_t getPageSize()
     {
@@ -654,10 +657,10 @@ namespace AMPS
       if (pageSize == 0)
       {
         pageSize = (size_t)sysconf(_SC_PAGESIZE);
-#endif
       }
       return pageSize;
     }
+#endif
 
 
   };