Change the ClientInterface to cache the URI, rather than calculating …

…it on the fly. See #165
ipbus · Dec 1, 2019 · 0e83dba · 0e83dba
1 parent dce7d1d
commit 0e83dba
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 43 deletions.
diff --git a/uhal/grammars/include/uhal/grammars/URI.hpp b/uhal/grammars/include/uhal/grammars/URI.hpp
@@ -63,6 +63,11 @@ namespace uhal
   };
 
   std::ostream& operator<< ( std::ostream& aStr , const uhal::URI& aURI );
+
+
+  std::string ToString( const URI& aURI );
+
+
 }
 
 

diff --git a/uhal/grammars/src/common/URI.cpp b/uhal/grammars/src/common/URI.cpp
@@ -34,6 +34,7 @@
 
 
 #include <iostream>
+#include <sstream>
 
 
 namespace uhal {
@@ -56,4 +57,48 @@ namespace uhal {
     return aStr;
   }
 
+
+  std::string ToString( const uhal::URI& aURI )
+  {
+    std::stringstream lReturn;
+    // url is always of the form "protocol://hostname:port"
+    lReturn << aURI.mProtocol << "://" << aURI.mHostname;
+    if ( !aURI.mPort.empty() )
+      lReturn << ":" << aURI.mPort;
+
+    // there is sometimes a path
+    if ( aURI.mPath != "" )
+    {
+      lReturn << "/" << aURI.mPath;
+    }
+
+    // there is sometimes a filename extension
+    if ( aURI.mExtension != "" )
+    {
+      lReturn << "." << aURI.mExtension;
+    }
+
+    // there are sometimes arguments
+    if ( aURI.mArguments.size() )
+    {
+      lReturn << "?";
+      uhal::NameValuePairVectorType::const_iterator lIt = aURI.mArguments.begin();
+
+      while ( true )
+      {
+        lReturn << lIt->first << "=" << lIt->second;
+
+        if ( ++lIt == aURI.mArguments.end() )
+        {
+          break;
+        }
+
+        lReturn << "&";
+      }
+    }
+
+    return lReturn.str();    
+  }
+
+
 }
diff --git a/uhal/uhal/include/uhal/ClientInterface.hpp b/uhal/uhal/include/uhal/ClientInterface.hpp
@@ -134,7 +134,7 @@ namespace uhal
       	Return the url of the target for this client
       	@return the url of the target for this client
       */
-      std::string uri() const;
+      const std::string& uri() const;
 
       //! Method to dispatch all queued transactions, and wait until all corresponding responses have been received
       void dispatch ();
@@ -410,6 +410,8 @@ namespace uhal
       //! a struct containing the full URI of the target for this client
       URI mUri;
 
+      std::string mUriString;
+
       /**
         Function which checks the available space in the currently filling buffer against requested send and receive sizes and, if there is insufficient space in the currently filling buffer, then dispatch it and create a new buffer
         @param aSendSize the amount of data that the current instruction wishes to send

diff --git a/uhal/uhal/src/common/ClientInterface.cpp b/uhal/uhal/src/common/ClientInterface.cpp
@@ -55,7 +55,8 @@ namespace uhal
 #endif
     mId ( aId ),
     mTimeoutPeriod ( aTimeoutPeriod ),
-    mUri ( aUri )
+    mUri ( aUri ),
+    mUriString( ToString(aUri) )
   {
   }
 
@@ -67,7 +68,8 @@ namespace uhal
 #endif
     mId ( ),
     mTimeoutPeriod ( boost::posix_time::pos_infin ),
-    mUri ( )
+    mUri ( ),
+    mUriString( "" )
   {
   }
 
@@ -79,7 +81,8 @@ namespace uhal
 #endif
     mId ( aClientInterface.mId ),
     mTimeoutPeriod ( aClientInterface.mTimeoutPeriod ),
-    mUri ( aClientInterface.mUri )
+    mUri ( aClientInterface.mUri ),
+    mUriString( aClientInterface.mUriString )
   {
   }
 
@@ -89,6 +92,7 @@ namespace uhal
     deleteBuffers();
     mId  = aClientInterface.mId;
     mUri = aClientInterface.mUri;
+    mUriString = aClientInterface.mUriString;
     mTimeoutPeriod = aClientInterface.mTimeoutPeriod;
     return *this;
   }
@@ -131,46 +135,9 @@ namespace uhal
   // }
 
 
-  std::string ClientInterface::uri() const
+  const std::string& ClientInterface::uri() const
   {
-    std::stringstream lReturn;
-    // url is always of the form "protocol://hostname:port"
-    lReturn << mUri.mProtocol << "://" << mUri.mHostname;
-    if ( !mUri.mPort.empty() )
-      lReturn << ":" << mUri.mPort;
-
-    // there is sometimes a path
-    if ( mUri.mPath != "" )
-    {
-      lReturn << "/" << mUri.mPath;
-    }
-
-    // there is sometimes a filename extension
-    if ( mUri.mExtension != "" )
-    {
-      lReturn << "." << mUri.mExtension;
-    }
-
-    // there are sometimes arguments
-    if ( mUri.mArguments.size() )
-    {
-      lReturn << "?";
-      uhal::NameValuePairVectorType::const_iterator lIt = mUri.mArguments.begin();
-
-      while ( true )
-      {
-        lReturn << lIt->first << "=" << lIt->second;
-
-        if ( ++lIt == mUri.mArguments.end() )
-        {
-          break;
-        }
-
-        lReturn << "&";
-      }
-    }
-
-    return lReturn.str();
+    return mUriString;
   }