From: Mathieu Desnoyers Date: Tue, 8 Mar 2016 15:30:33 +0000 (-0500) Subject: Fix: format address fields as hexadecimal X-Git-Tag: v2.7.2~3 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=95a5790ea89d5cd9815ad811cfa17c957afcd6e2;p=lttng-modules.git Fix: format address fields as hexadecimal Fixes #947 Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h index 65dabde9..f0c7381b 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h @@ -147,7 +147,7 @@ LTTNG_TRACEPOINT_EVENT_MAP( TP_ARGS(sptep, gfn, access, gen), TP_FIELDS( - ctf_integer(void *, sptep, sptep) + ctf_integer_hex(void *, sptep, sptep) ctf_integer(gfn_t, gfn, gfn) ctf_integer(unsigned, access, access) ctf_integer(unsigned int, gen, gen) @@ -165,7 +165,7 @@ LTTNG_TRACEPOINT_EVENT_MAP( TP_ARGS(sptep, gfn, access), TP_FIELDS( - ctf_integer(void *, sptep, sptep) + ctf_integer_hex(void *, sptep, sptep) ctf_integer(gfn_t, gfn, gfn) ctf_integer(unsigned, access, access) ) @@ -201,7 +201,7 @@ LTTNG_TRACEPOINT_EVENT_MAP( ctf_integer(int, vcpu_id, vcpu->vcpu_id) ctf_integer(gva_t, gva, gva) ctf_integer(u32, error_code, error_code) - ctf_integer(u64 *, sptep, sptep) + ctf_integer_hex(u64 *, sptep, sptep) ctf_integer(u64, old_spte, old_spte) ctf_integer(u64, new_spte, *sptep) ctf_integer(bool, retry, retry) diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h index 11b501a2..54b3099b 100644 --- a/instrumentation/events/lttng-module/btrfs.h +++ b/instrumentation/events/lttng-module/btrfs.h @@ -499,7 +499,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_state, TP_ARGS(state, mask, IP), TP_FIELDS( - ctf_integer(struct extent_state *, state, state) + ctf_integer_hex(struct extent_state *, state, state) ctf_integer(gfp_t, mask, mask) ctf_integer(unsigned long, ip, IP) ) @@ -514,7 +514,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(free_extent_state, TP_ARGS(state, IP), TP_FIELDS( - ctf_integer(struct extent_state *, state, state) + ctf_integer_hex(struct extent_state *, state, state) ctf_integer(unsigned long, ip, IP) ) ) diff --git a/instrumentation/events/lttng-module/lock.h b/instrumentation/events/lttng-module/lock.h index 3e5d68a5..14d6a1ea 100644 --- a/instrumentation/events/lttng-module/lock.h +++ b/instrumentation/events/lttng-module/lock.h @@ -31,7 +31,7 @@ LTTNG_TRACEPOINT_EVENT(lock_acquire, ctf_integer(unsigned int, flags, (trylock ? 1 : 0) | (read ? 2 : 0)) ctf_string(name, lock->name) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - ctf_integer(void *, lockdep_addr, lock) + ctf_integer_hex(void *, lockdep_addr, lock) #endif ) ) @@ -46,7 +46,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(lock, TP_FIELDS( ctf_string(name, lock->name) - ctf_integer(void *, lockdep_addr, lock) + ctf_integer_hex(void *, lockdep_addr, lock) ) ) @@ -86,7 +86,7 @@ LTTNG_TRACEPOINT_EVENT(lock_release, TP_FIELDS( ctf_string(name, lock->name) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - ctf_integer(void *, lockdep_addr, lock) + ctf_integer_hex(void *, lockdep_addr, lock) #endif ) ) @@ -102,7 +102,7 @@ LTTNG_TRACEPOINT_EVENT(lock_contended, TP_FIELDS( ctf_string(name, lock->name) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - ctf_integer(void *, lockdep_addr, lock) + ctf_integer_hex(void *, lockdep_addr, lock) #endif ) ) @@ -117,7 +117,7 @@ LTTNG_TRACEPOINT_EVENT(lock_acquired, ctf_string(name, lock->name) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) ctf_integer(s64, wait_nsec, wait_nsec) - ctf_integer(void *, lockdep_addr, lock) + ctf_integer_hex(void *, lockdep_addr, lock) #else ctf_integer(unsigned long, wait_usec, (unsigned long) waittime) ctf_integer(unsigned long, wait_nsec_rem, do_div(waittime, NSEC_PER_USEC)) diff --git a/instrumentation/events/lttng-module/mm_vmscan.h b/instrumentation/events/lttng-module/mm_vmscan.h index d9eac540..339e6fb7 100644 --- a/instrumentation/events/lttng-module/mm_vmscan.h +++ b/instrumentation/events/lttng-module/mm_vmscan.h @@ -159,11 +159,11 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start, cache_items, delta, total_scan), TP_FIELDS( - ctf_integer(struct shrinker *, shr, shr) + ctf_integer_hex(struct shrinker *, shr, shr) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) - ctf_integer(void *, shrink, shr->scan_objects) + ctf_integer_hex(void *, shrink, shr->scan_objects) #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ - ctf_integer(void *, shrink, shr->shrink) + ctf_integer_hex(void *, shrink, shr->shrink) #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ ctf_integer(long, nr_objects_to_shrink, nr_objects_to_shrink) ctf_integer(gfp_t, gfp_flags, sc->gfp_mask) @@ -187,9 +187,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, total_scan), TP_FIELDS( - ctf_integer(struct shrinker *, shr, shr) + ctf_integer_hex(struct shrinker *, shr, shr) ctf_integer(int, nid, nid) - ctf_integer(void *, shrink, shr->scan_objects) + ctf_integer_hex(void *, shrink, shr->scan_objects) ctf_integer(long, unused_scan, unused_scan_cnt) ctf_integer(long, new_scan, new_scan_cnt) ctf_integer(int, retval, shrinker_retval) @@ -207,11 +207,11 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, TP_ARGS(shr, shrinker_retval, unused_scan_cnt, new_scan_cnt), TP_FIELDS( - ctf_integer(struct shrinker *, shr, shr) + ctf_integer_hex(struct shrinker *, shr, shr) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) - ctf_integer(void *, shrink, shr->scan_objects) + ctf_integer_hex(void *, shrink, shr->scan_objects) #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ - ctf_integer(void *, shrink, shr->shrink) + ctf_integer_hex(void *, shrink, shr->shrink) #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ ctf_integer(long, unused_scan, unused_scan_cnt) ctf_integer(long, new_scan, new_scan_cnt) @@ -341,7 +341,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, TP_ARGS(page), TP_FIELDS( - ctf_integer(struct page *, page, page) + ctf_integer_hex(struct page *, page, page) ctf_integer(int, reclaim_flags, trace_reclaim_flags(page)) ) ) @@ -354,7 +354,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, TP_ARGS(page, reclaim_flags), TP_FIELDS( - ctf_integer(struct page *, page, page) + ctf_integer_hex(struct page *, page, page) ctf_integer(int, reclaim_flags, reclaim_flags) ) ) @@ -409,9 +409,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(replace_swap_token, TP_ARGS(old_mm, new_mm), TP_FIELDS( - ctf_integer(struct mm_struct *, old_mm, old_mm) + ctf_integer_hex(struct mm_struct *, old_mm, old_mm) ctf_integer(unsigned int, old_prio, old_mm ? old_mm->token_priority : 0) - ctf_integer(struct mm_struct *, new_mm, new_mm) + ctf_integer_hex(struct mm_struct *, new_mm, new_mm) ctf_integer(unsigned int, new_prio, new_mm->token_priority) ) ) @@ -422,7 +422,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_put_swap_token_template, TP_ARGS(swap_token_mm), TP_FIELDS( - ctf_integer(struct mm_struct*, swap_token_mm, swap_token_mm) + ctf_integer_hex(struct mm_struct*, swap_token_mm, swap_token_mm) ) ) @@ -453,10 +453,10 @@ LTTNG_TRACEPOINT_EVENT_MAP(update_swap_token_priority, TP_ARGS(mm, old_prio, swap_token_mm), TP_FIELDS( - ctf_integer(struct mm_struct*, mm, mm) + ctf_integer_hex(struct mm_struct *, mm, mm) ctf_integer(unsigned int, old_prio, old_prio) ctf_integer(unsigned int, new_prio, mm->token_priority) - ctf_integer(struct mm_struct*, swap_token_mm, swap_token_mm) + ctf_integer_hex(struct mm_struct *, swap_token_mm, swap_token_mm) ctf_integer(unsigned int, swap_token_prio, swap_token_mm ? swap_token_mm->token_priority : 0) ) ) diff --git a/instrumentation/events/lttng-module/napi.h b/instrumentation/events/lttng-module/napi.h index 20e0d61d..e6dc225d 100644 --- a/instrumentation/events/lttng-module/napi.h +++ b/instrumentation/events/lttng-module/napi.h @@ -17,7 +17,7 @@ LTTNG_TRACEPOINT_EVENT(napi_poll, TP_ARGS(napi), TP_FIELDS( - ctf_integer(struct napi_struct *, napi, napi) + ctf_integer_hex(struct napi_struct *, napi, napi) ctf_string(dev_name, napi->dev ? napi->dev->name : NO_DEV) ) ) diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h index 01314ed5..001175b0 100644 --- a/instrumentation/events/lttng-module/net.h +++ b/instrumentation/events/lttng-module/net.h @@ -27,7 +27,7 @@ LTTNG_TRACEPOINT_EVENT(net_dev_xmit, #endif TP_FIELDS( - ctf_integer(void *, skbaddr, skb) + ctf_integer_hex(void *, skbaddr, skb) ctf_integer(int, rc, rc) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40)) ctf_integer(unsigned int, len, skb_len) @@ -46,7 +46,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_template, TP_ARGS(skb), TP_FIELDS( - ctf_integer(void *, skbaddr, skb) + ctf_integer_hex(void *, skbaddr, skb) ctf_integer(unsigned int, len, skb->len) ctf_string(name, skb->dev->name) ) diff --git a/instrumentation/events/lttng-module/rcu.h b/instrumentation/events/lttng-module/rcu.h index 062dd14b..edece667 100644 --- a/instrumentation/events/lttng-module/rcu.h +++ b/instrumentation/events/lttng-module/rcu.h @@ -312,8 +312,8 @@ LTTNG_TRACEPOINT_EVENT(rcu_callback, TP_FIELDS( ctf_string(rcuname, rcuname) - ctf_integer(void *, rhp, rhp) - ctf_integer(void *, func, rhp->func) + ctf_integer_hex(void *, rhp, rhp) + ctf_integer_hex(void *, func, rhp->func) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) ctf_integer(long, qlen_lazy, qlen_lazy) #endif @@ -351,8 +351,8 @@ LTTNG_TRACEPOINT_EVENT(rcu_kfree_callback, TP_FIELDS( ctf_string(rcuname, rcuname) - ctf_integer(void *, rhp, rhp) - ctf_integer(unsigned long, offset, offset) + ctf_integer_hex(void *, rhp, rhp) + ctf_integer_hex(unsigned long, offset, offset) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) ctf_integer(long, qlen_lazy, qlen_lazy) #endif @@ -418,8 +418,8 @@ LTTNG_TRACEPOINT_EVENT(rcu_invoke_callback, TP_FIELDS( ctf_string(rcuname, rcuname) - ctf_integer(void *, rhp, rhp) - ctf_integer(void *, func, rhp->func) + ctf_integer_hex(void *, rhp, rhp) + ctf_integer_hex(void *, func, rhp->func) ) ) @@ -442,7 +442,7 @@ LTTNG_TRACEPOINT_EVENT(rcu_invoke_kfree_callback, TP_FIELDS( ctf_string(rcuname, rcuname) - ctf_integer(void *, rhp, rhp) + ctf_integer_hex(void *, rhp, rhp) ctf_integer(unsigned long, offset, offset) ) ) @@ -524,7 +524,7 @@ LTTNG_TRACEPOINT_EVENT(rcu_torture_read, TP_FIELDS( ctf_string(rcutorturename, rcutorturename) - ctf_integer(struct rcu_head *, rhp, rhp) + ctf_integer_hex(struct rcu_head *, rhp, rhp) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) ctf_integer(unsigned long, secs, secs) ctf_integer(unsigned long, c_old, c_old) diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h index a208b5af..fd2c4566 100644 --- a/instrumentation/events/lttng-module/rpc.h +++ b/instrumentation/events/lttng-module/rpc.h @@ -15,8 +15,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, TP_ARGS(task), TP_FIELDS( - ctf_integer(const struct rpc_task *, task, task) - ctf_integer(const struct rpc_clnt *, clnt, task->tk_client) + ctf_integer_hex(const struct rpc_task *, task, task) + ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client) ctf_integer(int, status, task->tk_status) ) ) @@ -39,8 +39,8 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, TP_ARGS(task, status), TP_FIELDS( - ctf_integer(const struct rpc_task *, task, task) - ctf_integer(const struct rpc_clnt *, clnt, task->tk_client) + ctf_integer_hex(const struct rpc_task *, task, task) + ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client) ctf_integer(int, status, status) ) ) @@ -52,9 +52,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, TP_ARGS(clnt, task, action), TP_FIELDS( - ctf_integer(const struct rpc_clnt *, clnt, clnt) - ctf_integer(const struct rpc_task *, task, task) - ctf_integer(const void *, action, action) + ctf_integer_hex(const struct rpc_clnt *, clnt, clnt) + ctf_integer_hex(const struct rpc_task *, task, task) + ctf_integer_hex(const void *, action, action) ctf_integer(unsigned long, runstate, task->tk_runstate) ctf_integer(int, status, task->tk_status) ctf_integer(unsigned short, flags, task->tk_flags) @@ -92,8 +92,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, TP_ARGS(clnt, task, q), TP_FIELDS( - ctf_integer(const struct rpc_clnt *, clnt, clnt) - ctf_integer(const struct rpc_task *, task, task) + ctf_integer_hex(const struct rpc_clnt *, clnt, clnt) + ctf_integer_hex(const struct rpc_task *, task, task) ctf_integer(unsigned long, timeout, task->tk_timeout) ctf_integer(unsigned long, runstate, task->tk_runstate) ctf_integer(int, status, task->tk_status) diff --git a/instrumentation/events/lttng-module/skb.h b/instrumentation/events/lttng-module/skb.h index 2079580a..e29411f8 100644 --- a/instrumentation/events/lttng-module/skb.h +++ b/instrumentation/events/lttng-module/skb.h @@ -21,8 +21,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb, TP_ARGS(skb, location), TP_FIELDS( - ctf_integer(void *, skbaddr, skb) - ctf_integer(void *, location, location) + ctf_integer_hex(void *, skbaddr, skb) + ctf_integer_hex(void *, location, location) ctf_integer_network(unsigned short, protocol, skb->protocol) ) ) @@ -37,7 +37,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(consume_skb, TP_ARGS(skb), TP_FIELDS( - ctf_integer(void *, skbaddr, skb) + ctf_integer_hex(void *, skbaddr, skb) ) ) #endif @@ -50,7 +50,7 @@ LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec, TP_ARGS(skb, len), TP_FIELDS( - ctf_integer(const void *, skbaddr, skb) + ctf_integer_hex(const void *, skbaddr, skb) ctf_integer(int, len, len) ) ) diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h index 8a813ebf..e7ff8e6f 100644 --- a/instrumentation/events/lttng-module/timer.h +++ b/instrumentation/events/lttng-module/timer.h @@ -23,7 +23,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(timer_class, TP_ARGS(timer), TP_FIELDS( - ctf_integer(void *, timer, timer) + ctf_integer_hex(void *, timer, timer) ) ) @@ -53,8 +53,8 @@ LTTNG_TRACEPOINT_EVENT(timer_start, TP_ARGS(timer, expires, flags), TP_FIELDS( - ctf_integer(void *, timer, timer) - ctf_integer(void *, function, timer->function) + ctf_integer_hex(void *, timer, timer) + ctf_integer_hex(void *, function, timer->function) ctf_integer(unsigned long, expires, expires) ctf_integer(unsigned long, now, jiffies) ctf_integer(unsigned int, flags, flags) @@ -73,8 +73,8 @@ LTTNG_TRACEPOINT_EVENT(timer_start, TP_ARGS(timer, expires), TP_FIELDS( - ctf_integer(void *, timer, timer) - ctf_integer(void *, function, timer->function) + ctf_integer_hex(void *, timer, timer) + ctf_integer_hex(void *, function, timer->function) ctf_integer(unsigned long, expires, expires) ctf_integer(unsigned long, now, jiffies) ) @@ -94,9 +94,9 @@ LTTNG_TRACEPOINT_EVENT(timer_expire_entry, TP_ARGS(timer), TP_FIELDS( - ctf_integer(void *, timer, timer) + ctf_integer_hex(void *, timer, timer) ctf_integer(unsigned long, now, jiffies) - ctf_integer(void *, function, timer->function) + ctf_integer_hex(void *, function, timer->function) ) ) @@ -144,7 +144,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_init, TP_ARGS(hrtimer, clockid, mode), TP_FIELDS( - ctf_integer(void *, hrtimer, hrtimer) + ctf_integer_hex(void *, hrtimer, hrtimer) ctf_integer(clockid_t, clockid, clockid) ctf_integer(enum hrtimer_mode, mode, mode) ) @@ -163,8 +163,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start, TP_ARGS(hrtimer), TP_FIELDS( - ctf_integer(void *, hrtimer, hrtimer) - ctf_integer(void *, function, hrtimer->function) + ctf_integer_hex(void *, hrtimer, hrtimer) + ctf_integer_hex(void *, function, hrtimer->function) ctf_integer(s64, expires, hrtimer_get_expires(hrtimer).tv64) ctf_integer(s64, softexpires, hrtimer_get_softexpires(hrtimer).tv64) ) @@ -187,9 +187,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_expire_entry, TP_ARGS(hrtimer, now), TP_FIELDS( - ctf_integer(void *, hrtimer, hrtimer) + ctf_integer_hex(void *, hrtimer, hrtimer) ctf_integer(s64, now, now->tv64) - ctf_integer(void *, function, hrtimer->function) + ctf_integer_hex(void *, function, hrtimer->function) ) ) @@ -200,7 +200,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(timer_hrtimer_class, TP_ARGS(hrtimer), TP_FIELDS( - ctf_integer(void *, hrtimer, hrtimer) + ctf_integer_hex(void *, hrtimer, hrtimer) ) ) diff --git a/instrumentation/events/lttng-module/workqueue.h b/instrumentation/events/lttng-module/workqueue.h index 3cdc7f9b..ed4ee471 100644 --- a/instrumentation/events/lttng-module/workqueue.h +++ b/instrumentation/events/lttng-module/workqueue.h @@ -25,7 +25,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, TP_ARGS(work), TP_FIELDS( - ctf_integer(void *, work, work) + ctf_integer_hex(void *, work, work) ) ) @@ -55,8 +55,8 @@ LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, #endif TP_FIELDS( - ctf_integer(void *, work, work) - ctf_integer(void *, function, work->func) + ctf_integer_hex(void *, work, work) + ctf_integer_hex(void *, function, work->func) ctf_integer(unsigned int, req_cpu, req_cpu) ) ) @@ -90,8 +90,8 @@ LTTNG_TRACEPOINT_EVENT(workqueue_execute_start, TP_ARGS(work), TP_FIELDS( - ctf_integer(void *, work, work) - ctf_integer(void *, function, work->func) + ctf_integer_hex(void *, work, work) + ctf_integer_hex(void *, function, work->func) ) ) @@ -119,7 +119,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue, TP_FIELDS( ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN) ctf_integer(pid_t, thread_pid, wq_thread->pid) - ctf_integer(work_func_t, func, work->func) + ctf_integer_hex(work_func_t, func, work->func) ) )