X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fversion.cc;h=e9a54050977de0843004f1e3e41dcc196d0f9c86;hb=0d5e8e1b19db6ff920eda2446883f3a7d781bf14;hp=961f6916096bbf3aa64c8fa7211b3559a121b385;hpb=ab9ea0e2b9e1cb2bf88510f3077950cd8e464622;p=awesomized%2Flibmemcached

diff --git a/libmemcached/version.cc b/libmemcached/version.cc
index 961f6916..e9a54050 100644
--- a/libmemcached/version.cc
+++ b/libmemcached/version.cc
@@ -48,10 +48,11 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
     { memcached_literal_param("version\r\n") },
   };
 
+  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)
@@ -64,13 +65,23 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
     {
       errors_happened= true;
       (void)memcached_set_error(*instance, rrc, MEMCACHED_AT);
-      instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
+      continue;
     }
-    else if (memcached_failed(rrc= memcached_response(instance, NULL)))
+    success++;
+  }
+
+  if (success)
+  {
+    // Collect the returned items
+    org::libmemcached::Instance* instance;
+    while ((instance= memcached_io_get_readable_server(ptr)))
     {
-      errors_happened= true;
-      memcached_set_error(*instance, rrc, MEMCACHED_AT);
-      instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
+      memcached_return_t rrc= memcached_response(instance, NULL);
+      if (memcached_failed(rrc))
+      {
+        memcached_io_reset(instance);
+        errors_happened= true;
+      }
     }
   }
 
@@ -80,7 +91,7 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
 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;
 
@@ -89,10 +100,13 @@ static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
     { request.bytes, sizeof(request.bytes) }
   };
 
+  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)
     {
@@ -106,82 +120,108 @@ static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
       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);
         errors_happened= true;
-        continue;
-      }
-
-      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;
-        errors_happened= true;
-        continue;
-      }
-      instance->major_version= uint8_t(version);
-
-      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;
-        errors_happened= true;
-        continue;
-      }
-      instance->minor_version= uint8_t(version);
-
-      version= strtol(p + 1, NULL, 10);
-      if (errno == ERANGE)
-      {
-        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;
-        errors_happened= true;
-        continue;
       }
-      instance->micro_version= uint8_t(version);
     }
   }
 
   return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
 }
 
-memcached_return_t memcached_version(memcached_st *ptr)
+static inline void version_ascii_instance(org::libmemcached::Instance* instance)
 {
-  memcached_return_t rc;
-  if (memcached_failed(rc= initialize_query(ptr, true)))
+  if (instance->major_version != UINT8_MAX)
   {
-    return rc;
+    libmemcached_io_vector_st vector[]=
+    {
+      { memcached_literal_param("version\r\n") },
+    };
+
+    (void)memcached_vdo(instance, vector, 1, false);
   }
+}
 
-  if (memcached_is_udp(ptr))
+static inline void version_binary_instance(org::libmemcached::Instance* instance)
+{
+  if (instance->major_version != UINT8_MAX)
   {
-    return MEMCACHED_NOT_SUPPORTED;
+    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);
+
+    (void)memcached_vdo(instance, vector, 1, false);
   }
+}
 
-  if (memcached_is_binary(ptr))
+void memcached_version_instance(org::libmemcached::Instance* instance)
+{
+  if (instance)
   {
-    return memcached_version_binary(ptr);
+    if (memcached_has_root(instance))
+    {
+      if (memcached_is_fetching_version(instance->root))
+      {
+        if (memcached_is_udp(instance->root) == false)
+        {
+
+          if (memcached_is_binary(instance->root))
+          {
+            version_binary_instance(instance);
+            return;
+          }
+
+          version_ascii_instance(instance);      
+        }
+      }
+    }
+  }
+}
+
+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 memcached_version_textual(ptr);      
+  return MEMCACHED_INVALID_ARGUMENTS;
 }