amps-python-client 5.3.4.2__zip → 5.3.4.4__zip

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/command_docs.h

@@ -26,11 +26,9 @@
 
 #define COMMAND_SETTER_BOILERPLATE "\n\nNot all headers are processed by AMPS for all commands. See the AMPS Command Reference for which headers are used by AMPS for a specific command.\n\n:param value: The new value to set for the header.\n\n:returns: This command."
 
-// #define COMMAND_SETTER_BOILERPLATE "\nNot all headers are processed by AMPS for all commands. See the AMPS Command Reference\nfor which headers are used by AMPS for a specific command.\n\n:param value: The new value to set for the header.\n\n:returns: This command.\n";
 
-
-static const char* command_class_doc = R"docstring(
-AMPS.Command represents a single message (or *command*) sent to the
+static const char* command_class_doc = R"docstring(Command(command_name)
+``AMPS.Command`` represents a single message (or *command*) sent to the
 AMPS server. The class provides methods for headers that are used
 for commands to the server. Applications typically use this class
 to create outgoing requests to AMPS. The responses to requests,
@@ -49,6 +47,11 @@ Command, set options as described in the Command Cookbook in the
 Python Developer Guide or the AMPS Command Reference, and then use
 :func:`AMPS.Client.execute_async()` to process messages asynchronously,
 or :func:`AMPS.Client.execute()` to process messages synchronously.
+
+**Constructor Arguments:**
+
+:param command_name: The name of the command to send to the server. 
+                     For example, ``sow``, ``sow_and_subscribe`` or ``publish``.
 )docstring";
 
 
@@ -142,7 +145,7 @@ static const char* set_bookmark_doc = R"docstring(set_bookmark(value)
 Sets the value of the bookmark header. For a subscription, this identifies the point in the
 transaction log at which to begin the replay. For a ``sow_delete`` (queue acknowledgment), this
 indicates the message or messages to acknowledge. For a query on a SOW topic with
-History configured, this indicates the point at which to query the topic.
+``History`` configured, this indicates the point at which to query the topic.
 )docstring"
 COMMAND_SETTER_BOILERPLATE;
 
@@ -265,5 +268,7 @@ static const char* get_sequence_doc = R"docstring(get_sequence()
 Gets the sequence of self for ``publish``, ``delta_publish``, or ``sow_delete`` commands.
 This can be checked after calling ``execute`` or ``executeAsync`` to query the sequence
 number that was used, if any.
+
+:returns: The sequence number used in the last ``publish``, ``delta_publish``, or ``sow_delete`` command.
 )docstring";
 

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/cpp/include/amps/BlockPublishStore.hpp

@@ -42,9 +42,6 @@
   #include <sys/timeb.h>
 #else
   #include <sys/time.h>
-  #if AMPS_SSE_42
-    #include <cpuid.h>
-  #endif
 #endif
 #include <iostream>
 

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/cpp/include/amps/BlockStore.hpp

@@ -40,9 +40,6 @@
   #include <sys/timeb.h>
 #else
   #include <sys/time.h>
-  #if AMPS_SSE_42
-    #include <cpuid.h>
-  #endif
 #endif
 #include <iostream>
 

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/cpp/include/amps/Field.hpp

@@ -163,7 +163,7 @@ namespace AMPS
       {
         return (!_data && !rhs_);
       }
-      return ::strncmp(_data, rhs_, _len) == 0 && rhs_[_len] == '\0';
+      return (_len == strlen(rhs_)) && (::strncmp(_data, rhs_, _len) == 0);
     }
 
     bool operator<(const Field& rhs) const;
@@ -189,7 +189,7 @@ namespace AMPS
     ///
     bool operator!=(const char* rhs_) const
     {
-      return strncmp(_data, rhs_, _len) != 0 || rhs_[_len] != '\0';
+      return (_len != strlen(rhs_)) || (::memcmp(_data, rhs_, _len) != 0);
     }
 
     ///
@@ -365,6 +365,10 @@ namespace AMPS
                               amps_uint64_t& sequenceNumber_)
     {
       publisherId_ = sequenceNumber_ = (amps_uint64_t)0;
+      if (field_.empty())
+      {
+        return;
+      }
       const char* data = field_.data();
       size_t len = field_.len();
       // Can't parse a timestamp

{amps-python-client-5.3.4.2 → 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.2 → 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.2 → 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.2 → 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,
@@ -81,7 +81,10 @@ namespace AMPS
 #endif
       _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;
@@ -92,11 +95,12 @@ namespace AMPS
         os << "Failed to stat file " << fileName_ << " for MMapStoreBuffer";
         error(os.str());
       }
-      _bufferLen = (size_t)statBuf.st_size;
-      _setSize(statBuf.st_size > (ssize_t)AMPS_MEMORYBUFFER_DEFAULT_LENGTH
-               ? (size_t)statBuf.st_size : AMPS_MEMORYBUFFER_DEFAULT_LENGTH);
-#endif
+      bool recovery = statBuf.st_size >= (ssize_t)AMPS_MEMORYBUFFER_DEFAULT_LENGTH;
+      _setSize(recovery ? (size_t)statBuf.st_size
+                        : AMPS_MEMORYBUFFER_DEFAULT_LENGTH,
+               recovery);
     }
