Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 155180
b: refs/heads/master
c: fb9c818
h: refs/heads/master
v: v3
  • Loading branch information
Anton Blanchard authored and Ingo Molnar committed Jun 30, 2009
1 parent 72c46cb commit 6329178
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d8db1b57d31a6b30ea2f0df318eab50fc92b38d6
refs/heads/master: fb9c818873a788c5c01c9868cc6050df96e2c7df
15 changes: 14 additions & 1 deletion trunk/tools/perf/builtin-report.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ typedef union event_union {
static LIST_HEAD(dsos);
static struct dso *kernel_dso;
static struct dso *vdso;
static struct dso *hypervisor_dso;

static void dsos__add(struct dso *dso)
{
Expand Down Expand Up @@ -202,6 +203,11 @@ static int load_kernel(void)

dsos__add(vdso);

hypervisor_dso = dso__new("[hypervisor]", 0);
if (!hypervisor_dso)
return -1;
dsos__add(hypervisor_dso);

return err;
}

Expand Down Expand Up @@ -640,7 +646,8 @@ sort__sym_print(FILE *fp, struct hist_entry *self)

if (self->sym) {
ret += fprintf(fp, "[%c] %s",
self->dso == kernel_dso ? 'k' : '.', self->sym->name);
self->dso == kernel_dso ? 'k' :
self->dso == hypervisor_dso ? 'h' : '.', self->sym->name);
} else {
ret += fprintf(fp, "%#016llx", (u64)self->ip);
}
Expand Down Expand Up @@ -963,6 +970,9 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
}

switch (context) {
case PERF_CONTEXT_HV:
dso = hypervisor_dso;
break;
case PERF_CONTEXT_KERNEL:
dso = kernel_dso;
break;
Expand Down Expand Up @@ -1275,6 +1285,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
} else {
show = SHOW_HV;
level = 'H';

dso = hypervisor_dso;

dprintf(" ...... dso: [hypervisor]\n");
}

Expand Down

0 comments on commit 6329178

Please sign in to comment.