X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fget.c;h=a6cb549fce434185ebbcb6269cf40a7af558b7e6;hb=d2346aec8760237e77a5c2ff982159bae9ee4579;hp=55457f7f7ce683b1ca8de21896fba5e7094ea607;hpb=1acb07d2a94e162902cd1c1aeee812d017d78b71;p=awesomized%2Flibmemcached

diff --git a/libmemcached/get.c b/libmemcached/get.c
index 55457f7f..a6cb549f 100644
--- a/libmemcached/get.c
+++ b/libmemcached/get.c
@@ -1,5 +1,5 @@
 /* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker 
+ * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -227,13 +227,13 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
 
     instance= memcached_server_instance_fetch(ptr, server_key);
 
-    struct __write_vector_st vector[]=  
-    { 
-      { .length= get_command_length, .buffer= get_command }, 
-      { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key }, 
-      { .length= key_length[x], .buffer= keys[x] }, 
-      { .length= 1, .buffer= " " } 
-    };  
+    struct libmemcached_io_vector_st vector[]=
+    {
+      { .length= get_command_length, .buffer= get_command },
+      { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+      { .length= key_length[x], .buffer= keys[x] },
+      { .length= 1, .buffer= " " }
+    };
 
 
     if (memcached_server_response_count(instance) == 0)
@@ -245,6 +245,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
 
       if ((memcached_io_writev(instance, vector, 4, false)) == -1)
       {
+        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
         rc= MEMCACHED_SOME_ERRORS;
         continue;
       }
@@ -257,6 +258,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
       if ((memcached_io_writev(instance, (vector + 1), 3, false)) == -1)
       {
         memcached_server_response_reset(instance);
+        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
         rc= MEMCACHED_SOME_ERRORS;
         continue;
       }
@@ -276,6 +278,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
       /* We need to do something about non-connnected hosts in the future */
       if ((memcached_io_write(instance, "\r\n", 2, true)) == -1)
       {
+        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
         rc= MEMCACHED_SOME_ERRORS;
       }
     }
@@ -399,16 +402,17 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
     request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
     request.message.header.request.bodylen= htonl((uint32_t)( key_length[x] + ptr->prefix_key_length));
 
-    struct __write_vector_st vector[]= 
+    struct libmemcached_io_vector_st vector[]=
     {
       { .length= sizeof(request.bytes), .buffer= request.bytes },
       { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
       { .length= key_length[x], .buffer= keys[x] }
-    }; 
+    };
 
     if (memcached_io_writev(instance, vector, 3, flush) == -1)
     {
       memcached_server_response_reset(instance);
+      fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
       rc= MEMCACHED_SOME_ERRORS;
       continue;
     }
@@ -418,6 +422,7 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
     memcached_server_response_increment(instance);
     if ((x > 0 && x == ptr->io_key_prefetch) && memcached_flush_buffers(ptr) != MEMCACHED_SUCCESS)
     {
+      fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
       rc= MEMCACHED_SOME_ERRORS;
     }
   }
@@ -443,6 +448,7 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
         {
           memcached_server_response_reset(instance);
           memcached_io_reset(instance);
+          fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
           rc= MEMCACHED_SOME_ERRORS;
         }
 
@@ -451,6 +457,7 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
         {
           memcached_server_response_reset(instance);
           memcached_io_reset(instance);
+          fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
           rc= MEMCACHED_SOME_ERRORS;
         }
       }
@@ -533,12 +540,12 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
        * that we might have processed some of the responses etc. For now,
        * just make sure we work _correctly_
      */
-      struct __write_vector_st vector[]= 
+      struct libmemcached_io_vector_st vector[]=
       {
         { .length= sizeof(request.bytes), .buffer= request.bytes },
         { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
         { .length= key_length[x], .buffer= keys[x] }
-      }; 
+      };
 
       if (memcached_io_writev(instance, vector, 3, true) == -1)
       {