*
*/
-/*
- This is a partial implementation for fetching/creating memcached_instance_st objects.
-*/
#include <libmemcached/common.h>
-static inline void _server_init(memcached_instance_st *self, memcached_st *root,
+static inline void _server_init(org::libmemcached::Instance* self, memcached_st *root,
const memcached_string_t& hostname,
in_port_t port,
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->cursor_active_= 0;
+ self->port_= port;
self->fd= INVALID_SOCKET;
self->io_bytes_sent= 0;
self->request_id= 0;
self->hostname[hostname.size]= 0;
}
-static memcached_instance_st *_server_create(memcached_instance_st *self, const memcached_st *memc)
+static org::libmemcached::Instance* _server_create(org::libmemcached::Instance* self, const memcached_st *memc)
{
if (self == NULL)
{
- self= libmemcached_xmalloc(memc, struct memcached_instance_st);
+ self= libmemcached_xmalloc(memc, org::libmemcached::Instance);
if (self == NULL)
{
return self;
}
-memcached_instance_st *__instance_create_with(memcached_st *memc,
- memcached_instance_st* self,
- const memcached_string_t& hostname,
- const in_port_t port,
- uint32_t weight,
- const memcached_connection_t type)
+org::libmemcached::Instance* __instance_create_with(memcached_st *memc,
+ org::libmemcached::Instance* self,
+ const memcached_string_t& hostname,
+ const in_port_t port,
+ uint32_t weight,
+ const memcached_connection_t type)
{
if (memcached_is_valid_servername(hostname) == false)
{
return self;
}
-void __instance_free(memcached_instance_st *self)
+void __instance_free(org::libmemcached::Instance* self)
{
memcached_quit_server(self, false);
self->address_info= NULL;
self->address_info_next= NULL;
}
+ assert(self->address_info_next == NULL);
memcached_error_free(*self);
}
}
-void memcached_instance_free(memcached_instance_st *self)
-{
- if (self == NULL)
- {
- return;
- }
-
- if (memcached_instance_count(self))
- {
- memcached_instance_list_free(self, memcached_instance_count(self));
- return;
- }
-
- __instance_free(self);
-}
-
-/*
- If we do not have a valid object to clone from, we toss an error.
-*/
-memcached_server_st *memcached_instance_2_server(memcached_instance_st *source)
+void memcached_instance_free(org::libmemcached::Instance* self)
{
- /* We just do a normal create if source is missing */
- if (source == NULL)
+ if (self)
{
- return NULL;
+ __instance_free(self);
}
-
- memcached_string_t hostname= { memcached_string_make_from_cstr(source->hostname) };
- return __server_create_with(source->root, NULL,
- hostname,
- source->port, source->weight,
- source->type);
-
}
memcached_return_t memcached_server_cursor(const memcached_st *ptr,
size_t errors= 0;
for (uint32_t x= 0; x < memcached_instance_list_count(ptr); x++)
{
- memcached_server_instance_st instance=
- memcached_server_instance_by_position(ptr, x);
+ org::libmemcached::Instance* instance= memcached_instance_by_position(ptr, x);
for (uint32_t y= 0; y < number_of_callbacks; y++)
{
bool some_errors= false;;
for (uint32_t x= 0; x < memcached_instance_list_count(ptr); x++)
{
- memcached_instance_st* instance= memcached_server_instance_fetch(ptr, x);
+ org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
memcached_return_t rc= (*callback)(ptr, instance, context);
if (rc == MEMCACHED_INVALID_ARGUMENTS)
memcached_return_t *error)
{
memcached_return_t unused;
- if (not error)
+ if (error == NULL)
{
error= &unused;
}
}
uint32_t server_key= memcached_generate_hash(ptr, key, key_length);
- return memcached_server_instance_by_position(ptr, server_key);
+ return memcached_instance_by_position(ptr, server_key);
}
/*
If we do not have a valid object to clone from, we toss an error.
*/
-static memcached_instance_st *memcached_instance_clone(memcached_instance_st *source)
+static org::libmemcached::Instance* memcached_instance_clone(org::libmemcached::Instance* source)
{
/* We just do a normal create if source is missing */
if (source == NULL)
return __instance_create_with(source->root,
NULL,
hostname,
- source->port, source->weight,
+ source->port(), source->weight,
source->type);
}
-void set_last_disconnected_host(memcached_server_write_instance_st self)
+void set_last_disconnected_host(org::libmemcached::Instance* self)
{
assert(self->root);
- if (self->root == NULL)
- {
- return;
- }
-
- if (self->root->last_disconnected_server and self->root->last_disconnected_server->version == self->version)
+ if (self->root)
{
- return;
- }
-
- // const_cast
- memcached_st *root= (memcached_st *)self->root;
+ if (memcached_server_get_last_disconnect(self->root) and
+ memcached_server_get_last_disconnect(self->root)->version == self->version)
+ {
+ return;
+ }
- memcached_instance_free(root->last_disconnected_server);
- root->last_disconnected_server= memcached_instance_clone(self);
- root->last_disconnected_server->version= self->version;
-}
+ // const_cast
+ memcached_st *root= (memcached_st *)self->root;
-memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
-{
- WATCHPOINT_ASSERT(self);
- if (self == NULL)
- {
- return 0;
- }
+ memcached_instance_free((org::libmemcached::Instance*)(root->last_disconnected_server));
- return self->last_disconnected_server;
-}
+ // We set is_parsing so that no lookup happens
+ root->state.is_parsing= true;
+ root->last_disconnected_server= memcached_instance_clone(self);
+ root->state.is_parsing= false;
-uint32_t memcached_instance_set_count(memcached_instance_st *servers, uint32_t count)
-{
- WATCHPOINT_ASSERT(servers);
- if (servers == NULL)
- {
- return 0;
+ ((org::libmemcached::Instance*)memcached_server_get_last_disconnect(root))->version= self->version;
}
-
- return servers->number_of_hosts= count;
}
-const char *memcached_instance_name(const memcached_server_instance_st self)
-{
- WATCHPOINT_ASSERT(self);
- if (self == NULL)
- return NULL;
-
- return self->hostname;
-}
-
-in_port_t memcached_instance_port(const memcached_server_instance_st self)
+memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
{
WATCHPOINT_ASSERT(self);
if (self == NULL)
return 0;
}
- return self->port;
+ return (memcached_server_instance_st)self->last_disconnected_server;
}
-uint32_t memcached_instance_response_count(const memcached_instance_st* self)
+void memcached_instance_next_retry(memcached_server_instance_st self, const time_t absolute_time)
{
WATCHPOINT_ASSERT(self);
- if (self == NULL)
+ if (self)
{
- return 0;
+ ((org::libmemcached::Instance*)self)->next_retry= absolute_time;
}
-
- return self->cursor_active;
}
projects / m6w6 / libmemcached / blobdiff