projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Added MEMCACHED_BEHAVIOR_CACHE_LOOKUPS flag (you can now avoid multiple DNS
[m6w6/libmemcached]
/
lib
/
memcached_flush.c
diff --git
a/lib/memcached_flush.c
b/lib/memcached_flush.c
index a3e1be0b191250810f906b83411a1b77c8ebb941..af2303ca6d41a3657ad5a0ad3c4bbe5a8f753953 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,8
+6,12
@@
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);
+ rc= memcached_connect(ptr, 0);
+
+ if (rc == MEMCACHED_NO_SERVERS)
+ return rc;
if (rc != MEMCACHED_SUCCESS)
rc= MEMCACHED_SOME_ERRORS;
if (rc != MEMCACHED_SUCCESS)
rc= MEMCACHED_SOME_ERRORS;
@@
-16,16
+20,17
@@
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
{
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
{
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "flush_all %
u\r\n",
expiration);
+ "flush_all %
llu\r\n", (unsigned long long)
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))
- {
- fprintf(stderr, "failed flush_all TCP\n");
+ if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
return MEMCACHED_WRITE_FAILURE;
- }
+
+ rc= memcached_do(ptr, x, buffer, send_length, 1);
+ if (rc != MEMCACHED_SUCCESS)
+ goto error;
rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
@@
-33,5
+38,7
@@
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
rc= MEMCACHED_SOME_ERRORS;
}
rc= MEMCACHED_SOME_ERRORS;
}
+error:
+ LIBMEMCACHED_MEMCACHED_FLUSH_END();
return rc;
}
return rc;
}