From 2c054599f20c4abba83e11221d71056dc15448cf Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Fri, 21 Feb 2020 16:59:33 -0500 Subject: [PATCH] Change integer base to hex for fields representing addresses It seems more expected to show addresses in hexadecimal. I applied this to all fields named "ip" or "addr". I haven't change the `addr` fields in the i2c.h file as I am not aware of what is the convention when displaying I2C addresses. Signed-off-by: Francis Deslauriers Signed-off-by: Mathieu Desnoyers Change-Id: I6ed00b31e319e1d966ab138471248dcf3d2c7315 --- .../events/lttng-module/arch/x86/kvm/mmutrace.h | 6 +++--- .../events/lttng-module/arch/x86/kvm/trace.h | 4 ++-- instrumentation/events/lttng-module/btrfs.h | 8 ++++---- instrumentation/events/lttng-module/ext3.h | 2 +- instrumentation/events/lttng-module/ext4.h | 12 ++++++------ instrumentation/events/lttng-module/kvm.h | 6 +++--- instrumentation/events/lttng-module/module.h | 4 ++-- instrumentation/events/lttng-module/random.h | 10 +++++----- instrumentation/events/lttng-module/rpm.h | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h index dd0c6798..46b46c36 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h @@ -51,7 +51,7 @@ LTTNG_TRACEPOINT_EVENT( TP_ARGS(addr, pferr), TP_FIELDS( - ctf_integer(__u64, addr, addr) + ctf_integer_hex(__u64, addr, addr) ctf_integer(__u32, pferr, pferr) ) ) @@ -65,7 +65,7 @@ LTTNG_TRACEPOINT_EVENT( TP_ARGS(addr, write_fault, user_fault, fetch_fault), TP_FIELDS( - ctf_integer(__u64, addr, addr) + ctf_integer_hex(__u64, addr, addr) ctf_integer(__u32, pferr, (!!write_fault << 1) | (!!user_fault << 2) | (!!fetch_fault << 4)) @@ -208,7 +208,7 @@ LTTNG_TRACEPOINT_EVENT_MAP( TP_ARGS(addr, gfn, access), TP_FIELDS( - ctf_integer(u64, addr, addr) + ctf_integer_hex(u64, addr, addr) ctf_integer(gfn_t, gfn, gfn) ctf_integer(unsigned, access, access) ) diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h index 57ac7f48..73b044aa 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h @@ -173,7 +173,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_page_fault, kvm_x86_page_fault, TP_ARGS(fault_address, error_code), TP_FIELDS( - ctf_integer(unsigned long, fault_address, fault_address) + ctf_integer_hex(unsigned long, fault_address, fault_address) ctf_integer(unsigned int, error_code, error_code) ) ) @@ -363,7 +363,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_invlpga, kvm_x86_invlpga, TP_FIELDS( ctf_integer(__u64, rip, rip) ctf_integer(int, asid, asid) - ctf_integer(__u64, address, address) + ctf_integer_hex(__u64, address, address) ) ) diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h index 7b290085..c30571c0 100644 --- a/instrumentation/events/lttng-module/btrfs.h +++ b/instrumentation/events/lttng-module/btrfs.h @@ -2331,7 +2331,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_state, TP_FIELDS( ctf_integer_hex(const struct extent_state *, state, state) ctf_integer(gfp_t, mask, mask) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ) ) @@ -2345,7 +2345,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(free_extent_state, TP_FIELDS( ctf_integer_hex(const struct extent_state *, state, state) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ) ) #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) @@ -2360,7 +2360,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_state, TP_FIELDS( ctf_integer_hex(struct extent_state *, state, state) ctf_integer(gfp_t, mask, mask) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ) ) @@ -2374,7 +2374,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(free_extent_state, TP_FIELDS( ctf_integer_hex(struct extent_state *, state, state) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ) ) #endif diff --git a/instrumentation/events/lttng-module/ext3.h b/instrumentation/events/lttng-module/ext3.h index 8c0115ac..91abfb94 100644 --- a/instrumentation/events/lttng-module/ext3.h +++ b/instrumentation/events/lttng-module/ext3.h @@ -85,7 +85,7 @@ LTTNG_TRACEPOINT_EVENT(ext3_mark_inode_dirty, TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ) ) diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h index 17809d21..32212b38 100644 --- a/instrumentation/events/lttng-module/ext4.h +++ b/instrumentation/events/lttng-module/ext4.h @@ -106,7 +106,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_mark_inode_dirty, TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ) ) @@ -1265,7 +1265,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_journal_start, TP_FIELDS( ctf_integer(dev_t, dev, sb->s_dev) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ctf_integer(int, blocks, blocks) ctf_integer(int, rsv_blocks, rsv_blocks) ctf_integer(int, revoke_creds, revoke_creds) @@ -1279,7 +1279,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_journal_start_reserved, TP_FIELDS( ctf_integer(dev_t, dev, sb->s_dev) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ctf_integer(int, blocks, blocks) ) ) @@ -1294,7 +1294,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_journal_start, TP_FIELDS( ctf_integer(dev_t, dev, sb->s_dev) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ctf_integer(int, blocks, blocks) ctf_integer(int, rsv_blocks, rsv_blocks) ) @@ -1307,7 +1307,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_journal_start_reserved, TP_FIELDS( ctf_integer(dev_t, dev, sb->s_dev) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ctf_integer(int, blocks, blocks) ) ) @@ -1321,7 +1321,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_journal_start, TP_FIELDS( ctf_integer(dev_t, dev, sb->s_dev) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ctf_integer(int, nblocks, nblocks) ) ) diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h index 4868d894..8ac6bc94 100644 --- a/instrumentation/events/lttng-module/kvm.h +++ b/instrumentation/events/lttng-module/kvm.h @@ -56,7 +56,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_msi_set_irq, TP_ARGS(address, data), TP_FIELDS( - ctf_integer(__u64, address, address) + ctf_integer_hex(__u64, address, address) ctf_integer(__u64, data, data) ) ) @@ -245,7 +245,7 @@ LTTNG_TRACEPOINT_EVENT( TP_ARGS(address, gva), TP_FIELDS( - ctf_integer(unsigned long, address, address) + ctf_integer_hex(unsigned long, address, address) ctf_integer(u64, gva, gva) ) ) @@ -258,7 +258,7 @@ LTTNG_TRACEPOINT_EVENT( TP_ARGS(address, page, gva), TP_FIELDS( - ctf_integer(unsigned long, address, address) + ctf_integer_hex(unsigned long, address, address) ctf_integer(pfn_t, pfn, page ? page_to_pfn(page) : 0) ctf_integer(u64, gva, gva) ) diff --git a/instrumentation/events/lttng-module/module.h b/instrumentation/events/lttng-module/module.h index 89b1e798..ed1e3a3b 100644 --- a/instrumentation/events/lttng-module/module.h +++ b/instrumentation/events/lttng-module/module.h @@ -59,7 +59,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt, TP_ARGS(mod, ip), TP_FIELDS( - ctf_integer(unsigned long, ip, ip) + ctf_integer_hex(unsigned long, ip, ip) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)) ctf_integer(int, refcnt, atomic_read(&mod->refcnt)) #else @@ -91,7 +91,7 @@ LTTNG_TRACEPOINT_EVENT(module_request, TP_ARGS(name, wait, ip), TP_FIELDS( - ctf_integer(unsigned long, ip, ip) + ctf_integer_hex(unsigned long, ip, ip) ctf_integer(bool, wait, wait) ctf_string(name, name) ) diff --git a/instrumentation/events/lttng-module/random.h b/instrumentation/events/lttng-module/random.h index 80b22796..eaea2973 100644 --- a/instrumentation/events/lttng-module/random.h +++ b/instrumentation/events/lttng-module/random.h @@ -16,7 +16,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(random__mix_pool_bytes, TP_FIELDS( ctf_string(pool_name, pool_name) ctf_integer(int, bytes, bytes) - ctf_integer(unsigned long, IP, IP) + ctf_integer_hex(unsigned long, IP, IP) ) ) @@ -52,7 +52,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits, ctf_string(pool_name, pool_name) ctf_integer(int, bits, bits) ctf_integer(int, entropy_count, entropy_count) - ctf_integer(unsigned long, IP, IP) + ctf_integer_hex(unsigned long, IP, IP) ) ) #else @@ -70,7 +70,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits, ctf_integer(int, bits, bits) ctf_integer(int, entropy_count, entropy_count) ctf_integer(int, entropy_total, entropy_total) - ctf_integer(unsigned long, IP, IP) + ctf_integer_hex(unsigned long, IP, IP) ) ) #endif @@ -85,7 +85,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(get_random_bytes, TP_FIELDS( ctf_integer(int, nbytes, nbytes) - ctf_integer(unsigned long, IP, IP) + ctf_integer_hex(unsigned long, IP, IP) ) ) @@ -99,7 +99,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(random__extract_entropy, ctf_string(pool_name, pool_name) ctf_integer(int, nbytes, nbytes) ctf_integer(int, entropy_count, entropy_count) - ctf_integer(unsigned long, IP, IP) + ctf_integer_hex(unsigned long, IP, IP) ) ) diff --git a/instrumentation/events/lttng-module/rpm.h b/instrumentation/events/lttng-module/rpm.h index 5fcc456b..c3681cb7 100644 --- a/instrumentation/events/lttng-module/rpm.h +++ b/instrumentation/events/lttng-module/rpm.h @@ -62,7 +62,7 @@ LTTNG_TRACEPOINT_EVENT(rpm_return_int, TP_FIELDS( ctf_string(name, dev_name(dev)) - ctf_integer(unsigned long, ip, ip) + ctf_integer_hex(unsigned long, ip, ip) ctf_integer(int, ret, ret) ) ) -- 2.34.1