X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_storage.c;h=da5a9ac6419449ffb181e094f3b378a00eb83fd5;hb=a95ca4ad9c0f9d23c8a83bd337acdecc221021ef;hp=5c34a57347dfd6854e418263cd7464d2954d8775;hpb=ca065f55235fd9979ede818963780f417d70c64e;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 5c34a573..da5a9ac6 100644
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -7,7 +7,7 @@
 
 */
 
-#include <memcached.h>
+#include "common.h"
 
 static memcached_return memcached_send(memcached_st *ptr, 
                                        char *key, size_t key_length, 
@@ -22,45 +22,34 @@ static memcached_return memcached_send(memcached_st *ptr,
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
 
-  rc= memcached_connect(ptr);
   assert(value);
   assert(value_length);
 
+  rc= memcached_connect(ptr);
   if (rc != MEMCACHED_SUCCESS)
     return rc;
 
   server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
 
   write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                        "%s %.*s %u %u %u\r\n", verb,
-                        key_length, key, flags, expiration, value_length);
-  if ((sent_length= write(ptr->hosts[server_key].fd, buffer, write_length)) == -1)
-  {
-    fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
-
+                        "%s %.*s %x %llu %zu\r\n", verb,
+                        (int)key_length, key, flags, 
+                        (unsigned long long)expiration, value_length);
+  if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+    return MEMCACHED_WRITE_FAILURE;
+  if ((sent_length= send(ptr->hosts[server_key].fd, buffer, write_length, 0)) == -1)
     return MEMCACHED_WRITE_FAILURE;
-  }
   assert(write_length == sent_length);
 
-  WATCHPOINT;
-  printf("About to push %.*s\n", value_length, value);
-  WATCHPOINT;
-  if ((sent_length= write(ptr->hosts[server_key].fd, value, value_length)) == -1)
-  {
-    fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
-
+  if ((sent_length= send(ptr->hosts[server_key].fd, value, value_length, 0)) == -1)
     return MEMCACHED_WRITE_FAILURE;
-  }
   assert(value_length == sent_length);
-  if ((sent_length= write(ptr->hosts[server_key].fd, "\r\n", 2)) == -1)
-  {
-    fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
 
+  if ((sent_length= send(ptr->hosts[server_key].fd, "\r\n", 2, 0)) == -1)
     return MEMCACHED_WRITE_FAILURE;
-  }
   assert(2 == sent_length);
 
-  sent_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
+  sent_length= recv(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 0);
 
   if (sent_length && buffer[0] == 'S')  /* STORED */
     return MEMCACHED_SUCCESS;
@@ -75,8 +64,12 @@ memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length,
                                time_t expiration,
                                uint16_t  flags)
 {
-  return  memcached_send(ptr, key, key_length, value, value_length,
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_SET_START();
+  rc= memcached_send(ptr, key, key_length, value, value_length,
                          expiration, flags, "set");
+  LIBMEMCACHED_MEMCACHED_SET_END();
+  return rc;
 }
 
 memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length,
@@ -84,8 +77,12 @@ memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length,
                                time_t expiration,
                                uint16_t  flags)
 {
-  return  memcached_send(ptr, key, key_length, value, value_length,
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_ADD_START();
+  rc= memcached_send(ptr, key, key_length, value, value_length,
                          expiration, flags, "add");
+  LIBMEMCACHED_MEMCACHED_ADD_END();
+  return rc;
 }
 
 memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_length,
@@ -93,6 +90,10 @@ memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_leng
                                    time_t expiration,
                                    uint16_t  flags)
 {
-  return  memcached_send(ptr, key, key_length, value, value_length,
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_REPLACE_START();
+  rc= memcached_send(ptr, key, key_length, value, value_length,
                          expiration, flags, "replace");
+  LIBMEMCACHED_MEMCACHED_REPLACE_END();
+  return rc;
 }