[ssi_af_ls] Renames Server Timeout to Request Timeout for consistency

xroot_ssi_pb/XrdSsiPbRequest.hpp

@@ -51,7 +51,7 @@ template <typename RequestType, typename MetadataType, typename AlertType>
 class Request : public XrdSsiRequest
 {
 public:
-   Request(const RequestType &request, unsigned int response_bufsize, uint16_t timeout);
+   Request(const RequestType &request, unsigned int response_bufsize, uint16_t request_timeout);
 
    virtual ~Request() {
 #ifdef XRDSSI_DEBUG
@@ -118,16 +118,16 @@ private:
  */
 template<typename RequestType, typename MetadataType, typename AlertType>
 Request<RequestType, MetadataType, AlertType>::
-Request(const RequestType &request, unsigned int response_bufsize, uint16_t timeout) :
+Request(const RequestType &request, unsigned int response_bufsize, uint16_t request_timeout) :
    m_response_bufsize(response_bufsize)
 {
 #ifdef XRDSSI_DEBUG
    std::cerr << "[DEBUG] Request constructor: "
              << "Response buffer size = " << m_response_bufsize
-             << " bytes, timeout = " << timeout << std::endl;
+             << " bytes, request timeout = " << request_timeout << std::endl;
 #endif
-   // Set response timeout
-   SetTimeOut(timeout);
+   // Set XRootD request timeout
+   SetTimeOut(request_timeout);
 
    // Serialize the Request
    if(!request.SerializeToString(&m_request_str))

xroot_ssi_pb/XrdSsiPbServiceClientSide.hpp

@@ -41,7 +41,10 @@ namespace XrdSsiPb {
 // Constants
 
 const unsigned int DefaultResponseBufferSize = 1024;       //!< Default size for the response buffer in bytes
-const unsigned int DefaultServerTimeout      = 15;         //!< Maximum XRootD reply timeout in secs
+const unsigned int DefaultRequestTimeout     = 15;         //!< Default XRootD request timeout in secs
+// Better to get the default from XRD_REQUESTTIMEOUT if it is not set explicitly?
+// Decide on order of precedence for setting request timeout
+// What about setting stream timeout?
 
 
 
@@ -54,7 +57,7 @@ class ServiceClientSide
 public:
    ServiceClientSide(const std::string &endpoint, const std::string &resource,
                      unsigned int response_bufsize = DefaultResponseBufferSize,
-                     unsigned int server_tmo       = DefaultServerTimeout);
+                     unsigned int request_tmo      = DefaultRequestTimeout);
 
    virtual ~ServiceClientSide();
 
@@ -68,7 +71,7 @@ private:
    XrdSsiService *m_server_ptr;          //!< Pointer to XRootD Server object
 
    unsigned int   m_response_bufsize;    //!< Buffer size for responses from the XRootD SSI server
-   unsigned int   m_server_tmo;          //!< Timeout for a response from the server
+   unsigned int   m_request_tmo;         //!< Timeout for a response from the server
 };
 
 
@@ -79,10 +82,10 @@ private:
 template <typename RequestType, typename MetadataType, typename AlertType>
 ServiceClientSide<RequestType, MetadataType, AlertType>::
 ServiceClientSide(const std::string &endpoint, const std::string &resource,
-                  unsigned int response_bufsize, unsigned int server_tmo) :
+                  unsigned int response_bufsize, unsigned int request_tmo) :
    m_resource(resource),
    m_response_bufsize(response_bufsize),
-   m_server_tmo(server_tmo)
+   m_request_tmo(request_tmo)
 {
 #ifdef XRDSSI_DEBUG
    std::cerr << "[DEBUG] ServiceClientSide() constructor" << std::endl;
@@ -148,7 +151,7 @@ MetadataType ServiceClientSide<RequestType, MetadataType, AlertType>::Send(const
 {
    // Instantiate the Request object
 
-   auto request_ptr = new Request<RequestType, MetadataType, AlertType>(request, m_response_bufsize, m_server_tmo);
+   auto request_ptr = new Request<RequestType, MetadataType, AlertType>(request, m_response_bufsize, m_request_tmo);
 
    auto future_response = request_ptr->GetFuture();