Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e74328d3 authored by John Kacur's avatar John Kacur Committed by Ingo Molnar
Browse files

perf tools: Use common process_event functions for annotate and report 



Prevent bit-rot in perf-annotate by using common functions where
possible. Here we create process_events.[ch] to hold the common
functions.

Signed-off-by: default avatarJohn Kacur <jkacur@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: acme@redhat.com
LKML-Reference: <1259073301-11506-3-git-send-email-jkacur@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c9c7ccaf

tools/perf/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ LIB_H += util/sort.h 
LIB_H += util/hist.h

LIB_H += util/thread.h

LIB_H += util/data_map.h

LIB_H += util/process_events.h



LIB_OBJS += util/abspath.o

LIB_OBJS += util/alias.o
@@ -411,6 +412,7 @@ LIB_OBJS += util/svghelper.o 
LIB_OBJS += util/sort.o

LIB_OBJS += util/hist.o

LIB_OBJS += util/data_map.o

LIB_OBJS += util/process_events.o



BUILTIN_OBJS += builtin-annotate.o

tools/perf/builtin-annotate.c

+2 −54
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "util/thread.h"

#include "util/sort.h"

#include "util/hist.h"

#include "util/process_events.h"



static char		const *input_name = "perf.data";
@@ -201,32 +202,6 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) 
	return 0;

}



static int

process_mmap_event(event_t *event, unsigned long offset, unsigned long head)

{

	struct map *map = map__new(&event->mmap, NULL, 0);

	struct thread *thread = threads__findnew(event->mmap.pid);



	dump_printf("%p [%p]: PERF_RECORD_MMAP %d: [%p(%p) @ %p]: %s\n",

		(void *)(offset + head),

		(void *)(long)(event->header.size),

		event->mmap.pid,

		(void *)(long)event->mmap.start,

		(void *)(long)event->mmap.len,

		(void *)(long)event->mmap.pgoff,

		event->mmap.filename);



	if (thread == NULL || map == NULL) {

		dump_printf("problem processing PERF_RECORD_MMAP, skipping event.\n");

		return 0;

	}



	thread__insert_map(thread, map);

	total_mmap++;



	return 0;

}



static int

process_comm_event(event_t *event, unsigned long offset, unsigned long head)

{
@@ -247,33 +222,6 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head) 
	return 0;

}



static int

process_fork_event(event_t *event, unsigned long offset, unsigned long head)

{

	struct thread *thread = threads__findnew(event->fork.pid);

	struct thread *parent = threads__findnew(event->fork.ppid);



	dump_printf("%p [%p]: PERF_RECORD_FORK: %d:%d\n",

		(void *)(offset + head),

		(void *)(long)(event->header.size),

		event->fork.pid, event->fork.ppid);



	/*

	 * A thread clone will have the same PID for both

	 * parent and child.

	 */

	if (thread == parent)

		return 0;



	if (!thread || !parent || thread__fork(thread, parent)) {

		dump_printf("problem processing PERF_RECORD_FORK, skipping event.\n");

		return -1;

	}

	total_fork++;



	return 0;

}



static int

process_event(event_t *event, unsigned long offset, unsigned long head)

{
@@ -288,7 +236,7 @@ process_event(event_t *event, unsigned long offset, unsigned long head) 
		return process_comm_event(event, offset, head);



	case PERF_RECORD_FORK:

		return process_fork_event(event, offset, head);

		return process_task_event(event, offset, head);

	/*

	 * We dont process them right now but they are fine:

	 */

tools/perf/builtin-report.c

+1 −62
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "util/thread.h"

#include "util/sort.h"

#include "util/hist.h"

#include "util/process_events.h"



static char		const *input_name = "perf.data";
@@ -54,9 +55,6 @@ static int exclude_other = 1; 
static char		callchain_default_opt[] = "fractal,0.5";

const char		*vmlinux_name;



static char		*cwd;

static int		cwdlen;



static struct perf_header *header;



static u64		sample_type;
@@ -750,33 +748,6 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) 
	return 0;

}



static int

process_mmap_event(event_t *event, unsigned long offset, unsigned long head)

