Use poll() to determine next readable server

[awesomized/libmemcached] / libmemcached / memcached_fetch.c

diff --git a/libmemcached/memcached_fetch.c b/libmemcached/memcached_fetch.c
index e810b64ae326608c0d222699d9f4c72271f98be6..ac76dfc24ad32ff48a77a6773ff7f1bc17a4ef41 100644 (file)
--- a/libmemcached/memcached_fetch.c
+++ b/libmemcached/memcached_fetch.c
@@ -189,47 +189,32 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
   return NULL;
 }
 
-memcached_result_st *memcached_fetch_result(memcached_st *ptr, 
+memcached_result_st *memcached_fetch_result(memcached_st *ptr,
                                             memcached_result_st *result,
                                             memcached_return *error)
 {
+  memcached_server_st *server;
 
   if (ptr->flags & MEM_USE_UDP)
   {
     *error= MEMCACHED_NOT_SUPPORTED;
     return NULL;
   }
-  
-  if (result == NULL)
-    result= memcached_result_create(ptr, NULL);
 
-#ifdef UNUSED
-  if (ptr->flags & MEM_NO_BLOCK)
-    memcached_io_preread(ptr);
-#endif
+  if (result == NULL)
+    if ((result= memcached_result_create(ptr, NULL)) == NULL)
+      return NULL;
 
-  while (ptr->cursor_server < ptr->number_of_hosts)
-  {
+  while ((server = memcached_io_get_readable_server(ptr)) != NULL) {
     char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+    *error= memcached_response(server, buffer, sizeof(buffer), result);
 
-    if (memcached_server_response_count(&ptr->hosts[ptr->cursor_server]) == 0)
-    {
-      ptr->cursor_server++;
-      continue;
-    }
-
-    *error= memcached_response(&ptr->hosts[ptr->cursor_server], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result);
-    
-    if (*error == MEMCACHED_END) /* END means that we move on to the next */
-    {
-      memcached_server_response_reset(&ptr->hosts[ptr->cursor_server]);
-      ptr->cursor_server++;
-      continue;
-    }
-    else if (*error == MEMCACHED_SUCCESS)
+    if (*error == MEMCACHED_SUCCESS)
       return result;
+    else if (*error == MEMCACHED_END)
+      memcached_server_response_reset(server);
     else
-      return NULL;
+      break;
   }
 
   /* We have completed reading data */
@@ -238,6 +223,6 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
   else
     memcached_string_reset(&result->value);
 
-  ptr->cursor_server= 0;
   return NULL;
 }
+