projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
All *_init() have been changed to _create()
[m6w6/libmemcached]
/
lib
/
memcached_storage.c
diff --git
a/lib/memcached_storage.c
b/lib/memcached_storage.c
index 21dc0934595781f541ffc82b1fbbc8605bca68f5..c1ce2b830ad4c485776e5fb7e337eac7e09302c4 100644
(file)
--- 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,
static memcached_return memcached_send(memcached_st *ptr,
char *key, size_t key_length,
@@
-22,10
+22,12
@@
static memcached_return memcached_send(memcached_st *ptr,
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
- rc= memcached_connect(ptr);
assert(value);
assert(value_length);
assert(value);
assert(value_length);
+ memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
+
+ rc= memcached_connect(ptr);
if (rc != MEMCACHED_SUCCESS)
return rc;
if (rc != MEMCACHED_SUCCESS)
return rc;
@@
-37,19
+39,19
@@
static memcached_return memcached_send(memcached_st *ptr,
(unsigned long long)expiration, value_length);
if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
(unsigned long long)expiration, value_length);
if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
- if ((sent_length=
write(ptr->hosts[server_key].fd, buffer, write_length
)) == -1)
+ if ((sent_length=
send(ptr->hosts[server_key].fd, buffer, write_length, 0
)) == -1)
return MEMCACHED_WRITE_FAILURE;
assert(write_length == sent_length);
return MEMCACHED_WRITE_FAILURE;
assert(write_length == sent_length);
- if ((sent_length=
write(ptr->hosts[server_key].fd, value, value_length
)) == -1)
+ if ((sent_length=
send(ptr->hosts[server_key].fd, value, value_length, 0
)) == -1)
return MEMCACHED_WRITE_FAILURE;
assert(value_length == sent_length);
return MEMCACHED_WRITE_FAILURE;
assert(value_length == sent_length);
- if ((sent_length=
write(ptr->hosts[server_key].fd, "\r\n", 2
)) == -1)
+ if ((sent_length=
send(ptr->hosts[server_key].fd, "\r\n", 2, 0
)) == -1)
return MEMCACHED_WRITE_FAILURE;
assert(2 == sent_length);
return MEMCACHED_WRITE_FAILURE;
assert(2 == sent_length);
- sent_length= re
ad(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE
);
+ sent_length= re
cv(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 0
);
if (sent_length && buffer[0] == 'S') /* STORED */
return MEMCACHED_SUCCESS;
if (sent_length && buffer[0] == 'S') /* STORED */
return MEMCACHED_SUCCESS;
@@
-64,8
+66,12
@@
memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length,
time_t expiration,
uint16_t flags)
{
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");
expiration, flags, "set");
+ LIBMEMCACHED_MEMCACHED_SET_END();
+ return rc;
}
memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length,
}
memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length,
@@
-73,8
+79,12
@@
memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length,
time_t expiration,
uint16_t flags)
{
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");
expiration, flags, "add");
+ LIBMEMCACHED_MEMCACHED_ADD_END();
+ return rc;
}
memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_length,
}
memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_length,
@@
-82,6
+92,10
@@
memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_leng
time_t expiration,
uint16_t flags)
{
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");
expiration, flags, "replace");
+ LIBMEMCACHED_MEMCACHED_REPLACE_END();
+ return rc;
}
}