projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for build.
[m6w6/libmemcached]
/
libmemcached
/
memcached.c
diff --git
a/libmemcached/memcached.c
b/libmemcached/memcached.c
index 0c38cc69f61ce637a2a99e62bdec622d71a371c9..d5411e86c0ba3becb6934e9981cbec2e36a859cf 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,
@@
-68,7
+69,7
@@
static inline bool _memcached_init(memcached_st *self)
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;
@@
-91,10
+92,7
@@
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;
-#endif
+ self->sasl= NULL;
return true;
}
return true;
}
@@
-145,10
+143,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 */
@@
-156,18
+167,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)
{
{
+#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))
{
@@
-259,7
+273,7
@@
memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
}
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
}
#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
- if (source->sasl
.
callbacks)
+ if (source->sasl
&& source->sasl->
callbacks)
{
if (memcached_clone_sasl(new_clone, source) != MEMCACHED_SUCCESS)
{
{
if (memcached_clone_sasl(new_clone, source) != MEMCACHED_SUCCESS)
{