projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
MEMCACHED_BEHAVIOR_RETRY_TIMEOUT added for timeout
[m6w6/libmemcached]
/
lib
/
memcached_flush.c
diff --git
a/lib/memcached_flush.c
b/lib/memcached_flush.c
index 8c51cdf1f85f8e9e44d3fa7a67fb673aac42aa52..fa3dd8d8973eb9de56b925eea2177a973586aa7c 100644
(file)
--- a/
lib/memcached_flush.c
+++ b/
lib/memcached_flush.c
@@
-1,4
+1,4
@@
-#include
<memcached.h>
+#include
"common.h"
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
{
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
{
@@
-6,11
+6,10
@@
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
size_t send_length;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
size_t send_length;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+ LIBMEMCACHED_MEMCACHED_FLUSH_START();
- rc= memcached_connect(ptr);
-
- if (rc != MEMCACHED_SUCCESS)
- rc= MEMCACHED_SOME_ERRORS;
+ if (ptr->number_of_hosts == 0)
+ return MEMCACHED_NO_SERVERS;
for (x= 0; x < ptr->number_of_hosts; x++)
{
for (x= 0; x < ptr->number_of_hosts; x++)
{
@@
-20,14
+19,13
@@
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
else
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"flush_all\r\n");
else
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"flush_all\r\n");
- if ((write(ptr->hosts[x].fd, buffer, send_length) == -1))
- return MEMCACHED_WRITE_FAILURE;
- rc= memcached_
response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x
);
+ rc= memcached_
do(&ptr->hosts[x], buffer, send_length, 1
);
- if (rc
!
= MEMCACHED_SUCCESS)
-
rc= MEMCACHED_SOME_ERRORS
;
+ if (rc
=
= MEMCACHED_SUCCESS)
+
(void)memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL)
;
}
}
- return rc;
+ LIBMEMCACHED_MEMCACHED_FLUSH_END();
+ return MEMCACHED_SUCCESS;
}
}