X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fversion.cc;h=e9a54050977de0843004f1e3e41dcc196d0f9c86;hb=7ab3500b376928c4a621cfa29289aa1eaeecd60d;hp=4b9bfeeb80896cab338f9f3bd9e662f21fd81534;hpb=6edcc9e0e093c5d082ac76b1dcc73396897f5c24;p=awesomized%2Flibmemcached

diff --git a/libmemcached/version.cc b/libmemcached/version.cc
index 4b9bfeeb..e9a54050 100644
--- a/libmemcached/version.cc
+++ b/libmemcached/version.cc
@@ -41,45 +41,18 @@ const char * memcached_lib_version(void)
   return LIBMEMCACHED_VERSION_STRING;
 }
 
-static inline memcached_return_t memcached_version_binary(memcached_st *ptr);
-static inline memcached_return_t memcached_version_textual(memcached_st *ptr);
-
-memcached_return_t memcached_version(memcached_st *ptr)
-{
-  memcached_return_t rc;
-  if (memcached_failed(rc= initialize_query(ptr)))
-  {
-    return rc;
-  }
-
-  if (ptr->flags.use_udp)
-  {
-    return MEMCACHED_NOT_SUPPORTED;
-  }
-
-  if (ptr->flags.binary_protocol)
-  {
-    rc= memcached_version_binary(ptr);
-  }
-  else
-  {
-    rc= memcached_version_textual(ptr);      
-  }
-
-  return rc;
-}
-
 static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
 {
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { memcached_literal_param("version\r\n") },
   };
-  memcached_return_t rc= MEMCACHED_SUCCESS;
 
+  uint32_t success= 0;
+  bool errors_happened= false;
   for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
-    memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, x);
+    org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
 
     // Optimization, we only fetch version once.
     if (instance->major_version != UINT8_MAX)
@@ -87,85 +60,53 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
       continue;
     }
 
-    memcached_return_t rrc= memcached_vdo(instance, vector, 1, true);
-    if (memcached_failed(rrc))
+    memcached_return_t rrc;
+    if (memcached_failed(rrc= memcached_vdo(instance, vector, 1, true)))
     {
+      errors_happened= true;
       (void)memcached_set_error(*instance, rrc, MEMCACHED_AT);
-      instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
-      rc= MEMCACHED_SOME_ERRORS;
-      continue;
-    }
-
-    char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
-    rrc= memcached_response(instance, buffer, sizeof(buffer), NULL);
-    if (memcached_failed(rrc))
-    {
-      memcached_set_error(*instance, rrc, MEMCACHED_AT);
-      instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
-      rc= MEMCACHED_SOME_ERRORS;
-      continue;
-    }
-
-    /* Find the space, and then move one past it to copy version */
-    char *response_ptr= index(buffer, ' ');
-    response_ptr++;
-
-    long int version= strtol(response_ptr, (char **)NULL, 10);
-    if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX or version == 0)
-    {
-      memcached_set_error(*instance, MEMCACHED_PROTOCOL_ERROR, MEMCACHED_AT, memcached_literal_param("strtol() failed to parse major version"));
-      instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
-      rc= MEMCACHED_SOME_ERRORS;
-      continue;
-    }
-    instance->major_version= uint8_t(version);
-
-    response_ptr= index(response_ptr, '.');
-    response_ptr++;
-
-    version= strtol(response_ptr, (char **)NULL, 10);
-    if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX)
-    {
-      memcached_set_error(*instance, MEMCACHED_PROTOCOL_ERROR, MEMCACHED_AT, memcached_literal_param("strtol() failed to parse minor version"));
-      instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
-      rc= MEMCACHED_SOME_ERRORS;
       continue;
     }
-    instance->minor_version= uint8_t(version);
-
-    response_ptr= index(response_ptr, '.');
-    response_ptr++;
+    success++;
+  }
 
-    version= strtol(response_ptr, (char **)NULL, 10);
-    if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX)
+  if (success)
+  {
+    // Collect the returned items
+    org::libmemcached::Instance* instance;
+    while ((instance= memcached_io_get_readable_server(ptr)))
     {
-      memcached_set_error(*instance, MEMCACHED_PROTOCOL_ERROR, MEMCACHED_AT, memcached_literal_param("strtol() failed to parse micro version"));
-      instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
-      rc= MEMCACHED_SOME_ERRORS;
-      continue;
+      memcached_return_t rrc= memcached_response(instance, NULL);
+      if (memcached_failed(rrc))
+      {
+        memcached_io_reset(instance);
+        errors_happened= true;
+      }
     }
-    instance->micro_version= uint8_t(version);
   }
 
