DTrace support

[m6w6/libmemcached] / lib / memcached_auto.c

diff --git a/lib/memcached_auto.c b/lib/memcached_auto.c
index 7122dc90096e6db4659dfc2120d0e32660e6085a..e779f279a7966928f5d95e7add9cf73c4d591d6e 100644 (file)
--- a/lib/memcached_auto.c
+++ b/lib/memcached_auto.c
@@ -1,4 +1,4 @@
-#include <memcached.h>
+#include "common.h"
 
 static memcached_return memcached_auto(memcached_st *ptr, 
                                        char *verb,
@@ -6,7 +6,7 @@ static memcached_return memcached_auto(memcached_st *ptr,
                                        unsigned int offset,
                                        unsigned int *value)
 {
-  size_t send_length;
+  size_t send_length, sent_length;
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
@@ -22,8 +22,11 @@ static memcached_return memcached_auto(memcached_st *ptr,
                         "%s %.*s %u\r\n", verb, 
                         (int)key_length, key,
                         offset);
+  if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+    return MEMCACHED_WRITE_FAILURE;
+  sent_length= send(ptr->hosts[server_key].fd, buffer, send_length, 0);
 
-  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
+  if (sent_length == -1 || sent_length != send_length)
     return MEMCACHED_WRITE_FAILURE;
 
   memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
@@ -53,7 +56,13 @@ memcached_return memcached_increment(memcached_st *ptr,
                                      unsigned int offset,
                                      unsigned int *value)
 {
-  return memcached_auto(ptr, "incr", key, key_length, offset, value);
+  memcached_return rc;
+
+  LIBMEMCACHED_MEMCACHED_INCREMENT_START();
+  rc= memcached_auto(ptr, "incr", key, key_length, offset, value);
+  LIBMEMCACHED_MEMCACHED_INCREMENT_END();
+
+  return rc;
 }
 
 memcached_return memcached_decrement(memcached_st *ptr, 
@@ -61,5 +70,11 @@ memcached_return memcached_decrement(memcached_st *ptr,
                                      unsigned int offset,
                                      unsigned int *value)
 {
-  return memcached_auto(ptr, "decr", key, key_length, offset, value);
+  memcached_return rc;
+
+  LIBMEMCACHED_MEMCACHED_DECREMENT_START();
+  rc= memcached_auto(ptr, "decr", key, key_length, offset, value);
+  LIBMEMCACHED_MEMCACHED_DECREMENT_END();
+
+  return rc;
 }