projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
First pass through turning instance into ++
[m6w6/libmemcached]
/
libmemcached
/
memcached.cc
diff --git
a/libmemcached/memcached.cc
b/libmemcached/memcached.cc
index 2bcf6fa894afb72cce638da244c5984fba636739..5f57c515c3122e9a954294a6371c28631eeaa091 100644
(file)
--- a/
libmemcached/memcached.cc
+++ b/
libmemcached/memcached.cc
@@
-128,12
+128,12
@@
static void __memcached_free(memcached_st *ptr, bool release_st)
{
/* If we have anything open, lets close it now */
send_quit(ptr);
{
/* If we have anything open, lets close it now */
send_quit(ptr);
- memcached_
server_list_free(memcached_server_lis
t(ptr));
+ memcached_
instance_list_free(memcached_instance_list(ptr), memcached_instance_list_coun
t(ptr));
memcached_result_free(&ptr->result);
memcached_virtual_bucket_free(ptr);
memcached_result_free(&ptr->result);
memcached_virtual_bucket_free(ptr);
- memcached_
server_free(
ptr->last_disconnected_server);
+ memcached_
instance_free((org::libmemcached::Instance*)
ptr->last_disconnected_server);
if (ptr->on_cleanup)
{
if (ptr->on_cleanup)
{
@@
-184,11
+184,6
@@
memcached_st *memcached_create(memcached_st *ptr)
ptr->options.is_allocated= true;
}
ptr->options.is_allocated= true;
}
-#if 0
- memcached_set_purging(ptr, false);
- memcached_set_processing_input(ptr, false);
-#endif
-
if (_memcached_init(ptr) == false)
{
memcached_free(ptr);
if (_memcached_init(ptr) == false)
{
memcached_free(ptr);
@@
-280,11
+275,11
@@
void memcached_servers_reset(memcached_st *self)
{
if (self)
{
{
if (self)
{
- memcached_
server_list_free(memcached_server_list(self)
);
+ memcached_
instance_list_free(memcached_instance_list(self), self->number_of_hosts
);
- memcached_
server_list
_set(self, NULL);
+ memcached_
instance
_set(self, NULL);
self->number_of_hosts= 0;
self->number_of_hosts= 0;
- memcached_
server_free(
self->last_disconnected_server);
+ memcached_
instance_free((org::libmemcached::Instance*)
self->last_disconnected_server);
self->last_disconnected_server= NULL;
}
}
self->last_disconnected_server= NULL;
}
}
@@
-293,7
+288,7
@@
void memcached_reset_last_disconnected_server(memcached_st *self)
{
if (self)
{
{
if (self)
{
- memcached_
server_free(
self->last_disconnected_server);
+ memcached_
instance_free((org::libmemcached::Instance*)
self->last_disconnected_server);
self->last_disconnected_server= NULL;
}
}
self->last_disconnected_server= NULL;
}
}
@@
-426,10
+421,10
@@
void *memcached_set_user_data(memcached_st *ptr, void *data)
memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source)
{
memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source)
{
- return memcached_
server_push(destination, source->server
s);
+ return memcached_
instance_push(destination, (org::libmemcached::Instance*)source->servers, source->number_of_host
s);
}
}
-
memcached_server_write_instance_st memcached_server
_instance_fetch(memcached_st *ptr, uint32_t server_key)
+
org::libmemcached::Instance* memcached
_instance_fetch(memcached_st *ptr, uint32_t server_key)
{
if (ptr == NULL)
{
{
if (ptr == NULL)
{
@@
-449,6
+444,16
@@
memcached_server_instance_st memcached_server_instance_by_position(const memcach
return &ptr->servers[server_key];
}
return &ptr->servers[server_key];
}
+org::libmemcached::Instance* memcached_instance_by_position(const memcached_st *ptr, uint32_t server_key)
+{
+ if (ptr == NULL)
+ {
+ return NULL;
+ }
+
+ return &ptr->servers[server_key];
+}
+
uint64_t memcached_query_id(const memcached_st *self)
{
if (self == NULL)
uint64_t memcached_query_id(const memcached_st *self)
{
if (self == NULL)
@@
-458,3
+463,14
@@
uint64_t memcached_query_id(const memcached_st *self)
return self->query_id;
}
return self->query_id;
}
+
+org::libmemcached::Instance* memcached_instance_list(const memcached_st *self)
+{
+ if (self)
+ {
+ return (org::libmemcached::Instance*)self->servers;
+ }
+
+ return NULL;
+}
+