Impact: make trace_stat files show items with the original order
trace_stat tracer reverse the items, it makes the output
looks a little ugly.
Example, when we read trace_stat/workqueues, we get cpu#7's stat.
at first, and then cpu#6... cpu#0.
Signed-off-by: Lai Jiangshan <[email protected]>
---
diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index f71b85b..c08e7f1 100644
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -125,23 +125,21 @@ static int stat_seq_init(struct tracer_stat_session *session)
INIT_LIST_HEAD(&new_entry->list);
new_entry->stat = stat;
- list_for_each_entry(iter_entry, &session->stat_list, list) {
+ list_for_each_entry_reverse(iter_entry, &session->stat_list,
+ list) {
/* Insertion with a descendent sorting */
- if (ts->stat_cmp(new_entry->stat,
- iter_entry->stat) > 0) {
+ if (ts->stat_cmp(iter_entry->stat,
+ new_entry->stat) >= 0) {
- list_add_tail(&new_entry->list,
- &iter_entry->list);
- break;
-
- /* The current smaller value */
- } else if (list_is_last(&iter_entry->list,
- &session->stat_list)) {
list_add(&new_entry->list, &iter_entry->list);
break;
}
}
+
+ /* The current larger value */
+ if (list_empty(&new_entry->list))
+ list_add(&new_entry->list, &session->stat_list);
}
exit:
mutex_unlock(&session->stat_mutex);
On Wed, Mar 25, 2009 at 04:58:39PM +0800, Lai Jiangshan wrote:
>
> Impact: make trace_stat files show items with the original order
>
> trace_stat tracer reverse the items, it makes the output
> looks a little ugly.
>
> Example, when we read trace_stat/workqueues, we get cpu#7's stat.
> at first, and then cpu#6... cpu#0.
>
> Signed-off-by: Lai Jiangshan <[email protected]>
> ---
> diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
> index f71b85b..c08e7f1 100644
> --- a/kernel/trace/trace_stat.c
> +++ b/kernel/trace/trace_stat.c
> @@ -125,23 +125,21 @@ static int stat_seq_init(struct tracer_stat_session *session)
> INIT_LIST_HEAD(&new_entry->list);
> new_entry->stat = stat;
>
> - list_for_each_entry(iter_entry, &session->stat_list, list) {
> + list_for_each_entry_reverse(iter_entry, &session->stat_list,
> + list) {
>
> /* Insertion with a descendent sorting */
> - if (ts->stat_cmp(new_entry->stat,
> - iter_entry->stat) > 0) {
> + if (ts->stat_cmp(iter_entry->stat,
> + new_entry->stat) >= 0) {
>
> - list_add_tail(&new_entry->list,
> - &iter_entry->list);
> - break;
> -
> - /* The current smaller value */
> - } else if (list_is_last(&iter_entry->list,
> - &session->stat_list)) {
> list_add(&new_entry->list, &iter_entry->list);
> break;
> }
> }
> +
> + /* The current larger value */
> + if (list_empty(&new_entry->list))
> + list_add(&new_entry->list, &session->stat_list);
> }
> exit:
> mutex_unlock(&session->stat_mutex);
>
>
Nice!
Acked-by: Frederic Weisbecker <[email protected]>
On Wed, 2009-03-25 at 16:58 +0800, Lai Jiangshan wrote:
> Impact: make trace_stat files show items with the original order
>
> trace_stat tracer reverse the items, it makes the output
> looks a little ugly.
>
> Example, when we read trace_stat/workqueues, we get cpu#7's stat.
> at first, and then cpu#6... cpu#0.
>
This doesn't reverse the order of the annotated branch profiler, does
it?
-- Steve
> Signed-off-by: Lai Jiangshan <[email protected]>
> ---
> diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
> index f71b85b..c08e7f1 100644
> --- a/kernel/trace/trace_stat.c
> +++ b/kernel/trace/trace_stat.c
> @@ -125,23 +125,21 @@ static int stat_seq_init(struct tracer_stat_session *session)
> INIT_LIST_HEAD(&new_entry->list);
> new_entry->stat = stat;
>
> - list_for_each_entry(iter_entry, &session->stat_list, list) {
> + list_for_each_entry_reverse(iter_entry, &session->stat_list,
> + list) {
>
> /* Insertion with a descendent sorting */
> - if (ts->stat_cmp(new_entry->stat,
> - iter_entry->stat) > 0) {
> + if (ts->stat_cmp(iter_entry->stat,
> + new_entry->stat) >= 0) {
>
> - list_add_tail(&new_entry->list,
> - &iter_entry->list);
> - break;
> -
> - /* The current smaller value */
> - } else if (list_is_last(&iter_entry->list,
> - &session->stat_list)) {
> list_add(&new_entry->list, &iter_entry->list);
> break;
> }
> }
> +
> + /* The current larger value */
> + if (list_empty(&new_entry->list))
> + list_add(&new_entry->list, &session->stat_list);
> }
> exit:
> mutex_unlock(&session->stat_mutex);
>
>
Commit-ID: 220ba351dfa57eca4bec5ce0098a276446a47958
Gitweb: http://git.kernel.org/tip/220ba351dfa57eca4bec5ce0098a276446a47958
Author: Lai Jiangshan <[email protected]>
AuthorDate: Wed, 25 Mar 2009 16:58:39 +0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Wed, 25 Mar 2009 18:32:34 +0100
trace_stat: keep original order
Impact: make trace_stat files show items with the original order
trace_stat tracer reverse the items, it makes the output
looks a little ugly.
Example, when we read trace_stat/workqueues, we get cpu#7's stat.
at first, and then cpu#6... cpu#0.
Signed-off-by: Lai Jiangshan <[email protected]>
Acked-by: Steven Rostedt <[email protected]>
Acked-by: Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/trace/trace_stat.c | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index 8c129dd..acdebd7 100644
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -125,23 +125,21 @@ static int stat_seq_init(struct tracer_stat_session *session)
INIT_LIST_HEAD(&new_entry->list);
new_entry->stat = stat;
- list_for_each_entry(iter_entry, &session->stat_list, list) {
+ list_for_each_entry_reverse(iter_entry, &session->stat_list,
+ list) {
/* Insertion with a descendent sorting */
- if (ts->stat_cmp(new_entry->stat,
- iter_entry->stat) > 0) {
+ if (ts->stat_cmp(iter_entry->stat,
+ new_entry->stat) >= 0) {
- list_add_tail(&new_entry->list,
- &iter_entry->list);
- break;
-
- /* The current smaller value */
- } else if (list_is_last(&iter_entry->list,
- &session->stat_list)) {
list_add(&new_entry->list, &iter_entry->list);
break;
}
}
+
+ /* The current larger value */
+ if (list_empty(&new_entry->list))
+ list_add(&new_entry->list, &session->stat_list);
}
exit:
mutex_unlock(&session->stat_mutex);
Steven Rostedt wrote:
> On Wed, 2009-03-25 at 16:58 +0800, Lai Jiangshan wrote:
>> Impact: make trace_stat files show items with the original order
>>
>> trace_stat tracer reverse the items, it makes the output
>> looks a little ugly.
>>
>> Example, when we read trace_stat/workqueues, we get cpu#7's stat.
>> at first, and then cpu#6... cpu#0.
>>
>
> This doesn't reverse the order of the annotated branch profiler, does
> it?
>
The annotated ftrace_branch_data are orderless. So it's OK
with or without this fix.
(From code, not test) If this fix applied,
__start_annotated_branch_profile is shown at the first, and then
__start_annotated_branch_profile + 1... and
__stop_annotated_branch_profile is shown at the last.
Lai