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

kmemtrace: small cleanups

Browse Source 
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
LKML-Reference: <161be9ca8a27b432c4a6ab79f47788c4521652ae.1237813499.git.eduard.munteanu@linux360.ro>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-03-23 16:14:13 +01:00
parent 42af9054c0
commit c826e3cd0c
1 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/trace/kmemtrace.c
View File

@@ -6,15 +6,16 @@
* Copyright (C) 2008 Frederic Weisbecker <fweisbec@gmail.com> * Copyright (C) 2008 Frederic Weisbecker <fweisbec@gmail.com>
*/ */
#include <linux/dcache.h>
#include <linux/debugfs.h>
#include <linux/fs.h>
#include <linux/seq_file.h>
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
#include <linux/seq_file.h>
#include <linux/debugfs.h>
#include <linux/dcache.h>
#include <linux/fs.h>
#include <trace/kmemtrace.h> #include <trace/kmemtrace.h>
#include "trace.h"
#include "trace_output.h" #include "trace_output.h"
#include "trace.h"
/* Select an alternative, minimalistic output than the original one */ /* Select an alternative, minimalistic output than the original one */
#define TRACE_KMEM_OPT_MINIMAL 0x1 #define TRACE_KMEM_OPT_MINIMAL 0x1
@@ -41,13 +42,14 @@ static inline void kmemtrace_alloc(enum kmemtrace_type_id type_id,
gfp_t gfp_flags, gfp_t gfp_flags,
int node) int node)
{ {
struct ring_buffer_event *event;
struct kmemtrace_alloc_entry *entry;
struct trace_array *tr = kmemtrace_array; struct trace_array *tr = kmemtrace_array;
struct kmemtrace_alloc_entry *entry;
struct ring_buffer_event *event;
event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry)); event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
if (!event) if (!event)
return; return;
entry = ring_buffer_event_data(event); entry = ring_buffer_event_data(event);
tracing_generic_entry_update(&entry->ent, 0, 0); tracing_generic_entry_update(&entry->ent, 0, 0);
@@ -69,9 +71,9 @@ static inline void kmemtrace_free(enum kmemtrace_type_id type_id,
unsigned long call_site, unsigned long call_site,
const void *ptr) const void *ptr)
{ {
struct ring_buffer_event *event;
struct kmemtrace_free_entry *entry;
struct trace_array *tr = kmemtrace_array; struct trace_array *tr = kmemtrace_array;
struct kmemtrace_free_entry *entry;
struct ring_buffer_event *event;
event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry)); event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
if (!event) if (!event)
@@ -236,13 +238,14 @@ static enum print_line_t
kmemtrace_print_alloc_user(struct trace_iterator *iter, kmemtrace_print_alloc_user(struct trace_iterator *iter,
struct kmemtrace_alloc_entry *entry) struct kmemtrace_alloc_entry *entry)
{ {
struct kmemtrace_user_event_alloc *ev_alloc;
struct trace_seq *s = &iter->seq; struct trace_seq *s = &iter->seq;
struct kmemtrace_user_event *ev; struct kmemtrace_user_event *ev;
struct kmemtrace_user_event_alloc *ev_alloc;
ev = trace_seq_reserve(s, sizeof(*ev)); ev = trace_seq_reserve(s, sizeof(*ev));
if (!ev) if (!ev)
return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_PARTIAL_LINE;
ev->event_id = KMEMTRACE_USER_ALLOC; ev->event_id = KMEMTRACE_USER_ALLOC;
ev->type_id = entry->type_id; ev->type_id = entry->type_id;
ev->event_size = sizeof(*ev) + sizeof(*ev_alloc); ev->event_size = sizeof(*ev) + sizeof(*ev_alloc);
@@ -254,6 +257,7 @@ kmemtrace_print_alloc_user(struct trace_iterator *iter,
ev_alloc = trace_seq_reserve(s, sizeof(*ev_alloc)); ev_alloc = trace_seq_reserve(s, sizeof(*ev_alloc));
if (!ev_alloc) if (!ev_alloc)
return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_PARTIAL_LINE;
ev_alloc->bytes_req = entry->bytes_req; ev_alloc->bytes_req = entry->bytes_req;
ev_alloc->bytes_alloc = entry->bytes_alloc; ev_alloc->bytes_alloc = entry->bytes_alloc;
ev_alloc->gfp_flags = entry->gfp_flags; ev_alloc->gfp_flags = entry->gfp_flags;
@@ -272,6 +276,7 @@ kmemtrace_print_free_user(struct trace_iterator *iter,
ev = trace_seq_reserve(s, sizeof(*ev)); ev = trace_seq_reserve(s, sizeof(*ev));
if (!ev) if (!ev)
return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_PARTIAL_LINE;
ev->event_id = KMEMTRACE_USER_FREE; ev->event_id = KMEMTRACE_USER_FREE;
ev->type_id = entry->type_id; ev->type_id = entry->type_id;
ev->event_size = sizeof(*ev); ev->event_size = sizeof(*ev);
@@ -415,6 +420,7 @@ static enum print_line_t kmemtrace_print_line(struct trace_iterator *iter)
switch (entry->type) { switch (entry->type) {
case TRACE_KMEM_ALLOC: { case TRACE_KMEM_ALLOC: {
struct kmemtrace_alloc_entry *field; struct kmemtrace_alloc_entry *field;
trace_assign_type(field, entry); trace_assign_type(field, entry);
if (kmem_tracer_flags.val & TRACE_KMEM_OPT_MINIMAL) if (kmem_tracer_flags.val & TRACE_KMEM_OPT_MINIMAL)
return kmemtrace_print_alloc_compress(iter, field); return kmemtrace_print_alloc_compress(iter, field);
@@ -424,6 +430,7 @@ static enum print_line_t kmemtrace_print_line(struct trace_iterator *iter)
case TRACE_KMEM_FREE: { case TRACE_KMEM_FREE: {
struct kmemtrace_free_entry *field; struct kmemtrace_free_entry *field;
trace_assign_type(field, entry); trace_assign_type(field, entry);
if (kmem_tracer_flags.val & TRACE_KMEM_OPT_MINIMAL) if (kmem_tracer_flags.val & TRACE_KMEM_OPT_MINIMAL)
return kmemtrace_print_free_compress(iter, field); return kmemtrace_print_free_compress(iter, field);
@@ -454,5 +461,4 @@ static int __init init_kmem_tracer(void)
{ {
return register_tracer(&kmem_tracer); return register_tracer(&kmem_tracer);
} }
device_initcall(init_kmem_tracer); device_initcall(init_kmem_tracer);