projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merged trunk.
[m6w6/libmemcached]
/
libmemcached
/
memcached.c
diff --git
a/libmemcached/memcached.c
b/libmemcached/memcached.c
index 2d28830fa9fe3a24e7cfbbdd70cc31fed77ba814..81895afab67b19102b9e4418ee1890663cf4128c 100644
(file)
--- a/
libmemcached/memcached.c
+++ b/
libmemcached/memcached.c
@@
-15,6
+15,7
@@
static const memcached_st global_copy= {
.state= {
.is_purging= false,
.is_processing_input= false,
.state= {
.is_purging= false,
.is_processing_input= false,
+ .is_time_for_rebuild= false,
},
.flags= {
.auto_eject_hosts= false,
},
.flags= {
.auto_eject_hosts= false,
@@
-32,7
+33,8
@@
static const memcached_st global_copy= {
.use_cache_lookups= false,
.use_sort_hosts= false,
.use_udp= false,
.use_cache_lookups= false,
.use_sort_hosts= false,
.use_udp= false,
- .verify_key= false
+ .verify_key= false,
+ .tcp_keepalive= false
}
};
}
};
@@
-62,10
+64,12
@@
static inline bool _memcached_init(memcached_st *self)
self->io_msg_watermark= 500;
self->io_bytes_watermark= 65 * 1024;
self->io_msg_watermark= 500;
self->io_bytes_watermark= 65 * 1024;
+ self->tcp_keepidle= 0;
+
self->io_key_prefetch= 0;
self->cached_errno= 0;
self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
self->io_key_prefetch= 0;
self->cached_errno= 0;
self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
- self->connect_timeout= MEMCACHED_DEFAULT_TIMEOUT;
+ self->connect_timeout= MEMCACHED_DEFAULT_
CONNECT_
TIMEOUT;
self->retry_timeout= 0;
self->continuum_count= 0;
self->retry_timeout= 0;
self->continuum_count= 0;
@@
-88,10
+92,8
@@
static inline bool _memcached_init(memcached_st *self)
self->get_key_failure= NULL;
self->delete_trigger= NULL;
self->callbacks= NULL;
self->get_key_failure= NULL;
self->delete_trigger= NULL;
self->callbacks= NULL;
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
self->sasl.callbacks= NULL;
self->sasl.is_allocated= false;
self->sasl.callbacks= NULL;
self->sasl.is_allocated= false;
-#endif
return true;
}
return true;
}
@@
-142,10
+144,23
@@
void memcached_servers_reset(memcached_st *ptr)
memcached_server_list_set(ptr, NULL);
ptr->number_of_hosts= 0;
memcached_server_list_set(ptr, NULL);
ptr->number_of_hosts= 0;
+ if (ptr->last_disconnected_server)
+ {
+ memcached_server_free(ptr->last_disconnected_server);
+ }
ptr->last_disconnected_server= NULL;
ptr->server_failure_limit= 0;
}
ptr->last_disconnected_server= NULL;
ptr->server_failure_limit= 0;
}
+void memcached_reset_last_disconnected_server(memcached_st *ptr)
+{
+ if (ptr->last_disconnected_server)
+ {
+ memcached_server_free(ptr->last_disconnected_server);
+ ptr->last_disconnected_server= NULL;
+ }
+}
+
void memcached_free(memcached_st *ptr)
{
/* If we have anything open, lets close it now */
void memcached_free(memcached_st *ptr)
{
/* If we have anything open, lets close it now */
@@
-153,18
+168,21
@@
void memcached_free(memcached_st *ptr)
memcached_server_list_free(memcached_server_list(ptr));
memcached_result_free(&ptr->result);
memcached_server_list_free(memcached_server_list(ptr));
memcached_result_free(&ptr->result);
+ if (ptr->last_disconnected_server)
+ memcached_server_free(ptr->last_disconnected_server);
+
if (ptr->on_cleanup)
ptr->on_cleanup(ptr);
if (ptr->continuum)
libmemcached_free(ptr, ptr->continuum);
if (ptr->on_cleanup)
ptr->on_cleanup(ptr);
if (ptr->continuum)
libmemcached_free(ptr, ptr->continuum);
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
- if (ptr->sasl.callbacks != NULL)
+ if (ptr->sasl.callbacks)
{
{
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
memcached_destroy_sasl_auth_data(ptr);
memcached_destroy_sasl_auth_data(ptr);
- }
#endif
#endif
+ }
if (memcached_is_allocated(ptr))
{
if (memcached_is_allocated(ptr))
{
@@
-236,6
+254,7
@@
memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
new_clone->io_bytes_watermark= source->io_bytes_watermark;
new_clone->io_key_prefetch= source->io_key_prefetch;
new_clone->number_of_replicas= source->number_of_replicas;
new_clone->io_bytes_watermark= source->io_bytes_watermark;
new_clone->io_key_prefetch= source->io_key_prefetch;
new_clone->number_of_replicas= source->number_of_replicas;
+ new_clone->tcp_keepidle= source->tcp_keepidle;
if (memcached_server_count(source))
rc= memcached_push(new_clone, source);
if (memcached_server_count(source))
rc= memcached_push(new_clone, source);
@@
-298,12
+317,12
@@
memcached_return_t memcached_push(memcached_st *destination, const memcached_st
return memcached_server_push(destination, source->servers);
}
return memcached_server_push(destination, source->servers);
}
-
inline
memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
+memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
{
return &ptr->servers[server_key];
}
{
return &ptr->servers[server_key];
}
-
inline
memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
+memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
{
return &ptr->servers[server_key];
}
{
return &ptr->servers[server_key];
}