From 96049fe4f92cc45916f891c420e731383ab6f5ac Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 8 Jun 2022 14:06:06 -0700 Subject: [PATCH] Update tracing with cluster lock changes Signed-off-by: Zach Brown --- kmod/src/scoutfs_trace.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kmod/src/scoutfs_trace.h b/kmod/src/scoutfs_trace.h index 1316418b..072f05b3 100644 --- a/kmod/src/scoutfs_trace.h +++ b/kmod/src/scoutfs_trace.h @@ -1100,6 +1100,7 @@ DECLARE_EVENT_CLASS(scoutfs_lock_class, __field(unsigned char, invalidate_pending) __field(int, mode) __field(int, invalidating_mode) + __field(unsigned int, refcount) __field(unsigned int, waiters_cw) __field(unsigned int, waiters_pr) __field(unsigned int, waiters_ex) @@ -1118,6 +1119,7 @@ DECLARE_EVENT_CLASS(scoutfs_lock_class, __entry->invalidate_pending = lck->invalidate_pending; __entry->mode = lck->mode; __entry->invalidating_mode = lck->invalidating_mode; + __entry->refcount = atomic_read(&lck->refcount); __entry->waiters_pr = lck->waiters[SCOUTFS_LOCK_READ]; __entry->waiters_ex = lck->waiters[SCOUTFS_LOCK_WRITE]; __entry->waiters_cw = lck->waiters[SCOUTFS_LOCK_WRITE_ONLY]; @@ -1125,11 +1127,11 @@ DECLARE_EVENT_CLASS(scoutfs_lock_class, __entry->users_ex = lck->users[SCOUTFS_LOCK_WRITE]; __entry->users_cw = lck->users[SCOUTFS_LOCK_WRITE_ONLY]; ), - TP_printk(SCSBF" start "SK_FMT" end "SK_FMT" mode %u invmd %u reqp %u invp %u refg %llu wris %llu dts %llu waiters: pr %u ex %u cw %u users: pr %u ex %u cw %u", + TP_printk(SCSBF" start "SK_FMT" end "SK_FMT" mode %u invmd %u reqp %u invp %u refg %llu rfcnt %d wris %llu dts %llu waiters: pr %u ex %u cw %u users: pr %u ex %u cw %u", SCSB_TRACE_ARGS, sk_trace_args(start), sk_trace_args(end), __entry->mode, __entry->invalidating_mode, __entry->request_pending, - __entry->invalidate_pending, __entry->refresh_gen, __entry->write_seq, - __entry->dirty_trans_seq, + __entry->invalidate_pending, __entry->refresh_gen, __entry->refcount, + __entry->write_seq, __entry->dirty_trans_seq, __entry->waiters_pr, __entry->waiters_ex, __entry->waiters_cw, __entry->users_pr, __entry->users_ex, __entry->users_cw) );