Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

SUNRPC: Move the task->tk_bytes_sent and tk_rtt to struct rpc_rqst

Browse Source 
It seems strange to maintain stats for bytes_sent in one structure, and
bytes received in another. Try to assemble all the RPC request-related
stats in struct rpc_rqst

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2010-05-13 12:51:49 -04:00
parent 9c7e7e2337
commit d60dbb20a7
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/sunrpc/sched.h
View File

@ -80,9 +80,7 @@ struct rpc_task {
} u; } u;
unsigned short tk_timeouts; /* maj timeouts */ unsigned short tk_timeouts; /* maj timeouts */
size_t tk_bytes_sent; /* total bytes sent */ ktime_t tk_start; /* RPC task init timestamp */
ktime_t tk_start, /* RPC task init timestamp */
tk_rtt; /* round-trip time */
pid_t tk_owner; /* Process id for batching tasks */ pid_t tk_owner; /* Process id for batching tasks */
unsigned char tk_priority : 2;/* Task priority */ unsigned char tk_priority : 2;/* Task priority */

6
include/linux/sunrpc/xprt.h
View File

@ -66,8 +66,6 @@ struct rpc_rqst {
struct rpc_task * rq_task; /* RPC task data */ struct rpc_task * rq_task; /* RPC task data */
__be32 rq_xid; /* request XID */ __be32 rq_xid; /* request XID */
int rq_cong; /* has incremented xprt->cong */ int rq_cong; /* has incremented xprt->cong */
int rq_reply_bytes_recvd; /* number of reply */
/* bytes received */
u32 rq_seqno; /* gss seq no. used on req. */ u32 rq_seqno; /* gss seq no. used on req. */
int rq_enc_pages_num; int rq_enc_pages_num;
struct page **rq_enc_pages; /* scratch pages for use by struct page **rq_enc_pages; /* scratch pages for use by
@ -78,12 +76,16 @@ struct rpc_rqst {
__u32 * rq_buffer; /* XDR encode buffer */ __u32 * rq_buffer; /* XDR encode buffer */
size_t rq_callsize, size_t rq_callsize,
rq_rcvsize; rq_rcvsize;
size_t rq_xmit_bytes_sent; /* total bytes sent */
size_t rq_reply_bytes_recvd; /* total reply bytes */
/* received */
struct xdr_buf rq_private_buf; /* The receive buffer struct xdr_buf rq_private_buf; /* The receive buffer
* used in the softirq. * used in the softirq.
*/ */
unsigned long rq_majortimeo; /* major timeout alarm */ unsigned long rq_majortimeo; /* major timeout alarm */
unsigned long rq_timeout; /* Current timeout value */ unsigned long rq_timeout; /* Current timeout value */
ktime_t rq_rtt; /* round-trip time */
unsigned int rq_retries; /* # of retries */ unsigned int rq_retries; /* # of retries */
unsigned int rq_connect_cookie; unsigned int rq_connect_cookie;
/* A cookie used to track the /* A cookie used to track the

4
net/sunrpc/stats.c
View File

@ -156,13 +156,13 @@ void rpc_count_iostats(struct rpc_task *task)
op_metrics->om_ntrans += req->rq_ntrans; op_metrics->om_ntrans += req->rq_ntrans;
op_metrics->om_timeouts += task->tk_timeouts; op_metrics->om_timeouts += task->tk_timeouts;
op_metrics->om_bytes_sent += task->tk_bytes_sent; op_metrics->om_bytes_sent += req->rq_xmit_bytes_sent;
op_metrics->om_bytes_recv += req->rq_reply_bytes_recvd; op_metrics->om_bytes_recv += req->rq_reply_bytes_recvd;
delta = ktime_sub(req->rq_xtime, task->tk_start); delta = ktime_sub(req->rq_xtime, task->tk_start);
op_metrics->om_queue = ktime_add(op_metrics->om_queue, delta); op_metrics->om_queue = ktime_add(op_metrics->om_queue, delta);
op_metrics->om_rtt = ktime_add(op_metrics->om_rtt, task->tk_rtt); op_metrics->om_rtt = ktime_add(op_metrics->om_rtt, req->rq_rtt);
delta = ktime_sub(ktime_get(), task->tk_start); delta = ktime_sub(ktime_get(), task->tk_start);
op_metrics->om_execute = ktime_add(op_metrics->om_execute, delta); op_metrics->om_execute = ktime_add(op_metrics->om_execute, delta);

4
net/sunrpc/xprt.c
View File

@ -780,7 +780,7 @@ static void xprt_update_rtt(struct rpc_task *task)
struct rpc_rqst *req = task->tk_rqstp; struct rpc_rqst *req = task->tk_rqstp;
struct rpc_rtt *rtt = task->tk_client->cl_rtt; struct rpc_rtt *rtt = task->tk_client->cl_rtt;
unsigned timer = task->tk_msg.rpc_proc->p_timer; unsigned timer = task->tk_msg.rpc_proc->p_timer;
long m = usecs_to_jiffies(ktime_to_us(task->tk_rtt)); long m = usecs_to_jiffies(ktime_to_us(req->rq_rtt));
if (timer) { if (timer) {
if (req->rq_ntrans == 1) if (req->rq_ntrans == 1)
@ -805,7 +805,7 @@ void xprt_complete_rqst(struct rpc_task *task, int copied)
task->tk_pid, ntohl(req->rq_xid), copied); task->tk_pid, ntohl(req->rq_xid), copied);
xprt->stat.recvs++; xprt->stat.recvs++;
task->tk_rtt = ktime_sub(ktime_get(), req->rq_xtime); req->rq_rtt = ktime_sub(ktime_get(), req->rq_xtime);
if (xprt->ops->timer != NULL) if (xprt->ops->timer != NULL)
xprt_update_rtt(task); xprt_update_rtt(task);

2
net/sunrpc/xprtrdma/transport.c
View File

@ -674,7 +674,7 @@ xprt_rdma_send_request(struct rpc_task *task)
if (rpcrdma_ep_post(&r_xprt->rx_ia, &r_xprt->rx_ep, req)) if (rpcrdma_ep_post(&r_xprt->rx_ia, &r_xprt->rx_ep, req))
goto drop_connection; goto drop_connection;
task->tk_bytes_sent += rqst->rq_snd_buf.len; rqst->rq_xmit_bytes_sent += rqst->rq_snd_buf.len;
rqst->rq_bytes_sent = 0; rqst->rq_bytes_sent = 0;
return 0; return 0;

4
net/sunrpc/xprtsock.c
View File

@ -528,7 +528,7 @@ static int xs_udp_send_request(struct rpc_task *task)
xdr->len - req->rq_bytes_sent, status); xdr->len - req->rq_bytes_sent, status);
if (status >= 0) { if (status >= 0) {
task->tk_bytes_sent += status; req->rq_xmit_bytes_sent += status;
if (status >= req->rq_slen) if (status >= req->rq_slen)
return 0; return 0;
/* Still some bytes left; set up for a retry later. */ /* Still some bytes left; set up for a retry later. */
@ -624,7 +624,7 @@ static int xs_tcp_send_request(struct rpc_task *task)
/* If we've sent the entire packet, immediately /* If we've sent the entire packet, immediately
* reset the count of bytes sent. */ * reset the count of bytes sent. */
req->rq_bytes_sent += status; req->rq_bytes_sent += status;
task->tk_bytes_sent += status; req->rq_xmit_bytes_sent += status;
if (likely(req->rq_bytes_sent >= req->rq_slen)) { if (likely(req->rq_bytes_sent >= req->rq_slen)) {
req->rq_bytes_sent = 0; req->rq_bytes_sent = 0;
return 0; return 0;