lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, bts: use trace_clock_global() for timestamps

Browse Source 
Rename the bts_struct timestamp field to event.

Use trace_clock_global() for time measurement.

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Markus Metzger <markus.t.metzger@intel.com>
Cc: roland@redhat.com
Cc: eranian@googlemail.com
Cc: oleg@redhat.com
Cc: juan.villacis@intel.com
Cc: ak@linux.jf.intel.com
LKML-Reference: <20090403144553.773216000@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Markus Metzger
2009-04-03 16:43:38 +02:00
committed by Ingo Molnar
parent 38f801129a
commit 15879d0421
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/include/asm/ds.h
View File

@@ -170,9 +170,9 @@ struct bts_struct {
} lbr; } lbr;
/* BTS_TASK_ARRIVES or BTS_TASK_DEPARTS */ /* BTS_TASK_ARRIVES or BTS_TASK_DEPARTS */
struct { struct {
__u64 jiffies; __u64 clock;
pid_t pid; pid_t pid;
} timestamp; } event;
} variant; } variant;
}; };

17
arch/x86/kernel/ds.c
View File

@@ -25,6 +25,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/trace_clock.h>
#include <asm/ds.h> #include <asm/ds.h>
@@ -471,7 +472,7 @@ enum bts_field {
bts_flags, bts_flags,
bts_qual = bts_from, bts_qual = bts_from,
bts_jiffies = bts_to, bts_clock = bts_to,
bts_pid = bts_flags, bts_pid = bts_flags,
bts_qual_mask = (bts_qual_max - 1), bts_qual_mask = (bts_qual_max - 1),
@@ -517,8 +518,8 @@ bts_read(struct bts_tracer *tracer, const void *at, struct bts_struct *out)
memset(out, 0, sizeof(*out)); memset(out, 0, sizeof(*out));
if ((bts_get(at, bts_qual) & ~bts_qual_mask) == bts_escape) { if ((bts_get(at, bts_qual) & ~bts_qual_mask) == bts_escape) {
out->qualifier = (bts_get(at, bts_qual) & bts_qual_mask); out->qualifier = (bts_get(at, bts_qual) & bts_qual_mask);
out->variant.timestamp.jiffies = bts_get(at, bts_jiffies); out->variant.event.clock = bts_get(at, bts_clock);
out->variant.timestamp.pid = bts_get(at, bts_pid); out->variant.event.pid = bts_get(at, bts_pid);
} else { } else {
out->qualifier = bts_branch; out->qualifier = bts_branch;
out->variant.lbr.from = bts_get(at, bts_from); out->variant.lbr.from = bts_get(at, bts_from);
@@ -555,8 +556,8 @@ static int bts_write(struct bts_tracer *tracer, const struct bts_struct *in)
case bts_task_arrives: case bts_task_arrives:
case bts_task_departs: case bts_task_departs:
bts_set(raw, bts_qual, (bts_escape | in->qualifier)); bts_set(raw, bts_qual, (bts_escape | in->qualifier));
bts_set(raw, bts_jiffies, in->variant.timestamp.jiffies); bts_set(raw, bts_clock, in->variant.event.clock);
bts_set(raw, bts_pid, in->variant.timestamp.pid); bts_set(raw, bts_pid, in->variant.event.pid);
break; break;
default: default:
return -EINVAL; return -EINVAL;
@@ -1083,9 +1084,9 @@ static inline void ds_take_timestamp(struct ds_context *context,
return; return;
memset(&ts, 0, sizeof(ts)); memset(&ts, 0, sizeof(ts));
ts.qualifier = qualifier; ts.qualifier = qualifier;
ts.variant.timestamp.jiffies = jiffies_64; ts.variant.event.clock = trace_clock_global();
ts.variant.timestamp.pid = task->pid; ts.variant.event.pid = task->pid;
bts_write(tracer, &ts); bts_write(tracer, &ts);
} }