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}/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.3 → amps-python-client-5.3.4.4}/src/cpp/include/amps/amps.h

@@ -758,6 +758,8 @@ amps_now(void);
  */
 AMPSDLL int amps_ssl_init(const char* dllPath_);
 
+AMPSDLL int amps_ssl_init_from_context(void* sslContext_, const char* fileName_);
+
 /**
  * Configures OpenSSL to validate the server's certificate when connecting.
  * This parameter must be set before attempting to connect to AMPS.

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

@@ -43,6 +43,7 @@
   #define _AMPS_TLS_KEY DWORD
   char* _amps_strndup(const char* ptr_, size_t len_);
   #define _AMPS_STRNDUP _amps_strndup
+  #define AMPS_CLOSESOCKET closesocket
 
 #else
   #include <pthread.h>
@@ -54,7 +55,7 @@
   #define _AMPS_SNPRINTF snprintf
   #define _AMPS_KEYCREATE pthread_key_create
   #define _AMPS_TLS_KEY pthread_key_t
-  #define closesocket close
+  #define AMPS_CLOSESOCKET close
   #define _AMPS_STRNDUP strndup
 
   #ifndef SO_DOMAIN

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

@@ -241,8 +241,7 @@ namespace AMPS
     {\
       ;\
     }\
-  }
-  */
+  }*/
 #ifdef _WIN32
 #define AMPS_CALL_EXCEPTION_WRAPPER_2(me,x) \
   try\
@@ -427,7 +426,9 @@ namespace AMPS
     _exceptionListener->exceptionThrown(ex);\
   }\
   catch(...)\
-  {;}
+  {\
+    ;\
+  }
 
 #define AMPS_UNHANDLED_EXCEPTION_2(me,ex) \
   try\
@@ -435,7 +436,9 @@ namespace AMPS
     me->_exceptionListener->exceptionThrown(ex);\
   }\
   catch(...)\
-  {;}
+  {\
+    ;\
+  }
 
 
   class Client;
@@ -1511,7 +1514,7 @@ namespace AMPS
     /// subscriptions, and so on). The listener should not issue commands
     /// on the client while recovery is in progress.
     virtual void connectionStateChanged(State newState_) = 0;
-    virtual ~ConnectionStateListener()  {;};
+    virtual ~ConnectionStateListener()  {;}
   };
 
 
@@ -1729,7 +1732,7 @@ namespace AMPS
         serverVersion(),
         responded(false),
         abandoned(false),
-        connectionVersion(0)
+        connectionVersion(UINT_MAX) // Don't abandon if unsent AC-1329
       {
       }
     };
@@ -2021,7 +2024,7 @@ namespace AMPS
       }
       bool timedOut = false;
       AMPS_START_TIMER(timeout_)
-      while (!timedOut && !ack.responded() && !ack.abandoned() && _connected)
+      while (!timedOut && !ack.responded() && !ack.abandoned())
       {
         if (timeout_)
         {
@@ -2269,8 +2272,10 @@ namespace AMPS
         }
         _connected = false;
         _heartbeatTimer.setTimeout(0.0);
+        // AC-1189 AC-1329 AC-1337 We need acks cleared while lock is held,
+        // but not for unsent commands.
+        clearAcks(UINT_MAX-1);
       }
-      clearAcks(INT_MAX);
       amps_client_disconnect(_client);
       _routes.clear();
     }
