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

mmiotrace: print header using the read hook.

Browse Source 
Now the header is printed only for `trace_pipe' file.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Pekka Paalanen
2008-05-12 21:21:02 +02:00
committed by Thomas Gleixner
parent 7423d1115f
commit d0a7e8ca5b
1 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
kernel/trace/trace_mmiotrace.c
View File

@@ -12,6 +12,10 @@
#include "trace.h" #include "trace.h"
struct header_iter {
struct pci_dev *dev;
};
static struct trace_array *mmio_trace_array; static struct trace_array *mmio_trace_array;
static void mmio_reset_data(struct trace_array *tr) static void mmio_reset_data(struct trace_array *tr)
@@ -89,17 +93,57 @@ static int mmio_print_pcidev(struct trace_seq *s, const struct pci_dev *dev)
return ret; return ret;
} }
/* XXX: This is not called for trace_pipe file! */ static void destroy_header_iter(struct header_iter *hiter)
static void mmio_print_header(struct trace_iterator *iter)
{ {
if (!hiter)
return;
pci_dev_put(hiter->dev);
kfree(hiter);
}
static void mmio_pipe_open(struct trace_iterator *iter)
{
struct header_iter *hiter;
struct trace_seq *s = &iter->seq; struct trace_seq *s = &iter->seq;
struct pci_dev *dev = NULL;
trace_seq_printf(s, "VERSION 20070824\n"); trace_seq_printf(s, "VERSION 20070824\n");
for_each_pci_dev(dev) hiter = kzalloc(sizeof(*hiter), GFP_KERNEL);
mmio_print_pcidev(s, dev); if (!hiter)
/* XXX: return value? What if header is very long? */ return;
hiter->dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
iter->private = hiter;
}
/* XXX: This is not called when the pipe is closed! */
static void mmio_close(struct trace_iterator *iter)
{
struct header_iter *hiter = iter->private;
destroy_header_iter(hiter);
iter->private = NULL;
}
static ssize_t mmio_read(struct trace_iterator *iter, struct file *filp,
char __user *ubuf, size_t cnt, loff_t *ppos)
{
ssize_t ret;
struct header_iter *hiter = iter->private;
struct trace_seq *s = &iter->seq;
if (!hiter)
return 0;
mmio_print_pcidev(s, hiter->dev);
hiter->dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, hiter->dev);
if (!hiter->dev) {
destroy_header_iter(hiter);
iter->private = NULL;
}
ret = trace_seq_to_user(s, ubuf, cnt);
return (ret == -EBUSY) ? 0 : ret;
} }
static int mmio_print_rw(struct trace_iterator *iter) static int mmio_print_rw(struct trace_iterator *iter)
@@ -190,7 +234,9 @@ static struct tracer mmio_tracer __read_mostly =
.name = "mmiotrace", .name = "mmiotrace",
.init = mmio_trace_init, .init = mmio_trace_init,
.reset = mmio_trace_reset, .reset = mmio_trace_reset,
.open = mmio_print_header, .pipe_open = mmio_pipe_open,
.close = mmio_close,
.read = mmio_read,
.ctrl_update = mmio_trace_ctrl_update, .ctrl_update = mmio_trace_ctrl_update,
.print_line = mmio_print_line, .print_line = mmio_print_line,
}; };