projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in changes for ICC fix.
[awesomized/libmemcached]
/
libmemcached
/
server.c
diff --git
a/libmemcached/server.c
b/libmemcached/server.c
index f46c75bc785e3d0de7182d4957a04c9fb35ab574..0461c3c7a40816710854eaaae384e7c476c97401 100644
(file)
--- a/
libmemcached/server.c
+++ b/
libmemcached/server.c
@@
-29,6
+29,9
@@
static inline void _server_init(memcached_server_st *self, const memcached_st *r
self->server_failure_counter= 0;
self->weight= weight;
self->state.is_corked= false;
self->server_failure_counter= 0;
self->weight= weight;
self->state.is_corked= false;
+ self->state.is_dead= false;
+ WATCHPOINT_SET(self->io_wait_count.read= 0);
+ WATCHPOINT_SET(self->io_wait_count.write= 0);
self->major_version= 0;
self->micro_version= 0;
self->minor_version= 0;
self->major_version= 0;
self->micro_version= 0;
self->minor_version= 0;
@@
-237,27
+240,27
@@
void memcached_server_list_free(memcached_server_list_st self)
}
}
}
}
-
inline
uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
+uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
{
return servers->number_of_hosts= count;
}
{
return servers->number_of_hosts= count;
}
-
inline
uint32_t memcached_server_count(const memcached_st *self)
+uint32_t memcached_server_count(const memcached_st *self)
{
return self->number_of_hosts;
}
{
return self->number_of_hosts;
}
-
inline
const char *memcached_server_name(memcached_server_instance_st self)
+const char *memcached_server_name(memcached_server_instance_st self)
{
return self->hostname;
}
{
return self->hostname;
}
-in
line in
_port_t memcached_server_port(memcached_server_instance_st self)
+in_port_t memcached_server_port(memcached_server_instance_st self)
{
return self->port;
}
{
return self->port;
}
-
inline
uint32_t memcached_server_response_count(memcached_server_instance_st self)
+uint32_t memcached_server_response_count(memcached_server_instance_st self)
{
return self->cursor_active;
}
{
return self->cursor_active;
}