projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Committing work for next release (got to do something over lunch aye?)
[awesomized/libmemcached]
/
lib
/
memcached_quit.c
diff --git
a/lib/memcached_quit.c
b/lib/memcached_quit.c
index 7670b06caabbf2bdaafd84cb1126fa0e179c28f8..44f435c480b91fa5db4483dba0ab722620d16161 100644
(file)
--- a/
lib/memcached_quit.c
+++ b/
lib/memcached_quit.c
@@
-9,19
+9,32
@@
will force data to be completed.
*/
will force data to be completed.
*/
-void memcached_quit_server(memcached_st *ptr, unsigned int server_key)
+void memcached_quit_server(memcached_st *ptr, unsigned int server_key
, uint8_t io_death
)
{
{
+ if (server_key > ptr->number_of_hosts)
+ {
+ WATCHPOINT_ASSERT(0);
+ return;
+ }
+
if (ptr->hosts[server_key].fd != -1)
{
if (ptr->hosts[server_key].fd != -1)
{
- if (ptr->flags & MEM_NO_BLOCK && ptr->hosts[server_key].stack_responses)
- memcached_io_flush(ptr, server_key);
+ if (io_death == 0)
+ {
+ memcached_return rc;
+ rc= memcached_do(ptr, server_key, "quit\r\n", 6, 1);
+ WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
- memcached_io_write(ptr, server_key, "quit\r\n", 6, 1);
+ memcached_io_close(ptr, server_key);
+ }
- close(ptr->hosts[server_key].fd);
ptr->hosts[server_key].fd= -1;
ptr->hosts[server_key].stack_responses= 0;
ptr->hosts[server_key].cursor_active= 0;
ptr->hosts[server_key].fd= -1;
ptr->hosts[server_key].stack_responses= 0;
ptr->hosts[server_key].cursor_active= 0;
+ ptr->hosts[server_key].write_buffer_offset= 0;
+ ptr->hosts[server_key].read_buffer_length= 0;
+ ptr->hosts[server_key].read_ptr= ptr->hosts[server_key].read_buffer;
+ ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
}
ptr->connected--;
}
ptr->connected--;
@@
-30,11
+43,14
@@
void memcached_quit_server(memcached_st *ptr, unsigned int server_key)
void memcached_quit(memcached_st *ptr)
{
unsigned int x;
void memcached_quit(memcached_st *ptr)
{
unsigned int x;
+ if (ptr->hosts == NULL ||
+ ptr->number_of_hosts == 0)
+ return;
- if (ptr->hosts)
+ if (ptr->hosts
&& ptr->number_of_hosts
)
{
for (x= 0; x < ptr->number_of_hosts; x++)
{
for (x= 0; x < ptr->number_of_hosts; x++)
- memcached_quit_server(ptr, x);
+ memcached_quit_server(ptr, x
, 0
);
}
ptr->connected= 0;
}
ptr->connected= 0;