projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Extend test.
[m6w6/libmemcached]
/
libmemcached
/
server.c
diff --git
a/libmemcached/server.c
b/libmemcached/server.c
index 7b9b2eefbbad5b9c287c1b9a08de47cf257647ac..b446d13155bc33456e151c3c92012044b884c253 100644
(file)
--- a/
libmemcached/server.c
+++ b/
libmemcached/server.c
@@
-19,6
+19,7
@@
static inline void _server_init(memcached_server_st *self, const memcached_st *r
uint32_t weight, memcached_connection_t type)
{
self->options.is_shutting_down= false;
uint32_t weight, memcached_connection_t type)
{
self->options.is_shutting_down= false;
+ self->options.is_dead= false;
self->number_of_hosts= 0;
self->cursor_active= 0;
self->port= port;
self->number_of_hosts= 0;
self->cursor_active= 0;
self->port= port;
@@
-26,9
+27,7
@@
static inline void _server_init(memcached_server_st *self, const memcached_st *r
self->fd= -1;
self->io_bytes_sent= 0;
self->server_failure_counter= 0;
self->fd= -1;
self->io_bytes_sent= 0;
self->server_failure_counter= 0;
- self->weight= weight;
- self->state.is_corked= false;
- self->state.is_dead= false;
+ self->weight= weight ? weight : 1; // 1 is the default weight value
WATCHPOINT_SET(self->io_wait_count.read= 0);
WATCHPOINT_SET(self->io_wait_count.write= 0);
self->major_version= UINT8_MAX;
WATCHPOINT_SET(self->io_wait_count.read= 0);
WATCHPOINT_SET(self->io_wait_count.write= 0);
self->major_version= UINT8_MAX;
@@
-52,12
+51,21
@@
static inline void _server_init(memcached_server_st *self, const memcached_st *r
self->next_retry= 0;
}
self->next_retry= 0;
}
+ if (self->weight > 1 && root)
+ {
+ ((memcached_st *)root)->ketama.weighted= true;
+ }
+
self->root= root;
self->limit_maxbytes= 0;
if (hostname == NULL)
self->root= root;
self->limit_maxbytes= 0;
if (hostname == NULL)
+ {
self->hostname[0]= 0;
self->hostname[0]= 0;
+ }
else
else
+ {
strncpy(self->hostname, hostname, NI_MAXHOST - 1);
strncpy(self->hostname, hostname, NI_MAXHOST - 1);
+ }
}
static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
}
static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
@@
-246,8
+254,6
@@
void memcached_server_list_free(memcached_server_list_st self)
if (self == NULL)
return;
if (self == NULL)
return;
- const memcached_st *root= self->root;
-
for (uint32_t x= 0; x < memcached_server_list_count(self); x++)
{
if (self[x].address_info)
for (uint32_t x= 0; x < memcached_server_list_count(self); x++)
{
if (self[x].address_info)
@@
-257,6
+263,7
@@
void memcached_server_list_free(memcached_server_list_st self)
}
}
}
}
+ const memcached_st *root= self->root;
if (root)
{
libmemcached_free(root, self);
if (root)
{
libmemcached_free(root, self);