projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch
[m6w6/libmemcached]
/
libmemcached
/
server.cc
diff --git
a/libmemcached/server.cc
b/libmemcached/server.cc
index c9c5ffca6b3a9269ca3782d3f1e68fe3f4151375..f2f78211fe35beedb73ce138f64d4e950cf97677 100644
(file)
--- a/
libmemcached/server.cc
+++ b/
libmemcached/server.cc
@@
-50,13
+50,14
@@
static inline void _server_init(memcached_server_st *self, memcached_st *root,
self->number_of_hosts= 0;
self->cursor_active= 0;
self->port= port;
self->number_of_hosts= 0;
self->cursor_active= 0;
self->port= port;
- self->fd=
-1
;
+ self->fd=
INVALID_SOCKET
;
self->io_bytes_sent= 0;
self->server_failure_counter= 0;
self->server_failure_counter_query_id= 0;
self->weight= weight ? weight : 1; // 1 is the default weight value
self->io_bytes_sent= 0;
self->server_failure_counter= 0;
self->server_failure_counter_query_id= 0;
self->weight= weight ? weight : 1; // 1 is the default weight value
- WATCHPOINT_SET(self->io_wait_count.read= 0);
- WATCHPOINT_SET(self->io_wait_count.write= 0);
+ self->io_wait_count.read= 0;
+ self->io_wait_count.write= 0;
+ self->io_wait_count.timeouts= 0;
self->major_version= UINT8_MAX;
self->micro_version= UINT8_MAX;
self->minor_version= UINT8_MAX;
self->major_version= UINT8_MAX;
self->micro_version= UINT8_MAX;
self->minor_version= UINT8_MAX;
@@
-88,11
+89,11
@@
static inline void _server_init(memcached_server_st *self, memcached_st *root,
static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
{
static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
{
- if (
not self
)
+ if (
self == NULL
)
{
{
- self=
(memcached_server_st *)libmemcached_malloc(memc, sizeof(memcached_server_st)
);
+ self=
libmemcached_xmalloc(memc, struct memcached_server_st
);
- if (
not self
)
+ if (
self == NULL
)
{
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
}
{
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
}
@@
-131,13
+132,17
@@
memcached_server_st *__server_create_with(memcached_st *memc,
_server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
_server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
-
- if (type == MEMCACHED_CONNECTION_UDP)
- {
+ if (memc and memcached_is_udp(memc))
+ {
self->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
memcached_io_init_udp_header(self, 0);
}
self->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
memcached_io_init_udp_header(self, 0);
}
+ if (memc)
+ {
+ memcached_connect_try(self);
+ }
+
return self;
}
return self;
}
@@
-197,14
+202,6
@@
memcached_server_st *memcached_server_clone(memcached_server_st *destination,
hostname,
source->port, source->weight,
source->type);
hostname,
source->port, source->weight,
source->type);
- if (destination)
- {
- if (source->error_messages)
- {
- destination->error_messages= memcached_error_copy(*source);
- }
- }
-
return destination;
}
return destination;
}
@@
-245,18
+242,28
@@
memcached_return_t memcached_server_execute(memcached_st *ptr,
memcached_server_execute_fn callback,
void *context)
{
memcached_server_execute_fn callback,
void *context)
{
+ if (callback == NULL)
+ {
+ return MEMCACHED_INVALID_ARGUMENTS;
+ }
+
+ bool some_errors= false;;
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, x);
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, x);
- unsigned int iferror= (*callback)(ptr, instance, context);
-
- if (iferror)
+ memcached_return_t rc= (*callback)(ptr, instance, context);
+ if (rc == MEMCACHED_INVALID_ARGUMENTS)
+ {
+ return rc;
+ }
+ else if (memcached_fatal(rc))
{
{
-
contin
ue;
+
some_errors= tr
ue;
}
}
}
}
+ (void)some_errors;
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
@@
-279,15
+286,9
@@
memcached_server_instance_st memcached_server_by_key(memcached_st *ptr,
return NULL;
}
return NULL;
}
- if (memcached_failed(rc= memcached_validate_key_length(key_length, ptr->flags.binary_protocol)))
- {
- *error= rc;
- return NULL;
- }
-
if (memcached_failed((memcached_key_test(*ptr, (const char **)&key, &key_length, 1))))
{
if (memcached_failed((memcached_key_test(*ptr, (const char **)&key, &key_length, 1))))
{
- *error=
MEMCACHED_BAD_KEY_PROVIDED
;
+ *error=
memcached_last_error(ptr)
;
return NULL;
}
return NULL;
}
@@
-299,7
+300,7
@@
memcached_server_instance_st memcached_server_by_key(memcached_st *ptr,
void memcached_server_error_reset(memcached_server_st *self)
{
WATCHPOINT_ASSERT(self);
void memcached_server_error_reset(memcached_server_st *self)
{
WATCHPOINT_ASSERT(self);
- if (
not self
)
+ if (
self == NULL
)
{
return;
}
{
return;
}
@@
-310,8
+311,10
@@
void memcached_server_error_reset(memcached_server_st *self)
memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
{
WATCHPOINT_ASSERT(self);
memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
{
WATCHPOINT_ASSERT(self);
- if (not self)
+ if (self == NULL)
+ {
return 0;
return 0;
+ }
return self->last_disconnected_server;
}
return self->last_disconnected_server;
}
@@
-319,8
+322,10
@@
memcached_server_instance_st memcached_server_get_last_disconnect(const memcache
uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
{
WATCHPOINT_ASSERT(servers);
uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
{
WATCHPOINT_ASSERT(servers);
- if (not servers)
+ if (servers == NULL)
+ {
return 0;
return 0;
+ }
return servers->number_of_hosts= count;
}
return servers->number_of_hosts= count;
}
@@
-328,7
+333,7
@@
uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t coun
uint32_t memcached_server_count(const memcached_st *self)
{
WATCHPOINT_ASSERT(self);
uint32_t memcached_server_count(const memcached_st *self)
{
WATCHPOINT_ASSERT(self);
- if (
not self
)
+ if (
self == NULL
)
return 0;
return self->number_of_hosts;
return 0;
return self->number_of_hosts;
@@
-337,7
+342,7
@@
uint32_t memcached_server_count(const memcached_st *self)
const char *memcached_server_name(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
const char *memcached_server_name(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
- if (
not self
)
+ if (
self == NULL
)
return NULL;
return self->hostname;
return NULL;
return self->hostname;
@@
-346,7
+351,7
@@
const char *memcached_server_name(const memcached_server_instance_st self)
in_port_t memcached_server_port(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
in_port_t memcached_server_port(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
- if (
not self
)
+ if (
self == NULL
)
return 0;
return self->port;
return 0;
return self->port;
@@
-355,7
+360,7
@@
in_port_t memcached_server_port(const memcached_server_instance_st self)
uint32_t memcached_server_response_count(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
uint32_t memcached_server_response_count(const memcached_server_instance_st self)
{
WATCHPOINT_ASSERT(self);
- if (
not self
)
+ if (
self == NULL
)
return 0;
return self->cursor_active;
return 0;
return self->cursor_active;