projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update tests, improved UDP performance.
[m6w6/libmemcached]
/
libmemcached
/
server.cc
diff --git
a/libmemcached/server.cc
b/libmemcached/server.cc
index e1b91b94ceab24c229ecc6b8a5c4e473b902652d..f08f8bf077cdcc150ee98721dbcf3054e0beeac3 100644
(file)
--- a/
libmemcached/server.cc
+++ b/
libmemcached/server.cc
@@
-50,7
+50,7
@@
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->io_bytes_sent= 0;
self->server_failure_counter= 0;
self->server_failure_counter_query_id= 0;
@@
-88,11
+88,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,9
+131,8
@@
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 (memc and memcached_is_udp(memc))
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);
}