Skip to contentSkip to conversation

ocfs2: Add current->comm in trace output

PATCH New Sunil Mushran 2 participants 4 messages Feb 12, 2010 – Feb 18, 2010 OCFS2

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ocfs2: Add current->comm in trace output

Add current->comm to the standard mlog() output to help with debugging.

---
 fs/ocfs2/cluster/masklog.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
fs/ocfs2/cluster/masklog.h +3 -3
index b792005..1ef480d 100644
@@ -194,9 +194,9 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits;
  * previous token if args expands to nothing.
  */
 #define __mlog_printk(level, fmt, args...)				\
-	printk(level "(%u,%lu):%s:%d " fmt, task_pid_nr(current),	\
-	       __mlog_cpu_guess, __PRETTY_FUNCTION__, __LINE__ ,	\
-	       ##args)
+	printk(level "(%s,%u,%lu):%s:%d " fmt, current->comm,		\
+	       task_pid_nr(current), __mlog_cpu_guess,			\
+	       __PRETTY_FUNCTION__, __LINE__ , ##args)
 
 #define mlog(mask, fmt, args...) do {					\
 	u64 __m = MLOG_MASK_PREFIX | (mask);				\
Signature · 1 line
1.6.3.3
#1 lore raw

PATCH 1/1 ocfs2: Add current->comm in trace output

Quoted 3 lines · Sunil Mushran

Add current->comm to the standard mlog() output to help with debugging.

Do you have sample output? This could get long, no?

Joel

Signature · 10 lines
"And yet I fight,
 And yet I fight this battle all alone.
 No one to cry to;
 No place to call home."

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127
#2 lore raw

PATCH 1/1 ocfs2: Add current->comm in trace output

Quoted 7 lines · Joel Becker
Quoted 4 lines · Sunil Mushran

Add current->comm to the standard mlog() output to help with debugging.

Do you have sample output? This could get long, no?

It is a bit longer. But it is much more readable.

(thisisalongname,16751,0):ocfs2_dec_holders:788 ENTRY:
(thisisalongname,16751,0):ocfs2_dec_holders:804 EXIT (thisisalongname,16751,0):ocfs2_downconvert_on_unlock:1970 ENTRY:
(thisisalongname,16751,0):ocfs2_downconvert_on_unlock:1993 EXIT (thisisalongname,16751,0):__ocfs2_cluster_unlock:1540 EXIT (thisisalongname,16751,0):ocfs2_inode_unlock:2493 EXIT (thisisalongname,16751,0):ocfs2_readdir:2056 EXIT: 0 (thisisalongname,16751,0):ocfs2_drop_lock:3202 EXIT: 0 (thisisalongname,16751,0):ocfs2_lock_res_free:734 ENTRY:
(thisisalongname,16751,0):ocfs2_lock_res_free:761 EXIT (kjournald2,16039,1):ocfs2_bmap:499 ENTRY:(block = 117) (kjournald2,16039,1):ocfs2_bmap:533 EXIT: 33493 (kjournald2,16039,1):ocfs2_bmap:499 ENTRY:(block = 118) (kjournald2,16039,1):ocfs2_bmap:533 EXIT: 33494 (kjournald2,16039,0):ocfs2_bmap:499 ENTRY:(block = 119) (kjournald2,16039,0):ocfs2_bmap:533 EXIT: 33495

(o2net,16711,0):dlm_mle_release:429 ENTRY:
(o2net,16711,0):__dlm_lookup_lockres:219 ENTRY:O00000000000000001f804400000000 (o2net,16711,0):__dlm_lookup_lockres_full:185 ENTRY:O00000000000000001f804400000000 (o2net,16711,0):__dlm_lookup_lockres:219 ENTRY:O00000000000000001f804400000000 (o2net,16711,0):__dlm_lookup_lockres_full:185 ENTRY:O00000000000000001f804400000000 (o2net,16711,0):__dlm_lookup_lockres:219 ENTRY:O00000000000000001f804400000000 (o2net,16711,0):__dlm_lookup_lockres_full:185 ENTRY:O00000000000000001f804400000000 (o2net,16711,0):dlm_mle_release:429 ENTRY:
(o2net,16711,0):__dlm_lookup_lockres:219 ENTRY:N0000000000000041 (o2net,16711,0):__dlm_lookup_lockres_full:185 ENTRY:N0000000000000041 (o2net,16711,0):__dlm_lookup_lockres:219 ENTRY:N0000000000000041 (o2net,16711,0):__dlm_lookup_lockres_full:185 ENTRY:N0000000000000041 (o2net,16711,0):__dlm_lookup_lockres:219 ENTRY:N0000000000000041 (o2net,16711,0):__dlm_lookup_lockres_full:185 ENTRY:N0000000000000041 (o2net,16711,0):dlm_mle_release:429 ENTRY:

(o2net,10265,1):__dlm_lookup_lockres:219 ENTRY:N0000000000000041 (o2net,10265,1):__dlm_lookup_lockres_full:185 ENTRY:N0000000000000041 (o2net,10265,1):dlm_mle_release:429 ENTRY:
(events/0,14,0):ocfs2_inc_holders:782 EXIT (events/0,14,0):__ocfs2_cluster_lock:1509 EXIT: 0 (events/0,14,0):__ocfs2_cluster_unlock:1531 ENTRY:
(events/0,14,0):ocfs2_dec_holders:788 ENTRY:
(events/0,14,0):ocfs2_dec_holders:804 EXIT (events/0,14,0):ocfs2_downconvert_on_unlock:1970 ENTRY:
(events/0,14,0):ocfs2_downconvert_on_unlock:1993 EXIT (events/0,14,0):__ocfs2_cluster_unlock:1540 EXIT (o2net,10265,1):__dlm_lookup_lockres:219 ENTRY:M00000000000000001f802800000000 (o2net,10265,1):__dlm_lookup_lockres_full:185 ENTRY:M00000000000000001f802800000000 (o2net,10265,1):__dlm_lookup_lockres:219 ENTRY:M00000000000000001f802800000000

(dlm_thread,16883,3):dlm_lockres_calc_usage:146 ENTRY:P000000000000000000000000000000 (dlm_thread,16883,3):__dlm_lockres_calc_usage:118 ENTRY:P000000000000000000000000000000 (dlm_thread,16883,3):dlm_do_local_bast:255 ENTRY:
(dlm_thread,16883,3):ocfs2_blocking_ast:1066 ERROR: BAST fired for lockres P000000000000000000000000000000, blocking 5, level 5, type OrphanScan (dlm_thread,16883,3):ocfs2_generic_handle_bast:921 ENTRY:
(dlm_thread,16883,3):ocfs2_generic_handle_bast:939 ERROR: lockres P000000000000000000000000000000, block 5, level 5, l_block 5, dwn 1 (dlm_thread,16883,3):ocfs2_generic_handle_bast:944 EXIT: 1 (dlm_thread,16883,3):ocfs2_schedule_blocked_lock:4058 ENTRY:
(dlm_thread,16883,3):ocfs2_schedule_blocked_lock:4081 EXIT (ocfs2dc,16882,2):ocfs2_downconvert_thread_do_work:4089 ENTRY:
(ocfs2dc,16882,2):ocfs2_process_blocked_lock:4016 ENTRY:
(ocfs2dc,16882,2):ocfs2_process_blocked_lock:4021 ERROR: lockres P000000000000000000000000000000 blocked (ocfs2dc,16882,2):ocfs2_unblock_lock:3420 ENTRY:
(ocfs2dc,16882,2):ocfs2_prepare_downconvert:3311 ERROR: lockres P000000000000000000000000000000, level 5 => 0, blocking 5

#3 lore raw

PATCH 1/1 ocfs2: Add current->comm in trace output

Quoted 7 lines · Sunil Mushran
Quoted 5 lines · Joel Becker
Quoted 3 lines · Sunil Mushran

Add current->comm to the standard mlog() output to help with debugging.

Do you have sample output? This could get long, no?

Quoted 8 lines

It is a bit longer. But it is much more readable.

(thisisalongname,16751,0):ocfs2_drop_lock:3202 EXIT: 0 (thisisalongname,16751,0):ocfs2_lock_res_free:734 ENTRY:
(thisisalongname,16751,0):ocfs2_lock_res_free:761 EXIT (kjournald2,16039,1):ocfs2_bmap:499 ENTRY:(block = 117) (kjournald2,16039,1):ocfs2_bmap:533 EXIT: 33493 (kjournald2,16039,1):ocfs2_bmap:499 ENTRY:(block = 118)

Yeah, this is nice. It's now in the 'merge-window' branch of
ocfs2.git.

Joel

Signature · 9 lines
Life's Little Instruction Book #452

	"Never compromise your integrity."

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127