projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix compile issue.
[awesomized/libmemcached]
/
libmemcached
/
server.hpp
diff --git
a/libmemcached/server.hpp
b/libmemcached/server.hpp
index 320da1152fe0f07aea280dbfda3ad98e3a29c0cc..74816fdc1af1457b34378e84c0061d19803b8d9e 100644
(file)
--- a/
libmemcached/server.hpp
+++ b/
libmemcached/server.hpp
@@
-37,48
+37,37
@@
#pragma once
#pragma once
-#include <libmemcached/basic_string.h>
-
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <cassert>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <cassert>
-static inline bool memcached_is_valid_servername(const memcached_string_t& arg)
-{
- return arg.size > 0 or arg.size < NI_MAXHOST;
-}
+memcached_server_st *__server_create_with(memcached_st *memc,
+ memcached_server_st* self,
+ const memcached_string_t& hostname,
+ const in_port_t port,
+ uint32_t weight,
+ const memcached_connection_t type);
-static inline void memcached_mark_server_as_clean(memcached_server_write_instance_st server)
-{
- server->server_failure_counter= 0;
- server->next_retry= 0;
-}
+memcached_return_t memcached_server_add_parsed(memcached_st *ptr,
+ const char *hostname,
+ size_t hostname_length,
+ in_port_t port,
+ uint32_t weight);
+void __server_free(memcached_server_st *);
-static inline
void set_last_disconnected_host(memcached_server_write_instance_st self
)
+static inline
bool memcached_is_valid_servername(const memcached_string_t& arg
)
{
{
- assert(self->root);
- if (self->root == NULL)
- {
- return;
- }
+ return arg.size > 0 or arg.size < NI_MAXHOST;
+}
- if (self->root->last_disconnected_server and self->root->last_disconnected_server->version == self->version)
- {
- return;
- }
+void memcached_instance_free(org::libmemcached::Instance *);
- // const_cast
- memcached_st *root= (memcached_st *)self->root;
+void set_last_disconnected_host(org::libmemcached::Instance* self);
- memcached_server_free(root->last_disconnected_server);
- root->last_disconnected_server= memcached_server_clone(NULL, self);
- root->last_disconnected_server->version= self->version;
-}
-
-static inline void memcached_mark_server_for_timeout(memcached_server_write_instance_st server)
+static inline void memcached_mark_server_for_timeout(org::libmemcached::Instance* server)
{
if (server->state != MEMCACHED_SERVER_STATE_IN_TIMEOUT)
{
{
if (server->state != MEMCACHED_SERVER_STATE_IN_TIMEOUT)
{
@@
-93,15
+82,11
@@
static inline void memcached_mark_server_for_timeout(memcached_server_write_inst
}
server->state= MEMCACHED_SERVER_STATE_IN_TIMEOUT;
}
server->state= MEMCACHED_SERVER_STATE_IN_TIMEOUT;
- server->server_failure_counter++;
+ if (server->server_failure_counter_query_id != server->root->query_id)
+ {
+ server->server_failure_counter++;
+ server->server_failure_counter_query_id= server->root->query_id;
+ }
set_last_disconnected_host(server);
}
}
set_last_disconnected_host(server);
}
}
-
-LIBMEMCACHED_LOCAL
- memcached_server_st *__server_create_with(memcached_st *memc,
- memcached_server_write_instance_st host,
- const memcached_string_t& hostname,
- const in_port_t port,
- uint32_t weight,
- const memcached_connection_t type);