{

	struct map *map = map__new(&event->mmap, cwd, cwdlen);

	struct thread *thread = threads__findnew(event->mmap.pid);



	dump_printf("%p [%p]: PERF_RECORD_MMAP %d/%d: [%p(%p) @ %p]: %s\n",

		(void *)(offset + head),

		(void *)(long)(event->header.size),

		event->mmap.pid,

		event->mmap.tid,

		(void *)(long)event->mmap.start,

		(void *)(long)event->mmap.len,

		(void *)(long)event->mmap.pgoff,

		event->mmap.filename);



	if (thread == NULL || map == NULL) {

		dump_printf("problem processing PERF_RECORD_MMAP, skipping event.\n");

		return 0;

	}



	thread__insert_map(thread, map);

	total_mmap++;



	return 0;

}



static int

process_comm_event(event_t *event, unsigned long offset, unsigned long head)

{
@@ -797,38 +768,6 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head) 
	return 0;

}



static int

process_task_event(event_t *event, unsigned long offset, unsigned long head)

{

	struct thread *thread = threads__findnew(event->fork.pid);

	struct thread *parent = threads__findnew(event->fork.ppid);



	dump_printf("%p [%p]: PERF_RECORD_%s: (%d:%d):(%d:%d)\n",

		(void *)(offset + head),

		(void *)(long)(event->header.size),

		event->header.type == PERF_RECORD_FORK ? "FORK" : "EXIT",

		event->fork.pid, event->fork.tid,

		event->fork.ppid, event->fork.ptid);



	/*

	 * A thread clone will have the same PID for both

	 * parent and child.

	 */

	if (thread == parent)

		return 0;



	if (event->header.type == PERF_RECORD_EXIT)

		return 0;



	if (!thread || !parent || thread__fork(thread, parent)) {

		dump_printf("problem processing PERF_RECORD_FORK, skipping event.\n");

		return -1;

	}

	total_fork++;



	return 0;

}



static int

process_lost_event(event_t *event, unsigned long offset, unsigned long head)

{

tools/perf/util/process_event.c

0 → 100644
+53 −0
Original line number Diff line number Diff line 
#include "process_event.h"



char	*cwd;

int	cwdlen;



int

process_mmap_event(event_t *event, unsigned long offset, unsigned long head)

{

	struct map *map = map__new(&event->mmap, cwd, cwdlen);

	struct thread *thread = threads__findnew(event->mmap.pid);



	dump_printf("%p [%p]: PERF_RECORD_MMAP %d/%d: [%p(%p) @ %p]: %s\n",

			(void *)(offset + head),

			(void *)(long)(event->header.size),

			event->mmap.pid,

			event->mmap.tid,

			(void *)(long)event->mmap.start,

			(void *)(long)event->mmap.len,

			(void *)(long)event->mmap.pgoff,

			event->mmap.filename);



	if (thread == NULL || map == NULL) {

		dump_printf("problem processing PERF_RECORD_MMAP, skipping event.\n");

		return 0;

	}



	thread__insert_map(thread, map);

	total_mmap++;



	return 0;



}



int

process_comm_event(event_t *event, unsigned long offset, unsigned long head)

{

	struct thread *thread = threads__findnew(event->comm.pid);



	dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n",

		(void *)(offset + head),

		(void *)(long)(event->header.size),

		event->comm.comm, event->comm.pid);



	if (thread == NULL ||

	    thread__set_comm_adjust(thread, event->comm.comm)) {

		dump_printf("problem processing PERF_RECORD_COMM, skipping event.\n");

		return -1;

	}

	total_comm++;



	return 0;

}

tools/perf/util/process_event.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
#ifndef __PROCESS_EVENT_H

#define __PROCESS_EVENT_H



#include "../builtin.h"

#include "util.h"



#include "color.h"

#include <linux/list.h>

#include "cache.h"

#include <linux/rbtree.h>

#include "symbol.h"

#include "string.h"



#include "../perf.h"

#include "debug.h"



#include "parse-options.h"

#include "parse-events.h"



#include "thread.h"

#include "sort.h"

#include "hist.h"



extern char	*cwd;

extern int	cwdlen;

extern int process_mmap_event(event_t *, unsigned long, unsigned long);

extern int process_comm_event(event_t *, unsigned long , unsigned long);



#endif	/* __PROCESS_H */