projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated for custom hash functions/setting functions.
[awesomized/libmemcached]
/
libmemcached
/
connect.c
diff --git
a/libmemcached/connect.c
b/libmemcached/connect.c
index 36971f60aa9c86e4a19d4bf8e42bc85a47ea1aa3..b599977fab77ab4799297b1dcb5a9e1197c17f54 100644
(file)
--- a/
libmemcached/connect.c
+++ b/
libmemcached/connect.c
@@
-111,7
+111,7
@@
static memcached_return_t set_socket_options(memcached_server_st *ptr)
return MEMCACHED_FAILURE;
}
return MEMCACHED_FAILURE;
}
- if (ptr->root->send_size)
+ if (ptr->root->send_size
> 0
)
{
int error;
{
int error;
@@
-122,7
+122,7
@@
static memcached_return_t set_socket_options(memcached_server_st *ptr)
return MEMCACHED_FAILURE;
}
return MEMCACHED_FAILURE;
}
- if (ptr->root->recv_size)
+ if (ptr->root->recv_size
> 0
)
{
int error;
{
int error;
@@
-335,12
+335,16
@@
memcached_return_t memcached_connect(memcached_server_st *ptr)
if (curr_time.tv_sec < ptr->next_retry)
{
if (curr_time.tv_sec < ptr->next_retry)
{
- if (memcached_behavior_get(ptr->root, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS))
+ memcached_st *root= (memcached_st *)ptr->root;
+ // @todo fix this by fixing behavior to no longer make use of
+ // memcached_st
+ if (memcached_behavior_get(root, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS))
{
{
- run_distribution(
ptr->
root);
+ run_distribution(root);
}
}
- ptr->root->last_disconnected_server = ptr;
+ root->last_disconnected_server = ptr;
+
return MEMCACHED_SERVER_MARKED_DEAD;
}
}
return MEMCACHED_SERVER_MARKED_DEAD;
}
}
@@
-364,7
+368,12
@@
memcached_return_t memcached_connect(memcached_server_st *ptr)
WATCHPOINT_ASSERT(0);
}
WATCHPOINT_ASSERT(0);
}
- unlikely ( rc != MEMCACHED_SUCCESS) ptr->root->last_disconnected_server = ptr;
+ unlikely ( rc != MEMCACHED_SUCCESS)
+ {
+ //@todo create interface around last_discontected_server
+ memcached_st *root= (memcached_st *)ptr->root;
+ root->last_disconnected_server = ptr;
+ }
LIBMEMCACHED_MEMCACHED_CONNECT_END();
LIBMEMCACHED_MEMCACHED_CONNECT_END();