From c3074e26ae2613ba5a475dbd4ee6ee42991c46af Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Thu, 26 Nov 2009 15:04:31 +0800 Subject: [PATCH] --- yaml --- r: 169791 b: refs/heads/master c: c467307c1a812c3150b27a68c2b2d3397bb40a4f h: refs/heads/master i: 169789: 16d1d8a09f2a44fe64c5b7ee6a1a471091101468 169787: cf27442a1760e50109626f5cff615fa162ac4988 169783: b7cdc558447c13c8537fc9b827659ca004b47bfd 169775: c9dc392f17a4f7e568850f867c9ddb4727447cf9 169759: ddfb5771d89173bfb07cad795fef023c932b70ac 169727: bee6342f96705e69683fca04ab71f30f4b2d8542 v: v3 --- [refs] | 2 +- trunk/include/trace/events/irq.h | 46 +++++++++++++++----------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 05abe20a9475..43c17f22705b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53d0422c2d10808fddb2c30859193bfea164c7e3 +refs/heads/master: c467307c1a812c3150b27a68c2b2d3397bb40a4f diff --git a/trunk/include/trace/events/irq.h b/trunk/include/trace/events/irq.h index dcfcd4407623..0e4cfb694fe7 100644 --- a/trunk/include/trace/events/irq.h +++ b/trunk/include/trace/events/irq.h @@ -82,18 +82,7 @@ TRACE_EVENT(irq_handler_exit, __entry->irq, __entry->ret ? "handled" : "unhandled") ); -/** - * softirq_entry - called immediately before the softirq handler - * @h: pointer to struct softirq_action - * @vec: pointer to first struct softirq_action in softirq_vec array - * - * The @h parameter, contains a pointer to the struct softirq_action - * which has a pointer to the action handler that is called. By subtracting - * the @vec pointer from the @h pointer, we can determine the softirq - * number. Also, when used in combination with the softirq_exit tracepoint - * we can determine the softirq latency. - */ -TRACE_EVENT(softirq_entry, +DECLARE_EVENT_CLASS(softirq, TP_PROTO(struct softirq_action *h, struct softirq_action *vec), @@ -111,6 +100,24 @@ TRACE_EVENT(softirq_entry, show_softirq_name(__entry->vec)) ); +/** + * softirq_entry - called immediately before the softirq handler + * @h: pointer to struct softirq_action + * @vec: pointer to first struct softirq_action in softirq_vec array + * + * The @h parameter, contains a pointer to the struct softirq_action + * which has a pointer to the action handler that is called. By subtracting + * the @vec pointer from the @h pointer, we can determine the softirq + * number. Also, when used in combination with the softirq_exit tracepoint + * we can determine the softirq latency. + */ +DEFINE_EVENT(softirq, softirq_entry, + + TP_PROTO(struct softirq_action *h, struct softirq_action *vec), + + TP_ARGS(h, vec) +); + /** * softirq_exit - called immediately after the softirq handler returns * @h: pointer to struct softirq_action @@ -122,22 +129,11 @@ TRACE_EVENT(softirq_entry, * combination with the softirq_entry tracepoint we can determine the softirq * latency. */ -TRACE_EVENT(softirq_exit, +DEFINE_EVENT(softirq, softirq_exit, TP_PROTO(struct softirq_action *h, struct softirq_action *vec), - TP_ARGS(h, vec), - - TP_STRUCT__entry( - __field( int, vec ) - ), - - TP_fast_assign( - __entry->vec = (int)(h - vec); - ), - - TP_printk("vec=%d [action=%s]", __entry->vec, - show_softirq_name(__entry->vec)) + TP_ARGS(h, vec) ); #endif /* _TRACE_IRQ_H */