Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 229009
b: refs/heads/master
c: e453039
h: refs/heads/master
i:
  229007: bd9ee09
v: v3
  • Loading branch information
Sunil Mushran authored and Joel Becker committed Dec 23, 2010
1 parent ead0b62 commit 29ae58d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3c193b3807e933cf2a16d55a38debbe549195847
refs/heads/master: e453039f8bf44abf82f3ecfb34177e0cb04bce12
15 changes: 15 additions & 0 deletions trunk/fs/ocfs2/cluster/tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,11 @@ static inline void o2net_set_func_stop_time(struct o2net_sock_container *sc)
{
sc->sc_tv_func_stop = ktime_get();
}

static ktime_t o2net_get_func_run_time(struct o2net_sock_container *sc)
{
return ktime_sub(sc->sc_tv_func_stop, sc->sc_tv_func_start);
}
#else /* CONFIG_DEBUG_FS */
# define o2net_init_nst(a, b, c, d, e)
# define o2net_set_nst_sock_time(a)
Expand All @@ -222,6 +227,7 @@ static inline void o2net_set_func_stop_time(struct o2net_sock_container *sc)
# define o2net_set_advance_stop_time(a)
# define o2net_set_func_start_time(a)
# define o2net_set_func_stop_time(a)
# define o2net_get_func_run_time(a) (ktime_t)0
#endif /* CONFIG_DEBUG_FS */

#ifdef CONFIG_OCFS2_FS_STATS
Expand All @@ -240,6 +246,13 @@ static void o2net_update_send_stats(struct o2net_send_tracking *nst,
sc->sc_send_count++;
}

static void o2net_update_recv_stats(struct o2net_sock_container *sc)
{
sc->sc_tv_process_total = ktime_add(sc->sc_tv_process_total,
o2net_get_func_run_time(sc));
sc->sc_recv_count++;
}

#else

# define o2net_update_send_stats(a, b)
Expand Down Expand Up @@ -1238,6 +1251,8 @@ static int o2net_process_message(struct o2net_sock_container *sc,
nmh->nh_func_data, &ret_data);
o2net_set_func_stop_time(sc);

o2net_update_recv_stats(sc);

out_respond:
/* this destroys the hdr, so don't use it after this */
mutex_lock(&sc->sc_send_lock);
Expand Down
2 changes: 2 additions & 0 deletions trunk/fs/ocfs2/cluster/tcp_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ struct o2net_sock_container {
ktime_t sc_tv_send_total;
ktime_t sc_tv_status_total;
u32 sc_send_count;
u32 sc_recv_count;
ktime_t sc_tv_process_total;
#endif
struct mutex sc_send_lock;
};
Expand Down

0 comments on commit 29ae58d

Please sign in to comment.