tracing: use union for multi-usages field
PATCH 1/1 tracing: use union for multi-usages field
Impact: cleanup
cleanup for readability.
struct dyn_ftrace::ip has different usages in his lifecycle, we use union for it. And also for struct dyn_ftrace::flags.
Signed-off-by Lai Jiangshan <[email protected]>
---
include/linux/ftrace.h +9 -3
@@ -145,9 +145,15 @@ enum { };struct dyn_ftrace { -unsigned long ip;/* address of mcount call-site */ -unsigned long flags; -struct dyn_arch_ftrace arch; +union { +unsigned long ip;/* address of mcount call-site */ +struct dyn_ftrace *freelist; + }; +union { +unsigned long flags; +struct dyn_ftrace *newlist; + }; +struct dyn_arch_ftrace arch; };int ftrace_force_update (void );
kernel/trace/ftrace.c +4 -4
@@ -339,7 +339,7 @@ static inline int record_frozen(struct dyn_ftrace *rec)static void ftrace_free_rec (struct dyn_ftrace *rec) { - rec->ip = (unsigned long )ftrace_free_records; + rec->freelist = ftrace_free_records; ftrace_free_records = rec; rec->flags |=FTRACE_FL_FREE ; }
@@ -377,7 +377,7 @@ static struct dyn_ftrace *ftrace_alloc_dyn_node(unsigned long ip)return NULL ; } - ftrace_free_records = (void *)rec->ip; + ftrace_free_records = rec->freelist;memset (rec,0 ,sizeof (*rec));return rec; }
@@ -409,7 +409,7 @@ ftrace_record_ip(unsigned long ip)return NULL ; rec->ip = ip; - rec->flags = (unsigned long )ftrace_new_addrs; + rec->newlist = ftrace_new_addrs; ftrace_new_addrs = rec;return rec;
@@ -729,7 +729,7 @@ static int ftrace_update_code(struct module *mod)return -1 ; p = ftrace_new_addrs; - ftrace_new_addrs = (struct dyn_ftrace *)p->flags; + ftrace_new_addrs = p->newlist; p->flags =0L ;/* convert record (i.e, patch mcount-call with NOP) */
Commit-ID: ee000b7f9fe429d2470c674ccec8d344f6789e0d Gitweb: http://git.kernel.org/tip/ee000b7f9fe429d2470c674ccec8d344f6789e0d Author: Lai Jiangshan <[email protected]> AuthorDate: Tue, 24 Mar 2009 13:38:06 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 24 Mar 2009 16:43:12 +0100
tracing: use union for multi-usages field
Impact: cleanup
struct dyn_ftrace::ip has different usages in his lifecycle, we use union for it. And also for struct dyn_ftrace::flags.
Signed-off-by Lai Jiangshan <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- include/linux/ftrace.h | 12 +++++++++--- kernel/trace/ftrace.c | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-)
include/linux/ftrace.h +9 -3
@@ -145,9 +145,15 @@ enum { };struct dyn_ftrace { -unsigned long ip;/* address of mcount call-site */ -unsigned long flags; -struct dyn_arch_ftrace arch; +union { +unsigned long ip;/* address of mcount call-site */ +struct dyn_ftrace *freelist; + }; +union { +unsigned long flags; +struct dyn_ftrace *newlist; + }; +struct dyn_arch_ftrace arch; };int ftrace_force_update (void );
kernel/trace/ftrace.c +4 -4
@@ -341,7 +341,7 @@ static inline int record_frozen(struct dyn_ftrace *rec)static void ftrace_free_rec (struct dyn_ftrace *rec) { - rec->ip = (unsigned long )ftrace_free_records; + rec->freelist = ftrace_free_records; ftrace_free_records = rec; rec->flags |=FTRACE_FL_FREE ; }
@@ -379,7 +379,7 @@ static struct dyn_ftrace *ftrace_alloc_dyn_node(unsigned long ip)return NULL ; } - ftrace_free_records = (void *)rec->ip; + ftrace_free_records = rec->freelist;memset (rec,0 ,sizeof (*rec));return rec; }
@@ -411,7 +411,7 @@ ftrace_record_ip(unsigned long ip)return NULL ; rec->ip = ip; - rec->flags = (unsigned long )ftrace_new_addrs; + rec->newlist = ftrace_new_addrs; ftrace_new_addrs = rec;return rec;
@@ -731,7 +731,7 @@ static int ftrace_update_code(struct module *mod)return -1 ; p = ftrace_new_addrs; - ftrace_new_addrs = (struct dyn_ftrace *)p->flags; + ftrace_new_addrs = p->newlist; p->flags =0L ;/* convert record (i.e, patch mcount-call with NOP) */