X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_storage.c;h=d8b124325aafb4c08270f0cadae4f423aa85e8bc;hb=05a0de51880aa6ee2428a365ef5d6ad530f96454;hp=43a18a98336a7474f027e5a493e792c8390fec97;hpb=b01ff6189633c1bf86f94065d2564810e6871869;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 43a18a98..d8b12432 100644
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -20,7 +20,7 @@ typedef enum {
 } memcached_storage_action;
 
 /* Inline this */
-char *storage_op_string(memcached_storage_action verb)
+static char *storage_op_string(memcached_storage_action verb)
 {
   switch (verb)
   {
@@ -46,7 +46,7 @@ static inline memcached_return memcached_send(memcached_st *ptr,
                                               char *key, size_t key_length, 
                                               char *value, size_t value_length, 
                                               time_t expiration,
-                                              uint16_t flags,
+                                              uint32_t flags,
                                               uint64_t cas,
                                               memcached_storage_action verb)
 {
@@ -86,43 +86,39 @@ static inline memcached_return memcached_send(memcached_st *ptr,
     goto error;
   }
 
-  rc=  memcached_do(ptr, server_key, buffer, write_length, 0);
+  rc=  memcached_do(&ptr->hosts[server_key], buffer, write_length, 0);
   if (rc != MEMCACHED_SUCCESS)
     goto error;
 
-  if ((sent_length= memcached_io_write(ptr, server_key, value, value_length, 0)) == -1)
+  if ((sent_length= memcached_io_write(&ptr->hosts[server_key], value, value_length, 0)) == -1)
   {
     rc= MEMCACHED_WRITE_FAILURE;
     goto error;
   }
 
-  if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP)
+  if ((ptr->flags & MEM_BUFFER_REQUESTS) && verb == SET_OP)
     to_write= 0;
   else
     to_write= 1;
 
-  if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, to_write)) == -1)
+  if ((sent_length= memcached_io_write(&ptr->hosts[server_key], "\r\n", 2, to_write)) == -1)
   {
     rc= MEMCACHED_WRITE_FAILURE;
     goto error;
   }
 
   if (to_write == 0)
-  {
-    rc= MEMCACHED_SUCCESS;
-    memcached_server_response_increment(ptr, server_key);
-  }
-  else
-  {
-    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
-  }
+    return MEMCACHED_BUFFERED;
+
+  rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+
   if (rc == MEMCACHED_STORED)
     return MEMCACHED_SUCCESS;
   else 
     return rc;
 
 error:
-  memcached_io_reset(ptr, server_key);
+  memcached_io_reset(&ptr->hosts[server_key]);
 
   return rc;
 }
@@ -130,7 +126,7 @@ error:
 memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, 
                                char *value, size_t value_length, 
                                time_t expiration,
-                               uint16_t flags)
+                               uint32_t flags)
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_SET_START();
@@ -145,7 +141,7 @@ memcached_return memcached_add(memcached_st *ptr,
                                char *key, size_t key_length,
                                char *value, size_t value_length, 
                                time_t expiration,
-                               uint16_t flags)
+                               uint32_t flags)
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_ADD_START();
@@ -160,7 +156,7 @@ memcached_return memcached_replace(memcached_st *ptr,
                                    char *key, size_t key_length,
                                    char *value, size_t value_length, 
                                    time_t expiration,
-                                   uint16_t flags)
+                                   uint32_t flags)
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_REPLACE_START();
@@ -175,7 +171,7 @@ memcached_return memcached_prepend(memcached_st *ptr,
                                    char *key, size_t key_length,
                                    char *value, size_t value_length, 
                                    time_t expiration,
-                                   uint16_t flags)
+                                   uint32_t flags)
 {
   memcached_return rc;
   rc= memcached_send(ptr, key, key_length, 
@@ -188,7 +184,7 @@ memcached_return memcached_append(memcached_st *ptr,
                                   char *key, size_t key_length,
                                   char *value, size_t value_length, 
                                   time_t expiration,
-                                  uint16_t flags)
+                                  uint32_t flags)
 {
   memcached_return rc;
   rc= memcached_send(ptr, key, key_length, 
@@ -201,7 +197,7 @@ memcached_return memcached_cas(memcached_st *ptr,
                                char *key, size_t key_length,
                                char *value, size_t value_length, 
                                time_t expiration,
-                               uint16_t flags,
+                               uint32_t flags,
                                uint64_t cas)
 {
   memcached_return rc;
@@ -216,7 +212,7 @@ memcached_return memcached_set_by_key(memcached_st *ptr,
                                       char *key, size_t key_length, 
                                       char *value, size_t value_length, 
                                       time_t expiration,
-                                      uint16_t flags)
+                                      uint32_t flags)
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_SET_START();
@@ -232,7 +228,7 @@ memcached_return memcached_add_by_key(memcached_st *ptr,
                                       char *key, size_t key_length,
                                       char *value, size_t value_length, 
                                       time_t expiration,
-                                      uint16_t flags)
+                                      uint32_t flags)
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_ADD_START();
@@ -248,7 +244,7 @@ memcached_return memcached_replace_by_key(memcached_st *ptr,
                                           char *key, size_t key_length,
                                           char *value, size_t value_length, 
                                           time_t expiration,
-                                          uint16_t flags)
+                                          uint32_t flags)
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_REPLACE_START();
@@ -264,7 +260,7 @@ memcached_return memcached_prepend_by_key(memcached_st *ptr,
                                           char *key, size_t key_length,
                                           char *value, size_t value_length, 
                                           time_t expiration,
-                                          uint16_t flags)
+                                          uint32_t flags)
 {
   memcached_return rc;
   rc= memcached_send(ptr, key, key_length, 
@@ -278,7 +274,7 @@ memcached_return memcached_append_by_key(memcached_st *ptr,
                                          char *key, size_t key_length,
                                          char *value, size_t value_length, 
                                          time_t expiration,
-                                         uint16_t flags)
+                                         uint32_t flags)
 {
   memcached_return rc;
   rc= memcached_send(ptr, key, key_length, 
@@ -292,7 +288,7 @@ memcached_return memcached_cas_by_key(memcached_st *ptr,
                                       char *key, size_t key_length,
                                       char *value, size_t value_length, 
                                       time_t expiration,
-                                      uint16_t flags,
+                                      uint32_t flags,
                                       uint64_t cas)
 {
   memcached_return rc;