projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update to latest bootstra.
[m6w6/libmemcached]
/
libmemcached
/
server.cc
diff --git
a/libmemcached/server.cc
b/libmemcached/server.cc
index 8d9e9bbd175e87aeab2db814edf35a8f1c2e8c0c..b38120ad424c002b8568bb0a6bc4ff2f826f9322 100644
(file)
--- a/
libmemcached/server.cc
+++ b/
libmemcached/server.cc
@@
-40,7
+40,7
@@
*/
#include <libmemcached/common.h>
*/
#include <libmemcached/common.h>
-static inline void _server_init(memcached_server_st *self,
memcached_st
*root,
+static inline void _server_init(memcached_server_st *self,
Memcached
*root,
const memcached_string_t& hostname,
in_port_t port,
uint32_t weight, memcached_connection_t type)
const memcached_string_t& hostname,
in_port_t port,
uint32_t weight, memcached_connection_t type)
@@
-50,7
+50,6
@@
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= INVALID_SOCKET;
self->io_bytes_sent= 0;
self->request_id= 0;
self->server_failure_counter= 0;
self->io_bytes_sent= 0;
self->request_id= 0;
self->server_failure_counter= 0;
@@
-65,12
+64,6
@@
static inline void _server_init(memcached_server_st *self, memcached_st *root,
self->minor_version= UINT8_MAX;
self->type= type;
self->error_messages= NULL;
self->minor_version= UINT8_MAX;
self->type= type;
self->error_messages= NULL;
- self->read_ptr= self->read_buffer;
- self->read_buffer_length= 0;
- self->read_data_length= 0;
- self->write_buffer_offset= 0;
- self->address_info= NULL;
- self->address_info_next= NULL;
self->state= MEMCACHED_SERVER_STATE_NEW;
self->next_retry= 0;
self->state= MEMCACHED_SERVER_STATE_NEW;
self->next_retry= 0;
@@
-89,7
+82,7
@@
static inline void _server_init(memcached_server_st *self, memcached_st *root,
self->hostname[hostname.size]= 0;
}
self->hostname[hostname.size]= 0;
}
-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
*memc)
{
if (self == NULL)
{
{
if (self == NULL)
{
@@
-112,8
+105,8
@@
static memcached_server_st *_server_create(memcached_server_st *self, const memc
return self;
}
return self;
}
-memcached_server_st *__server_create_with(
memcached_st
*memc,
- memcached_server_st*
self
,
+memcached_server_st *__server_create_with(
Memcached
*memc,
+ memcached_server_st*
allocated_instance
,
const memcached_string_t& hostname,
const in_port_t port,
uint32_t weight,
const memcached_string_t& hostname,
const in_port_t port,
uint32_t weight,
@@
-125,16
+118,16
@@
memcached_server_st *__server_create_with(memcached_st *memc,
return NULL;
}
return NULL;
}
-
self= _server_create(self
, memc);
+
allocated_instance= _server_create(allocated_instance
, memc);
- if (
self
== NULL)
+ if (
allocated_instance
== NULL)
{
return NULL;
}
{
return NULL;
}
- _server_init(
self, const_cast<memcached_st
*>(memc), hostname, port, weight, type);
+ _server_init(
allocated_instance, const_cast<Memcached
*>(memc), hostname, port, weight, type);
- return
self
;
+ return
allocated_instance
;
}
void __server_free(memcached_server_st *self)
}
void __server_free(memcached_server_st *self)
@@
-198,16
+191,18
@@
uint32_t memcached_server_count(const memcached_st *self)
return self->number_of_hosts;
}
return self->number_of_hosts;
}
-const char *memcached_server_name(const memcached_
server_instance_st
self)
+const char *memcached_server_name(const memcached_
instance_st *
self)
{
WATCHPOINT_ASSERT(self);
{
WATCHPOINT_ASSERT(self);
- if (self == NULL)
- return NULL;
+ if (self)
+ {
+ return self->_hostname;
+ }
- return
self->hostname
;
+ return
NULL
;
}
}
-in_port_t memcached_server_port(const memcached_
server_instance_st
self)
+in_port_t memcached_server_port(const memcached_
instance_st *
self)
{
WATCHPOINT_ASSERT(self);
if (self == NULL)
{
WATCHPOINT_ASSERT(self);
if (self == NULL)
@@
-215,10
+210,10
@@
in_port_t memcached_server_port(const memcached_server_instance_st self)
return 0;
}
return 0;
}
- return self->port;
+ return self->port
()
;
}
}
-uint32_t memcached_server_response_count(const memcached_
server_instance_st
self)
+uint32_t memcached_server_response_count(const memcached_
instance_st *
self)
{
WATCHPOINT_ASSERT(self);
if (self == NULL)
{
WATCHPOINT_ASSERT(self);
if (self == NULL)
@@
-226,10
+221,10
@@
uint32_t memcached_server_response_count(const memcached_server_instance_st self
return 0;
}
return 0;
}
- return self->cursor_active;
+ return self->cursor_active
_
;
}
}
-const char *memcached_server_type(const memcached_
server_instance_st
ptr)
+const char *memcached_server_type(const memcached_
instance_st *
ptr)
{
if (ptr)
{
{
if (ptr)
{
@@
-249,7
+244,7
@@
const char *memcached_server_type(const memcached_server_instance_st ptr)
return "UNKNOWN";
}
return "UNKNOWN";
}
-uint8_t memcached_server_major_version(const memcached_
server_instance_st
instance)
+uint8_t memcached_server_major_version(const memcached_
instance_st *
instance)
{
if (instance)
{
{
if (instance)
{
@@
-259,7
+254,7
@@
uint8_t memcached_server_major_version(const memcached_server_instance_st instan
return UINT8_MAX;
}
return UINT8_MAX;
}
-uint8_t memcached_server_minor_version(const memcached_
server_instance_st
instance)
+uint8_t memcached_server_minor_version(const memcached_
instance_st *
instance)
{
if (instance)
{
{
if (instance)
{
@@
-269,7
+264,7
@@
uint8_t memcached_server_minor_version(const memcached_server_instance_st instan
return UINT8_MAX;
}
return UINT8_MAX;
}
-uint8_t memcached_server_micro_version(const memcached_
server_instance_st
instance)
+uint8_t memcached_server_micro_version(const memcached_
instance_st *
instance)
{
if (instance)
{
{
if (instance)
{