diff options
| author | Xiaoyun Mao <xmao@lab14.schoonerinfotech.net> | 2010-01-18 19:38:53 -0800 |
|---|---|---|
| committer | Xiaoyun Mao <xmao@lab14.schoonerinfotech.net> | 2010-01-18 19:38:53 -0800 |
| commit | 613d2abe710af39d6daf34673462cd467ed6499a (patch) | |
| tree | 6ff47d3c7d4adb93595c9bb170a1315eee7dbb09 /clients/ms_conn.h | |
| parent | 25c32fd878df9103de46b2e3b03265d41e4dde1b (diff) | |
| download | libmemcached-613d2abe710af39d6daf34673462cd467ed6499a.tar.gz | |
1.Fix bug that memslap can't start up(ms_thread=NULL). 2.ignore signal SIGPIPE. 3.support reconnection with thousands of connections. 4.enhance binary protocol to support UDP. 5.synchronize all the threads at the beginning. 6.merge with latest trunk.
Diffstat (limited to 'clients/ms_conn.h')
| -rw-r--r-- | clients/ms_conn.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/clients/ms_conn.h b/clients/ms_conn.h index d95191ec..a52a55c9 100644 --- a/clients/ms_conn.h +++ b/clients/ms_conn.h @@ -30,8 +30,7 @@ extern "C" { #define UDP_MAX_SEND_PAYLOAD_SIZE 1400 /* mtu size is 1500 */ #define UDP_HEADER_SIZE 8 /* UDP header size */ #define MAX_SENDBUF_SIZE (256 * 1024 * 1024) /* Maximum socket buffer size */ -#define SOCK_WAIT_TIMEOUT 10 /* maximum waiting time of UDP, 10s */ -#define EVENT_TIMEOUT 10 /* maximum waiting time of event,10s */ +#define SOCK_WAIT_TIMEOUT 30 /* maximum waiting time of UDP, 30s */ #define MAX_UDP_PACKET (1 << 16) /* maximum UDP packets, 65536 */ /* Initial size of the sendmsg() scatter/gather array. */ @@ -104,7 +103,6 @@ typedef struct udppkt enum protocol { ascii_prot = 3, /* ASCII protocol */ - ascii_udp_prot, /* ASCII UDP protocol*/ binary_prot, /* binary protocol */ }; @@ -229,7 +227,7 @@ int ms_mcd_set(ms_conn_t *c, ms_task_item_t *item); /* used to send the get command to server */ -int ms_mcd_get(ms_conn_t *c, ms_task_item_t *item, bool verify); +int ms_mcd_get(ms_conn_t *c, ms_task_item_t *item); /* used to send the multi-get command to server */ |