diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-05-21 04:42:09 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-05-21 04:42:09 -0400 |
commit | 73787190d04a34e6da745da893b3ae8bedde418f (patch) | |
tree | bc1046eb1864237741898992673f17c577b83929 /tools/perf/builtin-sched.c | |
parent | 6f5e3577d47aeb4ef39683cbf9e201554bc7054d (diff) | |
parent | 1c698186abf5caaea06fda66590f6a0e0a21628d (diff) |
Merge branch 'perf/parse-events-4' of git://github.com/fweisbec/tracing into perf/core
Conflicts:
tools/perf/Makefile
This tree from Frederic unifies the perf and trace-cmd trace event format
parsing code into a single library.
Powertop and other tools will also be able to make use of it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-sched.c')
-rw-r--r-- | tools/perf/builtin-sched.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 1cad3af4bf4c..b125e07eb399 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c | |||
@@ -728,34 +728,34 @@ struct trace_migrate_task_event { | |||
728 | struct trace_sched_handler { | 728 | struct trace_sched_handler { |
729 | void (*switch_event)(struct trace_switch_event *, | 729 | void (*switch_event)(struct trace_switch_event *, |
730 | struct machine *, | 730 | struct machine *, |
731 | struct event *, | 731 | struct event_format *, |
732 | int cpu, | 732 | int cpu, |
733 | u64 timestamp, | 733 | u64 timestamp, |
734 | struct thread *thread); | 734 | struct thread *thread); |
735 | 735 | ||
736 | void (*runtime_event)(struct trace_runtime_event *, | 736 | void (*runtime_event)(struct trace_runtime_event *, |
737 | struct machine *, | 737 | struct machine *, |
738 | struct event *, | 738 | struct event_format *, |
739 | int cpu, | 739 | int cpu, |
740 | u64 timestamp, | 740 | u64 timestamp, |
741 | struct thread *thread); | 741 | struct thread *thread); |
742 | 742 | ||
743 | void (*wakeup_event)(struct trace_wakeup_event *, | 743 | void (*wakeup_event)(struct trace_wakeup_event *, |
744 | struct machine *, | 744 | struct machine *, |
745 | struct event *, | 745 | struct event_format *, |
746 | int cpu, | 746 | int cpu, |
747 | u64 timestamp, | 747 | u64 timestamp, |
748 | struct thread *thread); | 748 | struct thread *thread); |
749 | 749 | ||
750 | void (*fork_event)(struct trace_fork_event *, | 750 | void (*fork_event)(struct trace_fork_event *, |
751 | struct event *, | 751 | struct event_format *, |
752 | int cpu, | 752 | int cpu, |
753 | u64 timestamp, | 753 | u64 timestamp, |
754 | struct thread *thread); | 754 | struct thread *thread); |
755 | 755 | ||
756 | void (*migrate_task_event)(struct trace_migrate_task_event *, | 756 | void (*migrate_task_event)(struct trace_migrate_task_event *, |
757 | struct machine *machine, | 757 | struct machine *machine, |
758 | struct event *, | 758 | struct event_format *, |
759 | int cpu, | 759 | int cpu, |
760 | u64 timestamp, | 760 | u64 timestamp, |
761 | struct thread *thread); | 761 | struct thread *thread); |
@@ -765,7 +765,7 @@ struct trace_sched_handler { | |||
765 | static void | 765 | static void |
766 | replay_wakeup_event(struct trace_wakeup_event *wakeup_event, | 766 | replay_wakeup_event(struct trace_wakeup_event *wakeup_event, |
767 | struct machine *machine __used, | 767 | struct machine *machine __used, |
768 | struct event *event, | 768 | struct event_format *event, |
769 | int cpu __used, | 769 | int cpu __used, |
770 | u64 timestamp __used, | 770 | u64 timestamp __used, |
771 | struct thread *thread __used) | 771 | struct thread *thread __used) |
@@ -792,7 +792,7 @@ static u64 cpu_last_switched[MAX_CPUS]; | |||
792 | static void | 792 | static void |
793 | replay_switch_event(struct trace_switch_event *switch_event, | 793 | replay_switch_event(struct trace_switch_event *switch_event, |
794 | struct machine *machine __used, | 794 | struct machine *machine __used, |
795 | struct event *event, | 795 | struct event_format *event, |
796 | int cpu, | 796 | int cpu, |
797 | u64 timestamp, | 797 | u64 timestamp, |
798 | struct thread *thread __used) | 798 | struct thread *thread __used) |
@@ -835,7 +835,7 @@ replay_switch_event(struct trace_switch_event *switch_event, | |||
835 | 835 | ||
836 | static void | 836 | static void |
837 | replay_fork_event(struct trace_fork_event *fork_event, | 837 | replay_fork_event(struct trace_fork_event *fork_event, |
838 | struct event *event, | 838 | struct event_format *event, |
839 | int cpu __used, | 839 | int cpu __used, |
840 | u64 timestamp __used, | 840 | u64 timestamp __used, |
841 | struct thread *thread __used) | 841 | struct thread *thread __used) |
@@ -944,7 +944,7 @@ static void thread_atoms_insert(struct thread *thread) | |||
944 | 944 | ||
945 | static void | 945 | static void |
946 | latency_fork_event(struct trace_fork_event *fork_event __used, | 946 | latency_fork_event(struct trace_fork_event *fork_event __used, |
947 | struct event *event __used, | 947 | struct event_format *event __used, |
948 | int cpu __used, | 948 | int cpu __used, |
949 | u64 timestamp __used, | 949 | u64 timestamp __used, |
950 | struct thread *thread __used) | 950 | struct thread *thread __used) |
@@ -1026,7 +1026,7 @@ add_sched_in_event(struct work_atoms *atoms, u64 timestamp) | |||
1026 | static void | 1026 | static void |
1027 | latency_switch_event(struct trace_switch_event *switch_event, | 1027 | latency_switch_event(struct trace_switch_event *switch_event, |
1028 | struct machine *machine, | 1028 | struct machine *machine, |
1029 | struct event *event __used, | 1029 | struct event_format *event __used, |
1030 | int cpu, | 1030 | int cpu, |
1031 | u64 timestamp, | 1031 | u64 timestamp, |
1032 | struct thread *thread __used) | 1032 | struct thread *thread __used) |
@@ -1079,7 +1079,7 @@ latency_switch_event(struct trace_switch_event *switch_event, | |||
1079 | static void | 1079 | static void |
1080 | latency_runtime_event(struct trace_runtime_event *runtime_event, | 1080 | latency_runtime_event(struct trace_runtime_event *runtime_event, |
1081 | struct machine *machine, | 1081 | struct machine *machine, |
1082 | struct event *event __used, | 1082 | struct event_format *event __used, |
1083 | int cpu, | 1083 | int cpu, |
1084 | u64 timestamp, | 1084 | u64 timestamp, |
1085 | struct thread *this_thread __used) | 1085 | struct thread *this_thread __used) |
@@ -1102,7 +1102,7 @@ latency_runtime_event(struct trace_runtime_event *runtime_event, | |||
1102 | static void | 1102 | static void |
1103 | latency_wakeup_event(struct trace_wakeup_event *wakeup_event, | 1103 | latency_wakeup_event(struct trace_wakeup_event *wakeup_event, |
1104 | struct machine *machine, | 1104 | struct machine *machine, |
1105 | struct event *__event __used, | 1105 | struct event_format *__event __used, |
1106 | int cpu __used, | 1106 | int cpu __used, |
1107 | u64 timestamp, | 1107 | u64 timestamp, |
1108 | struct thread *thread __used) | 1108 | struct thread *thread __used) |
@@ -1150,7 +1150,7 @@ latency_wakeup_event(struct trace_wakeup_event *wakeup_event, | |||
1150 | static void | 1150 | static void |
1151 | latency_migrate_task_event(struct trace_migrate_task_event *migrate_task_event, | 1151 | latency_migrate_task_event(struct trace_migrate_task_event *migrate_task_event, |
1152 | struct machine *machine, | 1152 | struct machine *machine, |
1153 | struct event *__event __used, | 1153 | struct event_format *__event __used, |
1154 | int cpu __used, | 1154 | int cpu __used, |
1155 | u64 timestamp, | 1155 | u64 timestamp, |
1156 | struct thread *thread __used) | 1156 | struct thread *thread __used) |
@@ -1361,7 +1361,7 @@ static struct trace_sched_handler *trace_handler; | |||
1361 | 1361 | ||
1362 | static void | 1362 | static void |
1363 | process_sched_wakeup_event(struct perf_tool *tool __used, | 1363 | process_sched_wakeup_event(struct perf_tool *tool __used, |
1364 | struct event *event, | 1364 | struct event_format *event, |
1365 | struct perf_sample *sample, | 1365 | struct perf_sample *sample, |
1366 | struct machine *machine, | 1366 | struct machine *machine, |
1367 | struct thread *thread) | 1367 | struct thread *thread) |
@@ -1398,7 +1398,7 @@ static char next_shortname2 = '0'; | |||
1398 | static void | 1398 | static void |
1399 | map_switch_event(struct trace_switch_event *switch_event, | 1399 | map_switch_event(struct trace_switch_event *switch_event, |
1400 | struct machine *machine, | 1400 | struct machine *machine, |
1401 | struct event *event __used, | 1401 | struct event_format *event __used, |
1402 | int this_cpu, | 1402 | int this_cpu, |
1403 | u64 timestamp, | 1403 | u64 timestamp, |
1404 | struct thread *thread __used) | 1404 | struct thread *thread __used) |
@@ -1476,7 +1476,7 @@ map_switch_event(struct trace_switch_event *switch_event, | |||
1476 | 1476 | ||
1477 | static void | 1477 | static void |
1478 | process_sched_switch_event(struct perf_tool *tool __used, | 1478 | process_sched_switch_event(struct perf_tool *tool __used, |
1479 | struct event *event, | 1479 | struct event_format *event, |
1480 | struct perf_sample *sample, | 1480 | struct perf_sample *sample, |
1481 | struct machine *machine, | 1481 | struct machine *machine, |
1482 | struct thread *thread) | 1482 | struct thread *thread) |
@@ -1512,7 +1512,7 @@ process_sched_switch_event(struct perf_tool *tool __used, | |||
1512 | 1512 | ||
1513 | static void | 1513 | static void |
1514 | process_sched_runtime_event(struct perf_tool *tool __used, | 1514 | process_sched_runtime_event(struct perf_tool *tool __used, |
1515 | struct event *event, | 1515 | struct event_format *event, |
1516 | struct perf_sample *sample, | 1516 | struct perf_sample *sample, |
1517 | struct machine *machine, | 1517 | struct machine *machine, |
1518 | struct thread *thread) | 1518 | struct thread *thread) |
@@ -1532,7 +1532,7 @@ process_sched_runtime_event(struct perf_tool *tool __used, | |||
1532 | 1532 | ||
1533 | static void | 1533 | static void |
1534 | process_sched_fork_event(struct perf_tool *tool __used, | 1534 | process_sched_fork_event(struct perf_tool *tool __used, |
1535 | struct event *event, | 1535 | struct event_format *event, |
1536 | struct perf_sample *sample, | 1536 | struct perf_sample *sample, |
1537 | struct machine *machine __used, | 1537 | struct machine *machine __used, |
1538 | struct thread *thread) | 1538 | struct thread *thread) |
@@ -1554,7 +1554,7 @@ process_sched_fork_event(struct perf_tool *tool __used, | |||
1554 | 1554 | ||
1555 | static void | 1555 | static void |
1556 | process_sched_exit_event(struct perf_tool *tool __used, | 1556 | process_sched_exit_event(struct perf_tool *tool __used, |
1557 | struct event *event, | 1557 | struct event_format *event, |
1558 | struct perf_sample *sample __used, | 1558 | struct perf_sample *sample __used, |
1559 | struct machine *machine __used, | 1559 | struct machine *machine __used, |
1560 | struct thread *thread __used) | 1560 | struct thread *thread __used) |
@@ -1565,7 +1565,7 @@ process_sched_exit_event(struct perf_tool *tool __used, | |||
1565 | 1565 | ||
1566 | static void | 1566 | static void |
1567 | process_sched_migrate_task_event(struct perf_tool *tool __used, | 1567 | process_sched_migrate_task_event(struct perf_tool *tool __used, |
1568 | struct event *event, | 1568 | struct event_format *event, |
1569 | struct perf_sample *sample, | 1569 | struct perf_sample *sample, |
1570 | struct machine *machine, | 1570 | struct machine *machine, |
1571 | struct thread *thread) | 1571 | struct thread *thread) |
@@ -1586,7 +1586,7 @@ process_sched_migrate_task_event(struct perf_tool *tool __used, | |||
1586 | sample->time, thread); | 1586 | sample->time, thread); |
1587 | } | 1587 | } |
1588 | 1588 | ||
1589 | typedef void (*tracepoint_handler)(struct perf_tool *tool, struct event *event, | 1589 | typedef void (*tracepoint_handler)(struct perf_tool *tool, struct event_format *event, |
1590 | struct perf_sample *sample, | 1590 | struct perf_sample *sample, |
1591 | struct machine *machine, | 1591 | struct machine *machine, |
1592 | struct thread *thread); | 1592 | struct thread *thread); |