projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
See changes in changelog, but...
[m6w6/libmemcached]
/
lib
/
memcached_flush.c
diff --git
a/lib/memcached_flush.c
b/lib/memcached_flush.c
index a3e1be0b191250810f906b83411a1b77c8ebb941..9b9c4baca91c3efb181961abef7ecf69a2aa6d62 100644
(file)
--- a/
lib/memcached_flush.c
+++ b/
lib/memcached_flush.c
@@
-1,37
+1,44
@@
-#include
<memcached.h>
+#include
"common.h"
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
{
unsigned int x;
memcached_return memcached_flush(memcached_st *ptr, time_t expiration)
{
unsigned int x;
- size_t send_length;
+ size_t send_length
, sent_length
;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
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;
rc= memcached_connect(ptr);
if (rc != MEMCACHED_SUCCESS)
rc= MEMCACHED_SOME_ERRORS;
+ memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
for (x= 0; x < ptr->number_of_hosts; x++)
{
if (expiration)
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
for (x= 0; x < ptr->number_of_hosts; x++)
{
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;
- }
+ sent_length= memcached_io_write(ptr, x, buffer, send_length, 1);
+
+ if (sent_length == -1 || sent_length != send_length)
+ return MEMCACHED_WRITE_FAILURE;
+
+ if (ptr->flags & MEM_NO_BLOCK)
+ WATCHPOINT;
rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
if (rc != MEMCACHED_SUCCESS)
rc= MEMCACHED_SOME_ERRORS;
}
rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
if (rc != MEMCACHED_SUCCESS)
rc= MEMCACHED_SOME_ERRORS;
}
+ LIBMEMCACHED_MEMCACHED_FLUSH_END();
return rc;
}
return rc;
}