Rename odd event names

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h
index 56cfce5db5c2058d198552fd99b4e2051568694e..6fb0620da0061d0bd26fcb8ddc3ebdd1530545ac 100644 (file)
--- a/instrumentation/events/lttng-module/btrfs.h
+++ b/instrumentation/events/lttng-module/btrfs.h
@@ -799,7 +799,9 @@ DEFINE_EVENT(btrfs__reserved_extent,  btrfs_reserved_extent_free,
 )
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-TRACE_EVENT(find_free_extent,
+TRACE_EVENT_MAP(find_free_extent,
+
+       btrfs_find_free_extent,
 
        TP_PROTO(struct btrfs_root *root, u64 num_bytes, u64 empty_size,
                 u64 data),
@@ -963,7 +965,9 @@ TRACE_EVENT(btrfs_setup_cluster,
 #endif
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-TRACE_EVENT(alloc_extent_state,
+TRACE_EVENT_MAP(alloc_extent_state,
+
+       btrfs_alloc_extent_state,
 
        TP_PROTO(struct extent_state *state, gfp_t mask, unsigned long IP),
 
@@ -985,7 +989,9 @@ TRACE_EVENT(alloc_extent_state,
                  show_gfp_flags(__entry->mask), (void *)__entry->ip)
 )
 
-TRACE_EVENT(free_extent_state,
+TRACE_EVENT_MAP(free_extent_state,
+
+       btrfs_free_extent_state,
 
        TP_PROTO(struct extent_state *state, unsigned long IP),
 

diff --git a/instrumentation/events/lttng-module/jbd.h b/instrumentation/events/lttng-module/jbd.h
index 570bdacf08254741a307b6e4863f8e7d738690ec..f20eef256cf325ce62ba6639801bb7672d567c0b 100644 (file)
--- a/instrumentation/events/lttng-module/jbd.h
+++ b/instrumentation/events/lttng-module/jbd.h
@@ -219,7 +219,10 @@ TRACE_EVENT(jbd_cleanup_journal_tail,
 )
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
-TRACE_EVENT(journal_write_superblock,
+TRACE_EVENT_MAP(journal_write_superblock,
+
+       jbd_journal_write_superblock,
+
        TP_PROTO(journal_t *journal, int write_op),
 
        TP_ARGS(journal, write_op),

diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h
index be2baff10d7fb01d67ec1855b87714b9f53911f3..7607fc0c71b7f78aa6d6546d499e9c66ab83365d 100644 (file)
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -45,7 +45,9 @@ DECLARE_EVENT_CLASS(kmem_alloc,
                show_gfp_flags(__entry->gfp_flags))
 )
 
-DEFINE_EVENT(kmem_alloc, kmalloc,
+DEFINE_EVENT_MAP(kmem_alloc, kmalloc,
+
+       kmem_kmalloc,
 
        TP_PROTO(unsigned long call_site, const void *ptr,
                 size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
@@ -99,7 +101,9 @@ DECLARE_EVENT_CLASS(kmem_alloc_node,
                __entry->node)
 )
 
-DEFINE_EVENT(kmem_alloc_node, kmalloc_node,
+DEFINE_EVENT_MAP(kmem_alloc_node, kmalloc_node,
+
+       kmem_kmalloc_node,
 
        TP_PROTO(unsigned long call_site, const void *ptr,
                 size_t bytes_req, size_t bytes_alloc,
@@ -136,7 +140,9 @@ DECLARE_EVENT_CLASS(kmem_free,
        TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)
 )
 
-DEFINE_EVENT(kmem_free, kfree,
+DEFINE_EVENT_MAP(kmem_free, kfree,
+
+       kmem_kfree,
 
        TP_PROTO(unsigned long call_site, const void *ptr),
 

diff --git a/instrumentation/events/lttng-module/power.h b/instrumentation/events/lttng-module/power.h
index 7eeb87ce1e8eb4e279516ead5672220c01d498b6..f366a63e460ee7f59f26f05d52ef82a654b87871 100644 (file)
--- a/instrumentation/events/lttng-module/power.h
+++ b/instrumentation/events/lttng-module/power.h
@@ -9,7 +9,7 @@
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
-DECLARE_EVENT_CLASS(cpu,
+DECLARE_EVENT_CLASS(power_cpu,
 
        TP_PROTO(unsigned int state, unsigned int cpu_id),
 
@@ -29,7 +29,9 @@ DECLARE_EVENT_CLASS(cpu,
                  (unsigned long)__entry->cpu_id)
 )
 
-DEFINE_EVENT(cpu, cpu_idle,
+DEFINE_EVENT_MAP(power_cpu, cpu_idle,
+
+       power_cpu_idle,
 
        TP_PROTO(unsigned int state, unsigned int cpu_id),
 
@@ -43,14 +45,18 @@ DEFINE_EVENT(cpu, cpu_idle,
 #define PWR_EVENT_EXIT -1
 #endif
 
-DEFINE_EVENT(cpu, cpu_frequency,
+DEFINE_EVENT_MAP(power_cpu, cpu_frequency,
+
+       power_cpu_frequency,
 
        TP_PROTO(unsigned int frequency, unsigned int cpu_id),
 
        TP_ARGS(frequency, cpu_id)
 )
 
-TRACE_EVENT(machine_suspend,
+TRACE_EVENT_MAP(machine_suspend,
+
+       power_machine_suspend,
 
        TP_PROTO(unsigned int state),
 
@@ -69,7 +75,7 @@ TRACE_EVENT(machine_suspend,
 #endif
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
-DECLARE_EVENT_CLASS(wakeup_source,
+DECLARE_EVENT_CLASS(power_wakeup_source,
 
        TP_PROTO(const char *name, unsigned int state),
 
@@ -89,14 +95,18 @@ DECLARE_EVENT_CLASS(wakeup_source,
                (unsigned long)__entry->state)
 )
 
-DEFINE_EVENT(wakeup_source, wakeup_source_activate,
+DEFINE_EVENT_MAP(power_wakeup_source, wakeup_source_activate,
+
+       power_wakeup_source_activate,
 
        TP_PROTO(const char *name, unsigned int state),
 
        TP_ARGS(name, state)
 )
 
-DEFINE_EVENT(wakeup_source, wakeup_source_deactivate,
+DEFINE_EVENT_MAP(power_wakeup_source, wakeup_source_deactivate,
+
+       power_wakeup_source_deactivate,
 
        TP_PROTO(const char *name, unsigned int state),
 
@@ -253,7 +263,7 @@ static inline void trace_power_frequency(u64 type, u64 state, u64 cpuid) {};
  * The clock events are used for clock enable/disable and for
  *  clock rate change
  */
-DECLARE_EVENT_CLASS(clock,
+DECLARE_EVENT_CLASS(power_clock,
 
        TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
 
@@ -275,21 +285,27 @@ DECLARE_EVENT_CLASS(clock,
                (unsigned long)__entry->state, (unsigned long)__entry->cpu_id)
 )
 
-DEFINE_EVENT(clock, clock_enable,
+DEFINE_EVENT_MAP(power_clock, clock_enable,
+
+       power_clock_enable,
 
        TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
 
        TP_ARGS(name, state, cpu_id)
 )
 
-DEFINE_EVENT(clock, clock_disable,
+DEFINE_EVENT_MAP(power_clock, clock_disable,
+
+       power_clock_disable,
 
        TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
 
        TP_ARGS(name, state, cpu_id)
 )
 
-DEFINE_EVENT(clock, clock_set_rate,
+DEFINE_EVENT_MAP(power_clock, clock_set_rate,
+
+       power_clock_set_rate,
 
        TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
 

diff --git a/instrumentation/events/lttng-module/random.h b/instrumentation/events/lttng-module/random.h
index 6ecdd90e7e2dcd4b0a865b50dde032d8afa27ab6..d7bda0df4b7d05281fa7035025c43ce2f71fa7fb 100644 (file)
--- a/instrumentation/events/lttng-module/random.h
+++ b/instrumentation/events/lttng-module/random.h
@@ -28,19 +28,28 @@ DECLARE_EVENT_CLASS(random__mix_pool_bytes,
                  __get_str(pool_name), __entry->bytes, (void *)__entry->IP)
 )
 
-DEFINE_EVENT(random__mix_pool_bytes, mix_pool_bytes,
+DEFINE_EVENT_MAP(random__mix_pool_bytes, mix_pool_bytes,
+
+       random_mix_pool_bytes,
+
        TP_PROTO(const char *pool_name, int bytes, unsigned long IP),
 
        TP_ARGS(pool_name, bytes, IP)
 )
 
-DEFINE_EVENT(random__mix_pool_bytes, mix_pool_bytes_nolock,
+DEFINE_EVENT_MAP(random__mix_pool_bytes, mix_pool_bytes_nolock,
+
+       random_mix_pool_bytes_nolock,
+
        TP_PROTO(const char *pool_name, int bytes, unsigned long IP),
 
        TP_ARGS(pool_name, bytes, IP)
 )
 
-TRACE_EVENT(credit_entropy_bits,
+TRACE_EVENT_MAP(credit_entropy_bits,
+
+       random_credit_entropy_bits,
+
        TP_PROTO(const char *pool_name, int bits, int entropy_count,
                 int entropy_total, unsigned long IP),
 
@@ -68,7 +77,10 @@ TRACE_EVENT(credit_entropy_bits,
                  (void *)__entry->IP)
 )
 
-TRACE_EVENT(get_random_bytes,
+TRACE_EVENT_MAP(get_random_bytes,
+
+       random_get_random_bytes,
+
        TP_PROTO(int nbytes, unsigned long IP),
 
        TP_ARGS(nbytes, IP),
@@ -112,14 +124,20 @@ DECLARE_EVENT_CLASS(random__extract_entropy,
 )
 
 
-DEFINE_EVENT(random__extract_entropy, extract_entropy,
+DEFINE_EVENT_MAP(random__extract_entropy, extract_entropy,
+
+       random_extract_entropy,
+
        TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
                 unsigned long IP),
 
        TP_ARGS(pool_name, nbytes, entropy_count, IP)
 )
 
-DEFINE_EVENT(random__extract_entropy, extract_entropy_user,
+DEFINE_EVENT_MAP(random__extract_entropy, extract_entropy_user,
+
+       random_extract_entropy_user,
+
        TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
                 unsigned long IP),
 

diff --git a/instrumentation/events/lttng-module/skb.h b/instrumentation/events/lttng-module/skb.h
index c8a616067e63136cb2ba40a7ff927832733fd6c3..a257304916c97f215ea188c14b70fce48bc273f4 100644 (file)
--- a/instrumentation/events/lttng-module/skb.h
+++ b/instrumentation/events/lttng-module/skb.h
@@ -12,7 +12,9 @@
 /*
  * Tracepoint for free an sk_buff:
  */
-TRACE_EVENT(kfree_skb,
+TRACE_EVENT_MAP(kfree_skb,
+
+       skb_kfree,
 
        TP_PROTO(struct sk_buff *skb, void *location),
 
@@ -35,7 +37,9 @@ TRACE_EVENT(kfree_skb,
 )
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-TRACE_EVENT(consume_skb,
+TRACE_EVENT_MAP(consume_skb,
+
+       skb_consume,
 
        TP_PROTO(struct sk_buff *skb),
 

diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/vmscan.h
index c137310a96a576cab8667a814817b1ccafd798f3..e7a1074280fb593888b637eefb39936d218a3398 100644 (file)
--- a/instrumentation/events/lttng-module/vmscan.h
+++ b/instrumentation/events/lttng-module/vmscan.h
@@ -485,7 +485,10 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
 #endif
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-TRACE_EVENT(replace_swap_token,
+TRACE_EVENT_MAP(replace_swap_token,
+
+       mm_vmscan_replace_swap_token,
+
        TP_PROTO(struct mm_struct *old_mm,
                 struct mm_struct *new_mm),
 
@@ -510,7 +513,7 @@ TRACE_EVENT(replace_swap_token,
                  __entry->new_mm, __entry->new_prio)
 )
 
-DECLARE_EVENT_CLASS(put_swap_token_template,
+DECLARE_EVENT_CLASS(mm_vmscan_put_swap_token_template,
        TP_PROTO(struct mm_struct *swap_token_mm),
 
        TP_ARGS(swap_token_mm),
@@ -526,18 +529,27 @@ DECLARE_EVENT_CLASS(put_swap_token_template,
        TP_printk("token_mm=%p", __entry->swap_token_mm)
 )
 
-DEFINE_EVENT(put_swap_token_template, put_swap_token,
+DEFINE_EVENT_MAP(put_swap_token_template, put_swap_token,
+
+       mm_vmscan_put_swap_token,
+
        TP_PROTO(struct mm_struct *swap_token_mm),
        TP_ARGS(swap_token_mm)
 )
 
-DEFINE_EVENT_CONDITION(put_swap_token_template, disable_swap_token,
+DEFINE_EVENT_CONDITION_MAP(put_swap_token_template, disable_swap_token,
+
+       mm_vmscan_disable_swap_token,
+
        TP_PROTO(struct mm_struct *swap_token_mm),
        TP_ARGS(swap_token_mm),
        TP_CONDITION(swap_token_mm != NULL)
 )
 
-TRACE_EVENT_CONDITION(update_swap_token_priority,
+TRACE_EVENT_CONDITION_MAP(update_swap_token_priority,
+
+       mm_vmscan_update_swap_token_priority,
+
        TP_PROTO(struct mm_struct *mm,
                 unsigned int old_prio,
                 struct mm_struct *swap_token_mm),

diff --git a/instrumentation/events/lttng-module/writeback.h b/instrumentation/events/lttng-module/writeback.h
index b3d55387c436a8ad7a137a1e0c2c05ac7c4ce089..b0c81d2872cc2221adbfffcb785b731c32ff36c1 100644 (file)
--- a/instrumentation/events/lttng-module/writeback.h
+++ b/instrumentation/events/lttng-module/writeback.h
@@ -163,6 +163,11 @@ DEFINE_EVENT(writeback_class, name, \
        TP_PROTO(struct backing_dev_info *bdi), \
        TP_ARGS(bdi))
 
+#define DEFINE_WRITEBACK_EVENT_MAP(name, map) \
+DEFINE_EVENT_MAP(writeback_class, name, map, \
+       TP_PROTO(struct backing_dev_info *bdi), \
+       TP_ARGS(bdi))
+
 DEFINE_WRITEBACK_EVENT(writeback_nowork)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
 DEFINE_WRITEBACK_EVENT(writeback_wake_background)
@@ -174,10 +179,12 @@ DEFINE_WRITEBACK_EVENT(writeback_bdi_unregister)
 DEFINE_WRITEBACK_EVENT(writeback_thread_start)
 DEFINE_WRITEBACK_EVENT(writeback_thread_stop)
 #if (LTTNG_KERNEL_RANGE(3,1,0, 3,2,0))
-DEFINE_WRITEBACK_EVENT(balance_dirty_start)
-DEFINE_WRITEBACK_EVENT(balance_dirty_wait)
+DEFINE_WRITEBACK_EVENT_MAP(balance_dirty_start, writeback_balance_dirty_start)
+DEFINE_WRITEBACK_EVENT_MAP(balance_dirty_wait, writeback_balance_dirty_wait)
+
+TRACE_EVENT_MAP(balance_dirty_written,
 
-TRACE_EVENT(balance_dirty_written,
+       writeback_balance_dirty_written,
 
        TP_PROTO(struct backing_dev_info *bdi, int written),
 
@@ -200,7 +207,7 @@ TRACE_EVENT(balance_dirty_written,
 )
 #endif
 
-DECLARE_EVENT_CLASS(wbc_class,
+DECLARE_EVENT_CLASS(writeback_wbc_class,
        TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi),
        TP_ARGS(wbc, bdi),
        TP_STRUCT__entry(
@@ -261,19 +268,20 @@ DECLARE_EVENT_CLASS(wbc_class,
                __entry->range_end)
 )
 
-#define DEFINE_WBC_EVENT(name) \
-DEFINE_EVENT(wbc_class, name, \
+#undef DEFINE_WBC_EVENT
+#define DEFINE_WBC_EVENT(name, map) \
+DEFINE_EVENT_MAP(writeback_wbc_class, name, map, \
        TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi), \
        TP_ARGS(wbc, bdi))
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-DEFINE_WBC_EVENT(wbc_writeback_start)
-DEFINE_WBC_EVENT(wbc_writeback_written)
-DEFINE_WBC_EVENT(wbc_writeback_wait)
-DEFINE_WBC_EVENT(wbc_balance_dirty_start)
-DEFINE_WBC_EVENT(wbc_balance_dirty_written)
-DEFINE_WBC_EVENT(wbc_balance_dirty_wait)
+DEFINE_WBC_EVENT(wbc_writeback_start, writeback_wbc_writeback_start)
+DEFINE_WBC_EVENT(wbc_writeback_written, writeback_wbc_writeback_written)
+DEFINE_WBC_EVENT(wbc_writeback_wait, writeback_wbc_writeback_wait)
+DEFINE_WBC_EVENT(wbc_balance_dirty_start, writeback_wbc_balance_dirty_start)
+DEFINE_WBC_EVENT(wbc_balance_dirty_written, writeback_wbc_balance_dirty_written)
+DEFINE_WBC_EVENT(wbc_balance_dirty_wait, writeback_wbc_balance_dirty_wait)
 #endif
-DEFINE_WBC_EVENT(wbc_writepage)
+DEFINE_WBC_EVENT(wbc_writepage, writeback_wbc_writepage)
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
 TRACE_EVENT(writeback_queue_io,
@@ -333,7 +341,9 @@ TRACE_EVENT(writeback_queue_io,
 #endif
 )
 
-TRACE_EVENT(global_dirty_state,
+TRACE_EVENT_MAP(global_dirty_state,
+
+       writeback_global_dirty_state,
 
        TP_PROTO(unsigned long background_thresh,
                 unsigned long dirty_thresh
@@ -384,7 +394,9 @@ TRACE_EVENT(global_dirty_state,
 
 #define KBps(x)                        ((x) << (PAGE_SHIFT - 10))
 
-TRACE_EVENT(bdi_dirty_ratelimit,
+TRACE_EVENT_MAP(bdi_dirty_ratelimit,
+
+       writeback_bdi_dirty_ratelimit,
 
        TP_PROTO(struct backing_dev_info *bdi,
                 unsigned long dirty_rate,
@@ -427,7 +439,9 @@ TRACE_EVENT(bdi_dirty_ratelimit,
        )
 )
 
-TRACE_EVENT(balance_dirty_pages,
+TRACE_EVENT_MAP(balance_dirty_pages,
+
+       writeback_balance_dirty_pages,
 
        TP_PROTO(struct backing_dev_info *bdi,
                 unsigned long thresh,