-  return rc;
+  return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
 }
 
 static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
 {
   protocol_binary_request_version request= {};
-  request.message.header.request.magic= PROTOCOL_BINARY_REQ;
+
   request.message.header.request.opcode= PROTOCOL_BINARY_CMD_VERSION;
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
 
-  struct libmemcached_io_vector_st vector[]=
+  libmemcached_io_vector_st vector[]=
   {
     { request.bytes, sizeof(request.bytes) }
   };
 
-  memcached_return_t rc= MEMCACHED_SUCCESS;
+  uint32_t success= 0;
+  bool errors_happened= false;
   for (uint32_t x= 0; x < memcached_server_count(ptr); x++) 
   {
-    memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, x);
+    org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
+
+    initialize_binary_request(instance, request.message.header);
 
     if (instance->major_version != UINT8_MAX)
     {
@@ -176,64 +117,111 @@ static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
     if (memcached_failed(rrc))
     {
       memcached_io_reset(instance);
-      rc= MEMCACHED_SOME_ERRORS;
+      errors_happened= true;
       continue;
     }
+
+    success++;
   }
 
-  for (uint32_t x= 0; x < memcached_server_count(ptr); x++) 
+  if (success)
   {
-    memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, x);
-
-    if (instance->major_version != UINT8_MAX)
-    {
-      continue;
-    }
-
-    if (memcached_server_response_count(instance) > 0) 
+    // Collect the returned items
+    org::libmemcached::Instance* instance;
+    while ((instance= memcached_io_get_readable_server(ptr)))
     {
       char buffer[32];
-      char *p;
-
       memcached_return_t rrc= memcached_response(instance, buffer, sizeof(buffer), NULL);
       if (memcached_failed(rrc))
       {
         memcached_io_reset(instance);
-        rc= MEMCACHED_SOME_ERRORS;
-        continue;
+        errors_happened= true;
       }
+    }
+  }
 
-      long int version= strtol(buffer, &p, 10);
-      if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX or version == 0)
-      {
-        memcached_set_error(*instance, MEMCACHED_PROTOCOL_ERROR, MEMCACHED_AT, memcached_literal_param("strtol() failed to parse major version"));
-        instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
-        rc= MEMCACHED_SOME_ERRORS;
-        continue;
-      }
-      instance->major_version= uint8_t(version);
+  return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
+}
 
-      version= strtol(p +1, &p, 10);
-      if (version == LONG_MIN or version == LONG_MAX or errno == EINVAL or version > UINT8_MAX)
-      {
-        memcached_set_error(*instance, MEMCACHED_PROTOCOL_ERROR, MEMCACHED_AT, memcached_literal_param("strtol() failed to parse micro version"));
-        instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
-        rc= MEMCACHED_SOME_ERRORS;
-        continue;
-      }
-      instance->minor_version= uint8_t(version);
+static inline void version_ascii_instance(org::libmemcached::Instance* instance)
+{
+  if (instance->major_version != UINT8_MAX)
+  {
+    libmemcached_io_vector_st vector[]=
+    {
+      { memcached_literal_param("version\r\n") },
+    };
+
+    (void)memcached_vdo(instance, vector, 1, false);
+  }
+}
+
+static inline void version_binary_instance(org::libmemcached::Instance* instance)
+{
+  if (instance->major_version != UINT8_MAX)
+  {
+    protocol_binary_request_version request= {};
+
+    request.message.header.request.opcode= PROTOCOL_BINARY_CMD_VERSION;
+    request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
+
+    libmemcached_io_vector_st vector[]=
+    {
+      { request.bytes, sizeof(request.bytes) }
+    };
+
+    initialize_binary_request(instance, request.message.header);
 
-      version= strtol(p + 1, NULL, 10);
-      if (errno == ERANGE)
+    (void)memcached_vdo(instance, vector, 1, false);
+  }
+}
+
+void memcached_version_instance(org::libmemcached::Instance* instance)
+{
+  if (instance)
+  {
+    if (memcached_has_root(instance))
+    {
+      if (memcached_is_fetching_version(instance->root))
       {
-        memcached_set_error(*instance, MEMCACHED_PROTOCOL_ERROR, MEMCACHED_AT, memcached_literal_param("strtol() failed to parse micro version"));
-        instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
-        rc= MEMCACHED_SOME_ERRORS;
-        continue;
+        if (memcached_is_udp(instance->root) == false)
+        {
+
+          if (memcached_is_binary(instance->root))
+          {
+            version_binary_instance(instance);
+            return;
+          }
+
+          version_ascii_instance(instance);      
+        }
       }
-      instance->micro_version= uint8_t(version);
     }
   }
+}
+
+memcached_return_t memcached_version(memcached_st *ptr)
+{
+  if (ptr)
+  {
+    memcached_return_t rc;
+    if (memcached_failed(rc= initialize_query(ptr, true)))
+    {
+      return rc;
+    }
+
+    if (memcached_is_udp(ptr))
+    {
+      return MEMCACHED_NOT_SUPPORTED;
+    }
+
+    if (memcached_is_binary(ptr))
+    {
+      return memcached_version_binary(ptr);
+    }
+
+    return memcached_version_textual(ptr);      
+  }
 
-  return rc;
+  return MEMCACHED_INVALID_ARGUMENTS;
 }