projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update to include build info.
[awesomized/libmemcached]
/
libmemcached
/
quit.cc
diff --git
a/libmemcached/quit.cc
b/libmemcached/quit.cc
index ffd4cd459cd767e71537e4e0971546f7fe53d70e..77924fb4930ee277bf4c3a506e8bd6d0ca78884c 100644
(file)
--- a/
libmemcached/quit.cc
+++ b/
libmemcached/quit.cc
@@
-46,7
+46,7
@@
will force data to be completed.
*/
will force data to be completed.
*/
-void memcached_quit_server(
memcached_server_st *
ptr, bool io_death)
+void memcached_quit_server(
org::libmemcached::Instance*
ptr, bool io_death)
{
if (ptr->fd != INVALID_SOCKET)
{
{
if (ptr->fd != INVALID_SOCKET)
{
@@
-58,17
+58,28
@@
void memcached_quit_server(memcached_server_st *ptr, bool io_death)
if (ptr->root->flags.binary_protocol)
{
protocol_binary_request_quit request= {}; // = {.bytes= {0}};
if (ptr->root->flags.binary_protocol)
{
protocol_binary_request_quit request= {}; // = {.bytes= {0}};
- request.message.header.request.magic = PROTOCOL_BINARY_REQ;
+
+ initialize_binary_request(ptr, request.message.header);
+
request.message.header.request.opcode = PROTOCOL_BINARY_CMD_QUIT;
request.message.header.request.datatype = PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.opcode = PROTOCOL_BINARY_CMD_QUIT;
request.message.header.request.datatype = PROTOCOL_BINARY_RAW_BYTES;
- rc= memcached_do(ptr, request.bytes, sizeof(request.bytes), true);
+
+ libmemcached_io_vector_st vector[]=
+ {
+ { request.bytes, sizeof(request.bytes) }
+ };
+
+ rc= memcached_vdo(ptr, vector, 1, true);
}
else
{
}
else
{
- rc= memcached_do(ptr, memcached_literal_param("quit\r\n"), true);
- }
+ libmemcached_io_vector_st vector[]=
+ {
+ { memcached_literal_param("quit\r\n") }
+ };
- WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_FETCH_NOTFINISHED);
+ rc= memcached_vdo(ptr, vector, 1, true);
+ }
/* read until socket is closed, or there is an error
* closing the socket before all data is read
/* read until socket is closed, or there is an error
* closing the socket before all data is read
@@
-78,11
+89,18
@@
void memcached_quit_server(memcached_server_st *ptr, bool io_death)
* In .40 we began to only do this if we had been doing buffered
* requests of had replication enabled.
*/
* In .40 we began to only do this if we had been doing buffered
* requests of had replication enabled.
*/
- if (
ptr->root->flags.buffer_requests or ptr->root->number_of_replicas
)
+ if (
memcached_success(rc) and (ptr->root->flags.buffer_requests or ptr->root->number_of_replicas)
)
{
{
- memcached_return_t rc_slurp;
- while (memcached_continue(rc_slurp= memcached_io_slurp(ptr))) {} ;
- WATCHPOINT_ASSERT(rc_slurp == MEMCACHED_CONNECTION_FAILURE);
+ if (0)
+ {
+ memcached_return_t rc_slurp;
+ while (memcached_continue(rc_slurp= memcached_io_slurp(ptr))) {} ;
+ WATCHPOINT_ASSERT(rc_slurp == MEMCACHED_CONNECTION_FAILURE);
+ }
+ else
+ {
+ memcached_io_slurp(ptr);
+ }
}
/*
}
/*
@@
-98,7
+116,7
@@
void memcached_quit_server(memcached_server_st *ptr, bool io_death)
}
ptr->state= MEMCACHED_SERVER_STATE_NEW;
}
ptr->state= MEMCACHED_SERVER_STATE_NEW;
- ptr->cursor_active= 0;
+ ptr->cursor_active
_
= 0;
ptr->io_bytes_sent= 0;
ptr->write_buffer_offset= size_t(ptr->root and memcached_is_udp(ptr->root) ? UDP_DATAGRAM_HEADER_LENGTH : 0);
ptr->read_buffer_length= 0;
ptr->io_bytes_sent= 0;
ptr->write_buffer_offset= size_t(ptr->root and memcached_is_udp(ptr->root) ? UDP_DATAGRAM_HEADER_LENGTH : 0);
ptr->read_buffer_length= 0;
@@
-120,8
+138,7
@@
void send_quit(memcached_st *ptr)
{
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
{
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
- memcached_server_write_instance_st instance=
- memcached_server_instance_fetch(ptr, x);
+ org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
memcached_quit_server(instance, false);
}
memcached_quit_server(instance, false);
}
@@
-129,7
+146,8
@@
void send_quit(memcached_st *ptr)
void memcached_quit(memcached_st *ptr)
{
void memcached_quit(memcached_st *ptr)
{
- if (memcached_failed(initialize_query(ptr)))
+ memcached_return_t rc;
+ if (memcached_failed(rc= initialize_query(ptr, true)))
{
return;
}
{
return;
}