projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge Lee
[m6w6/libmemcached]
/
clients
/
ms_conn.c
diff --git
a/clients/ms_conn.c
b/clients/ms_conn.c
index 34707958aa0d21896c0fd6fe5b3e4f64187b857b..b488401c126d6298919ad22cbb72f71bdb3c5327 100644
(file)
--- a/
clients/ms_conn.c
+++ b/
clients/ms_conn.c
@@
-19,6
+19,16
@@
#include <fcntl.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <fcntl.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
#include "ms_setting.h"
#include "ms_thread.h"
#include "ms_atomic.h"
#include "ms_setting.h"
#include "ms_thread.h"
#include "ms_atomic.h"
@@
-909,12
+919,12
@@
static int ms_reconn(ms_conn_t *c)
if (ms_setting.rep_write_srv > 0)
{
srv_idx= c->cur_idx;
if (ms_setting.rep_write_srv > 0)
{
srv_idx= c->cur_idx;
- srv_conn_cnt= ms_setting.nconns;
+ srv_conn_cnt=
(int)
ms_setting.nconns;
}
else
{
srv_idx= ms_thread->thread_ctx->srv_idx;
}
else
{
srv_idx= ms_thread->thread_ctx->srv_idx;
- srv_conn_cnt=
ms_setting.nconns / ms_setting.srv_cnt
;
+ srv_conn_cnt=
(int32_t)((int)ms_setting.nconns / ms_setting.srv_cnt)
;
}
/* close the old socket handler */
}
/* close the old socket handler */
@@
-1037,12
+1047,12
@@
int ms_reconn_socks(ms_conn_t *c)
if (ms_setting.rep_write_srv > 0)
{
srv_idx= i;
if (ms_setting.rep_write_srv > 0)
{
srv_idx= i;
- srv_conn_cnt= ms_setting.nconns;
+ srv_conn_cnt=
(int)
ms_setting.nconns;
}
else
{
srv_idx= ms_thread->thread_ctx->srv_idx;
}
else
{
srv_idx= ms_thread->thread_ctx->srv_idx;
- srv_conn_cnt= ms_setting.nconns / ms_setting.srv_cnt;
+ srv_conn_cnt=
(int)
ms_setting.nconns / ms_setting.srv_cnt;
}
if (ms_network_connect(c, ms_setting.servers[srv_idx].srv_host_name,
}
if (ms_network_connect(c, ms_setting.servers[srv_idx].srv_host_name,
@@
-1589,7
+1599,7
@@
static int ms_udp_read(ms_conn_t *c, char *buf, int len)
if (res > 0)
{
if (res > 0)
{
- atomic_add_
64
(&ms_stats.bytes_read, res);
+ atomic_add_
size
(&ms_stats.bytes_read, res);
c->rudpbytes+= res;
rbytes+= res;
if (res == avail)
c->rudpbytes+= res;
rbytes+= res;
if (res == avail)
@@
-1623,7
+1633,7
@@
static int ms_udp_read(ms_conn_t *c, char *buf, int len)
if (copybytes == -1)
{
if (copybytes == -1)
{
- atomic_add_
64
(&ms_stats.pkt_disorder, 1);
+ atomic_add_
size
(&ms_stats.pkt_disorder, 1);
}
return copybytes;
}
return copybytes;
@@
-1701,7
+1711,7
@@
static int ms_try_read_network(ms_conn_t *c)
{
if (! c->udp)
{
{
if (! c->udp)
{
- atomic_add_
64
(&ms_stats.bytes_read, res);
+ atomic_add_
size
(&ms_stats.bytes_read, res);
}
gotdata= 1;
c->rbytes+= res;
}
gotdata= 1;
c->rbytes+= res;
@@
-1765,7
+1775,7
@@
static void ms_verify_value(ms_conn_t *c,
if (curr_time.tv_sec - c->curr_task.item->client_time
> c->curr_task.item->exp_time + EXPIRE_TIME_ERROR)
{
if (curr_time.tv_sec - c->curr_task.item->client_time
> c->curr_task.item->exp_time + EXPIRE_TIME_ERROR)
{
- atomic_add_
64
(&ms_stats.exp_get, 1);
+ atomic_add_
size
(&ms_stats.exp_get, 1);
if (ms_setting.verbose)
{
if (ms_setting.verbose)
{
@@
-1806,7
+1816,7
@@
static void ms_verify_value(ms_conn_t *c,
if ((c->curr_task.item->value_size != vlen)
|| (memcmp(orignval, value, (size_t)vlen) != 0))
{
if ((c->curr_task.item->value_size != vlen)
|| (memcmp(orignval, value, (size_t)vlen) != 0))
{
- atomic_add_
64
(&ms_stats.vef_failed, 1);
+ atomic_add_
size
(&ms_stats.vef_failed, 1);
if (ms_setting.verbose)
{
if (ms_setting.verbose)
{
@@
-2254,7
+2264,7
@@
static int ms_transmit(ms_conn_t *c)
res= sendmsg(c->sfd, m, 0);
if (res > 0)
{
res= sendmsg(c->sfd, m, 0);
if (res > 0)
{
- atomic_add_
64
(&ms_stats.bytes_written, res);
+ atomic_add_
size
(&ms_stats.bytes_written, res);
/* We've written some of the data. Remove the completed
* iovec entries from the list of pending writes. */
/* We've written some of the data. Remove the completed
* iovec entries from the list of pending writes. */
@@
-2997,9
+3007,9
@@
int ms_mcd_set(ms_conn_t *c, ms_task_item_t *item)
}
}
}
}
- atomic_add_
64
(&ms_stats.obj_bytes,
- item->key_size + item->value_size);
- atomic_add_
64
(&ms_stats.cmd_set, 1);
+ atomic_add_
size
(&ms_stats.obj_bytes,
+
item->key_size + item->value_size);
+ atomic_add_
size
(&ms_stats.cmd_set, 1);
return 0;
} /* ms_mcd_set */
return 0;
} /* ms_mcd_set */
@@
-3083,7
+3093,7
@@
int ms_mcd_get(ms_conn_t *c, ms_task_item_t *item, bool verify)
}
}
}
}
- atomic_add_
64
(&ms_stats.cmd_get, 1);
+ atomic_add_
size
(&ms_stats.cmd_get, 1);
return 0;
} /* ms_mcd_get */
return 0;
} /* ms_mcd_get */
@@
-3182,7
+3192,7
@@
int ms_mcd_mlget(ms_conn_t *c)
for (int i= 0; i < c->mlget_task.mlget_num; i++)
{
item= c->mlget_task.mlget_item[i].item;
for (int i= 0; i < c->mlget_task.mlget_num; i++)
{
item= c->mlget_task.mlget_item[i].item;
- atomic_add_
64
(&ms_stats.cmd_get, 1);
+ atomic_add_
size
(&ms_stats.cmd_get, 1);
}
return 0;
}
return 0;