+#endif
 
     ~MMapStoreBuffer()
     {
@@ -127,7 +131,7 @@ namespace AMPS
 
     void sync()
     {
-      if (_buffer != NULL)
+      if (_buffer != NULL && _bufferLen)
       {
 #ifdef _WIN32
         if (!FlushViewOfFile(_buffer, _bufferPos))
@@ -148,7 +152,7 @@ namespace AMPS
       _setSize(newSize_);
     }
 
-    void _setSize(size_t newSize_)
+    void _setSize(size_t newSize_, bool recovery_ = false)
     {
       if (_bufferLen > 0)
       {
@@ -202,13 +206,16 @@ namespace AMPS
              << " requested new size: " << newSize_;
           error(os.str());
         }
-        if (::write(_fd, "", 1) == -1)
+        if (!recovery_)
         {
-          std::ostringstream os;
-          os << "Failed to grow buffer; buffer: " << (size_t)_buffer << " length: "
-             << _bufferLen << " pos: " << _bufferPos << " requested new size: "
-             << newSize_;
-          error(os.str());
+          if (::write(_fd, "", 1) == -1)
+          {
+            std::ostringstream os;
+            os << "Failed to grow buffer; buffer: " << (size_t)_buffer << " length: "
+               << _bufferLen << " pos: " << _bufferPos << " requested new size: "
+               << newSize_;
+            error(os.str());
+          }
         }
       }
 
@@ -236,7 +243,10 @@ namespace AMPS
         _bufferLen = 0;
         error(os.str());
       }
-      _buffer = (char*)result;
+      else
+      {
+        _buffer = (char*)result;
+      }
 #endif
       if (_buffer)
       {

{amps-python-client-5.3.4.2 → 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.2 → amps-python-client-5.3.4.4}/src/cpp/include/amps/MemoryStoreBuffer.hpp

@@ -230,7 +230,10 @@ namespace AMPS
 
   protected:
     enum CtorFlag { EMPTY };
-    MemoryStoreBuffer(CtorFlag) : _buffer(0), _bufferLen(0), _bufferPos(0)
+    MemoryStoreBuffer(CtorFlag)
+    : _buffer(nullptr)
+    , _bufferLen(0)
+    , _bufferPos(0)
     {}
 
     char*  _buffer;

{amps-python-client-5.3.4.2 → 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])
@@ -1811,6 +1812,14 @@ namespace AMPS
   inline bool
   AMPS::Field::operator<(const AMPS::Field& rhs) const
   {
+    if (!data())
+    {
+      return rhs.data() != NULL;
+    }
+    if (!rhs.data())
+    {
+      return false;
+    }
     return std::lexicographical_compare(data(), data() + len(), rhs.data(), rhs.data() + rhs.len());
   }
 

{amps-python-client-5.3.4.2 → 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.2 → 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.2 → 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
 
 
   };

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/cpp/include/amps/SOWRecoveryPointAdapter.hpp

@@ -47,33 +47,42 @@ using std::string;
     std::ostringstream os; \
     os << x << ": AMPSException " << ex_.what(); \
     StoreException ex(os.str()); \
-    if (!_throwNotListen && _pExceptionListener) \
+    if (_throwNotListen) \
+    { \
+      throw ex;\
+    } \
+    else if (_pExceptionListener) \
     { \
       _pExceptionListener->exceptionThrown(ex); \
     } \
-    else throw ex; \
   } \
   catch (const std::exception& ex_) \
   { \
     std::ostringstream os; \
     os << x << ": std::exception " << ex_.what(); \
     StoreException ex(os.str()); \
-    if (!_throwNotListen && _pExceptionListener) \
+    if (_throwNotListen) \
+    { \
+      throw ex;\
+    } \
+    else if (_pExceptionListener) \
     { \
       _pExceptionListener->exceptionThrown(ex); \
     } \
-    else throw ex; \
   } \
   catch (...) \
   { \
     std::ostringstream os; \
     os << x << ": Unknown exception"; \
     StoreException ex(os.str()); \
-    if (!_throwNotListen && _pExceptionListener) \
+    if (_throwNotListen) \
+    { \
+      throw ex;\
+    } \
+    else if (_pExceptionListener) \
     { \
       _pExceptionListener->exceptionThrown(ex); \
     } \
-    else throw ex; \
   }
 
 namespace AMPS

{amps-python-client-5.3.4.2 → amps-python-client-5.3.4.4}/src/cpp/include/amps/ServerChooser.hpp

@@ -51,6 +51,8 @@ namespace AMPS
 
     ServerChooser(ServerChooserImpl* body_) : _body(body_) {}
 
+    ~ServerChooser() {}
+
     bool isValid()
     {
       return _body.isValid();
@@ -127,16 +129,25 @@ namespace AMPS
       _body.get().remove(uri_);
     }
 
-    ~ServerChooser() {}
+    ServerChooser(const ServerChooser& rhs) : _body(rhs._body)
+    {
+    }
+#if defined(__GXX_EXPERIMENTAL_CXX0X__) || _MSC_VER >= 1600
+    ServerChooser(ServerChooser&& rhs) : _body(rhs._body)
+    {
+    }
 
+    ServerChooser& operator=(ServerChooser&& rhs)
+    {
+      _body = rhs._body;
+      return *this;
+    }
+#endif // defined(__GXX_EXPERIMENTAL_CXX0X__) || _MSC_VER >= 1600
     ServerChooser& operator=(const ServerChooser& rhs)
     {
       _body = rhs._body;
       return *this;
     }
-
-    ServerChooser(const ServerChooser& rhs) : _body(rhs._body) {}
-
   };
 
 } //namespace AMPS