X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fversion.cc;h=53d24c1cb02dc7eb51003a0557675b661fd4cc7d;hb=f4fcfcef18090e6d636aabfcd48adadcfb2db554;hp=03098161a52895651a17871fbeffc9c56aa8f246;hpb=14ed08eb76405aed0747568326058ab57c5e69a2;p=m6w6%2Flibmemcached

diff --git a/libmemcached/version.cc b/libmemcached/version.cc
index 03098161..53d24c1c 100644
--- a/libmemcached/version.cc
+++ b/libmemcached/version.cc
@@ -41,7 +41,7 @@ const char * memcached_lib_version(void)
   return LIBMEMCACHED_VERSION_STRING;
 }
 
-static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
+static inline memcached_return_t memcached_version_textual(Memcached *memc)
 {
   libmemcached_io_vector_st vector[]=
   {
@@ -50,9 +50,9 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
 
   uint32_t success= 0;
   bool errors_happened= false;
-  for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
+  for (uint32_t x= 0; x < memcached_server_count(memc); x++)
   {
-    org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
+    memcached_instance_st* instance= memcached_instance_fetch(memc, x);
 
     // Optimization, we only fetch version once.
     if (instance->major_version != UINT8_MAX)
@@ -73,14 +73,13 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
   if (success)
   {
     // Collect the returned items
-    org::libmemcached::Instance* instance;
+    memcached_instance_st* instance;
     memcached_return_t readable_error;
-    while ((instance= memcached_io_get_readable_server(ptr, readable_error)))
+    while ((instance= memcached_io_get_readable_server(memc, readable_error)))
     {
       memcached_return_t rrc= memcached_response(instance, NULL);
       if (memcached_failed(rrc))
       {
-        memcached_io_reset(instance);
         errors_happened= true;
       }
     }
@@ -89,7 +88,7 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
   return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
 }
 
-static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
+static inline memcached_return_t memcached_version_binary(Memcached *memc)
 {
   protocol_binary_request_version request= {};
 
@@ -103,9 +102,9 @@ static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
 
   uint32_t success= 0;
   bool errors_happened= false;
-  for (uint32_t x= 0; x < memcached_server_count(ptr); x++) 
+  for (uint32_t x= 0; x < memcached_server_count(memc); x++) 
   {
-    org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
+    memcached_instance_st* instance= memcached_instance_fetch(memc, x);
 
     initialize_binary_request(instance, request.message.header);
 
@@ -117,7 +116,6 @@ static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
     memcached_return_t rrc= memcached_vdo(instance, vector, 1, true);
     if (memcached_failed(rrc))
     {
-      memcached_io_reset(instance);
       errors_happened= true;
       continue;
     }
@@ -128,15 +126,14 @@ static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
   if (success)
   {
     // Collect the returned items
-    org::libmemcached::Instance* instance;
+    memcached_instance_st* instance;
     memcached_return_t readable_error;
-    while ((instance= memcached_io_get_readable_server(ptr, readable_error)))
+    while ((instance= memcached_io_get_readable_server(memc, readable_error)))
     {
       char buffer[32];
       memcached_return_t rrc= memcached_response(instance, buffer, sizeof(buffer), NULL);
       if (memcached_failed(rrc))
       {
-        memcached_io_reset(instance);
         errors_happened= true;
       }
     }
@@ -145,7 +142,7 @@ static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
   return errors_happened ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
 }
 
-static inline void version_ascii_instance(org::libmemcached::Instance* instance)
+static inline void version_ascii_instance(memcached_instance_st* instance)
 {
   if (instance->major_version != UINT8_MAX)
   {
@@ -158,7 +155,7 @@ static inline void version_ascii_instance(org::libmemcached::Instance* instance)
   }
 }
 
-static inline void version_binary_instance(org::libmemcached::Instance* instance)
+static inline void version_binary_instance(memcached_instance_st* instance)
 {
   if (instance->major_version != UINT8_MAX)
   {
@@ -178,7 +175,7 @@ static inline void version_binary_instance(org::libmemcached::Instance* instance
   }
 }
 
-void memcached_version_instance(org::libmemcached::Instance* instance)
+void memcached_version_instance(memcached_instance_st* instance)
 {
   if (instance)
   {
@@ -202,27 +199,51 @@ void memcached_version_instance(org::libmemcached::Instance* instance)
   }
 }
 
-memcached_return_t memcached_version(memcached_st *ptr)
+int8_t memcached_version_instance_cmp(memcached_instance_st *instance,
+    uint8_t maj, uint8_t min, uint8_t mic)
 {
-  if (ptr)
+  if (!instance || memcached_server_major_version(instance) == UINT8_MAX) {
+    return INT8_MIN;
+  } else {
+    uint32_t sv, cv;
+
+    sv = memcached_server_micro_version(instance)
+        |memcached_server_minor_version(instance) << 8
+        |memcached_server_major_version(instance) << 16
+        ;
+    cv = mic
+        |min << 8
+        |maj << 16
+        ;
+    if (sv < cv) {
+      return -1;
+    }
+    return sv != cv;
+  }
+}
+
+memcached_return_t memcached_version(memcached_st *shell)
+{
+  Memcached* memc= memcached2Memcached(shell);
+  if (memc)
   {
     memcached_return_t rc;
-    if (memcached_failed(rc= initialize_query(ptr, true)))
+    if (memcached_failed(rc= initialize_query(memc, true)))
     {
       return rc;
     }
 
-    if (memcached_is_udp(ptr))
+    if (memcached_is_udp(memc))
     {
       return MEMCACHED_NOT_SUPPORTED;
     }
 
-    if (memcached_is_binary(ptr))
+    if (memcached_is_binary(memc))
     {
-      return memcached_version_binary(ptr);
+      return memcached_version_binary(memc);
     }
 
-    return memcached_version_textual(ptr);      
+    return memcached_version_textual(memc);      
   }
 
   return MEMCACHED_INVALID_ARGUMENTS;