projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
NEw code for the memcached_fetch_execute() function.
[m6w6/libmemcached]
/
lib
/
memcached_connect.c
diff --git
a/lib/memcached_connect.c
b/lib/memcached_connect.c
index 98d7630f589dd9194dbbd64cfb50887716404c70..42390a9af30cd92319c2a8695b9b24c1de5c0c21 100644
(file)
--- a/
lib/memcached_connect.c
+++ b/
lib/memcached_connect.c
@@
-77,7
+77,7
@@
static memcached_return udp_connect(memcached_st *ptr, unsigned int server_key)
if (ptr->hosts[server_key].fd == -1)
{
/* Old connection junk still is in the structure */
if (ptr->hosts[server_key].fd == -1)
{
/* Old connection junk still is in the structure */
- WATCHPOINT_ASSERT(ptr->hosts[server_key].
stack_responses
== 0);
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].
cursor_active
== 0);
/*
If we have not allocated the hosts object.
/*
If we have not allocated the hosts object.
@@
-110,10
+110,11
@@
static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
{
if (ptr->hosts[server_key].fd == -1)
{
{
if (ptr->hosts[server_key].fd == -1)
{
- /* Old connection junk still is in the structure */
- WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
struct addrinfo *use;
struct addrinfo *use;
+ /* Old connection junk still is in the structure */
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
+
if (ptr->hosts[server_key].sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
(!(ptr->flags & MEM_USE_CACHE_LOOKUPS)))
{
if (ptr->hosts[server_key].sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
(!(ptr->flags & MEM_USE_CACHE_LOOKUPS)))
{
@@
-223,7
+224,7
@@
test_connect:
ptr->connected++;
}
ptr->connected++;
}
- WATCHPOINT_ASSERT(ptr->hosts[server_key].
stack_responses
== 0);
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].
cursor_active
== 0);
}
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;