@@ -2279,6 +2284,8 @@ namespace AMPS
     {
       AMPS_CALL_EXCEPTION_WRAPPER(flushAcks());
       setDisconnected();
+      // Abandon all acks, sent and unsent
+      clearAcks(UINT_MAX);
       AMPS_CALL_EXCEPTION_WRAPPER(processDeferredExecutions());
       Lock<Mutex> l(_lock);
       broadcastConnectionStateChanged(ConnectionStateListener::Shutdown);
@@ -4481,8 +4488,7 @@ namespace AMPS
         }
         catch (const DisconnectedException&)
         {
-          // -V565
-          // Pass - message will get replayed when reconnected
+          throw;
         }
         catch (...)
         {
@@ -7829,15 +7835,23 @@ namespace AMPS
     while (true)
     {
       AtomicFlagFlip subFlip(&me->_badTimeToHASubscribe);
+      bool retryInProgress = false;
       try
       {
         me->_connected = false;
-        {
-          // Have to release the lock here or receive thread can't
-          // invoke the message handler.
-          Unlock<Mutex> unlock(me->_lock);
-          me->_disconnectHandler.invoke(wrapper);
-        }
+        me->_lock.signalAll();
+        // Have to release the lock here or receive thread can't
+        // invoke the message handler.
+        Unlock<Mutex> unlock(me->_lock);
+        me->_disconnectHandler.invoke(wrapper);
+      }
+#ifdef _WIN32
+      catch (const RetryOperationException&)
+#else
+      catch (const RetryOperationException& ex)
+#endif
+      {
+        retryInProgress = true;
       }
       catch (const std::exception& ex)
       {
@@ -7847,8 +7861,15 @@ namespace AMPS
 
       if (!me->_connected)
       {
-        me->broadcastConnectionStateChanged(ConnectionStateListener::Shutdown);
-        AMPS_UNHANDLED_EXCEPTION_2(me, DisconnectedException("Reconnect failed."));
+        if (retryInProgress)
+        {
+          AMPS_UNHANDLED_EXCEPTION_2(me, RetryOperationException("Reconnect in progress."));
+        }
+        else
+        {
+          me->broadcastConnectionStateChanged(ConnectionStateListener::Shutdown);
+          AMPS_UNHANDLED_EXCEPTION_2(me, DisconnectedException("Reconnect failed."));
+        }
         return AMPS_E_DISCONNECTED;
       }
       try
@@ -8381,6 +8402,14 @@ namespace AMPS
         _state = Disconnected;
         close();
       }
+      else if (state_ == AMPS::ConnectionStateListener::Connected
+               && _commandId.empty()
+               && _subId.empty()
+               && _queryId.empty())
+      {
+        // AC-1331 Reconnect before command was sent, so Unset
+        _state = Unset;
+      }
       _lock.signalAll();
     }
 

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

@@ -32,10 +32,10 @@
 
 
 /// The current version of the AMPS client.
-#define AMPS_CLIENT_VERSION "5.3.4.3"
+#define AMPS_CLIENT_VERSION "5.3.4.4"
 
 /// The current version of the AMPS client with the language appended.
-#define AMPS_CLIENT_VERSION_WITH_LANGUAGE "5.3.4.3.1c0da8e.656215:python"
+#define AMPS_CLIENT_VERSION_WITH_LANGUAGE "5.3.4.4.1b5ff54.964735:python"
 
 #endif
 

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

@@ -153,6 +153,20 @@ namespace AMPS
     {
       LeaveCriticalSection(&_lock);
     }
+    bool tryAcquire(int retries_ = 100)
+    {
+      BOOL ret = FALSE;
+      while (!ret && --retries_ > 0)
+      {
+        ret = TryEnterCriticalSection(&_lock);
+        Sleep(1);
+      }
+#if defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION < 3
+      return ret == TRUE; // Avoids a warning with some Windows compilers
+#else
+      return (bool)ret;
+#endif
+    }
     void wait()
     {
       ++_waiters;
@@ -214,6 +228,18 @@ namespace AMPS
     {
       releaseRead();
     }
+    bool tryAcquire(int retries_ = 100)
+    {
+      static const struct timespec spin_ts = { 0, 100 * 1000 };
+      int ret = pthread_mutex_trylock(&_lock);
+      while (ret != 0 && --retries_ > 0)
+      {
+        nanosleep(&spin_ts, NULL);
+        ret = pthread_mutex_trylock(&_lock);
+      }
+      /* Windows-like return, 1 for TRUE (acquired) 0 for FALSE */
+      return (ret == 0);
+    }
     void wait()
     {
       pthread_cond_wait(&_condition, &_lock);
@@ -366,6 +392,35 @@ namespace AMPS
     }
   };
 
+///
+///
+/// Simple RAII-style class for automatic try locking/unlocking
+///
+  template <class T>
+  class TryLock
+  {
+    T& _lock;
+    bool _locked;
+    TryLock(const TryLock<T>& rhs); // not implemented
+    TryLock<T>& operator=(const TryLock<T>& rhs); // not implemented
+  public:
+    TryLock(T& lock) : _lock(lock)
+    {
+      _locked = _lock.tryAcquire();
+    }
+    ~TryLock()
+    {
+      if (_locked)
+      {
+        _lock.releaseRead();
+      }
+    }
+    bool isLocked() const
+    {
+      return _locked;
+    }
+  };
+
 ///
 /// Simple RAII-style class for automatic unlocking/relocking
 ///
@@ -777,12 +832,15 @@ namespace AMPS
   public:
 #if __cplusplus >= 201100L || _MSC_VER >= 1900
     FlagFlip(std::atomic<bool>* pFlag_) : _pFlag(pFlag_)
+    {
+      *_pFlag = !*_pFlag;
+    }
 #else
     FlagFlip(volatile bool * pFlag_) : _pFlag(pFlag_)
-#endif
     {
       *_pFlag = !*_pFlag;
     }
+#endif
     ~FlagFlip()
     {
       *_pFlag = !*_pFlag;
@@ -853,7 +911,7 @@ namespace AMPS
       buffer[sizeof(buffer) - 1] = '\0';
       (std::runtime_error&)*this = std::runtime_error(buffer);
     }
-    virtual ~AMPSException() throw() {;}
+    virtual ~AMPSException() {;}
 
     ///
     /// Returns a null-terminated string containing self's
@@ -888,10 +946,19 @@ namespace AMPS
   {\
   public:\
     x(const std::string& message, amps_result result = AMPS_E_OK)\
-      : b(message, result) {;}\
+      : b(message, result)\
+    {\
+      ;\
+    }\
     x(amps_handle client, amps_result result)\
-      : b(client, result) {;}\
-    virtual const char* getClassName() const { return #x; }\
+      : b(client, result)\
+    {\
+      ;\
+    }\
+    virtual const char* getClassName() const\
+    {\
+      return #x;\
+    }\
   };
   AMPS_EX_TYPE(CommandException, AMPSException)
   AMPS_EX_TYPE(ConnectionException, AMPSException)
@@ -926,7 +993,7 @@ namespace AMPS
   AMPS_EX_TYPE(UnknownException, CommandException)
   AMPS_EX_TYPE(PublishStoreGapException, StoreException)
 
-  template <class T> // static
+  template <class T>
   void AMPSException::throwFor(const T& context_, amps_result result_)
   {
     switch (result_)

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

@@ -178,6 +178,7 @@ static const char comma        = ',';
 static const char colon        = ':';
 static const char open_brace   = '{';
 static const char close_brace  = '}';
+static const char backslash    = '\\';
 
 /* string data inside double quotes (anything but ")
  * return 0 for "
@@ -239,28 +240,70 @@ typedef struct
 
 } cstring;
 
-static size_t get_string(const char* p_, const char* pEnd_)
+static size_t get_string(char* p_, const char* pEnd_, size_t* pLen_)
 {
-  const char* p = p_;
+  *pLen_ = 0;
+  char* p = p_;
   while (p_ < pEnd_)
   {
-    /* lookup will return 0, 1 or 2 (2 is returned for escaped chars */
-    char rc = lookup_string_data[(unsigned char)p_[0]];
-    if (rc)
+    if (p_[0] == quote)
     {
-      p_ += (size_t)rc;
+      size_t len = (size_t)(p_ - p);
+      /* skip over '"' */
+      ++p_;
+      return len;
     }
-    else
+    else if (p_[0] == backslash)
     {
-      if (p_[0] == quote)
+      switch(p_[1])
       {
-        size_t len = (size_t)(p_ - p);
-        /* skip over '"' */
-        ++p_;
-        return len;
+      case 'b':
+        {
+          p[(*pLen_)++] = '\b';
+          p_ += 2;
+        }
+      break;
+      case 'f':
+        {
+          p[(*pLen_)++] = '\f';
+          p_ += 2;
+        }
+      break;
+      case 'n':
+        {
+          p[(*pLen_)++] = '\n';
+          p_ += 2;
+        }
+      break;
+      case 'r':
+        {
+          p[(*pLen_)++] = '\r';
+          p_ += 2;
+        }
+      break;
+      case 't':
+        {
+          p[(*pLen_)++] = '\t';
+          p_ += 2;
+        }
+      break;
+      case 'u':
+        {
+          // Leave it alone
+          p_ += 6;
+        }
+      break;
+      default:
+        {
+          p[(*pLen_)++] = p_[1];
+          p_ += 2;
+        }
       }
-      assert(0); // Indicates parse failure, i.e. server or network error
-      return 0;
+    }
+    else
+    {
+      p[(*pLen_)++] = p_[0];
+      ++p_;
     }
   }
   assert(0); // Indicates parse failure, i.e. server or network error
@@ -285,8 +328,9 @@ static size_t get_number(const char* p_, const char* pEnd_)
   return 0;
 }
 
-static const char* get_value(const char* p_, const char* pEnd_, cstring* pValue_)
+static char* get_value(char* p_, const char* pEnd_, cstring* pValue_)
 {
+  size_t len = 0;
   /* '[' == 0x5B, '{' == 0x7B */
   char c = p_[0];
   switch (c)
@@ -296,9 +340,9 @@ static const char* get_value(const char* p_, const char* pEnd_, cstring* pValue_
      * skip over '"' */
     ++p_;
     pValue_->_p = (const char*)p_;
-    pValue_->_len = get_string(p_, pEnd_);
+    len = get_string(p_, pEnd_, &pValue_->_len);
     /* skip over terminating '"' */
-    return p_ + pValue_->_len + 1;
+    return p_ + len + 1;
   case '0':
   case '1':
   case '2':
@@ -355,9 +399,9 @@ amps_result amps_protocol_deserialize(amps_handle message, size_t startingPositi
   static const char* PUBLISH = "publish";
   amps_message_t* me = (amps_message_t*)message;
   size_t length = me->length - startingPosition;
-  const char* pStart = me->rawBuffer + startingPosition;
+  char* pStart = (char*)me->rawBuffer + startingPosition;
   const char* pEnd = pStart + length;
-  const char* p = pStart;
+  char* p = pStart;
   const char* pTag = 0;
   char ch;
   cstring value = { 0, 0 };
@@ -441,7 +485,7 @@ scan_start:
       {
         p = get_value(p, pEnd, &value);
         amps_message_assign_field_value(me, (FieldId)fieldId, value._p, value._len);
-        //fprintf(stderr,"PARSE AMPS 3 %d len = %lu\n",fieldId,value._len);
+        //fprintf(stderr,"PARSE AMPS 3 %d len = %lu val %.*s\n",fieldId,value._len,(int)value._len,value._p);
       }
       if (p == 0)
       {