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

Commit 9d2f8e22 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf machine: Introduce find_thread method 

There are cases where we want just to find a thread if it exists
already, so provide a method for that.

While doing that start moving 'machine' methods to a separate file.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-8wpzqs9kfupng6xq8hx6lnxa@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0c1fe6b2

tools/perf/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ LIB_H += util/evlist.h 
LIB_H += util/exec_cmd.h

LIB_H += util/types.h

LIB_H += util/levenshtein.h

LIB_H += util/machine.h

LIB_H += util/map.h

LIB_H += util/parse-options.h

LIB_H += util/parse-events.h
@@ -383,6 +384,7 @@ LIB_OBJS += $(OUTPUT)util/header.o 
LIB_OBJS += $(OUTPUT)util/callchain.o

LIB_OBJS += $(OUTPUT)util/values.o

LIB_OBJS += $(OUTPUT)util/debug.o

LIB_OBJS += $(OUTPUT)util/machine.o

LIB_OBJS += $(OUTPUT)util/map.o

LIB_OBJS += $(OUTPUT)util/pstack.o

LIB_OBJS += $(OUTPUT)util/session.o

tools/perf/util/machine.c

0 → 100644
+57 −0
Original line number Diff line number Diff line 
#include "machine.h"

#include "map.h"

#include "thread.h"

#include <stdbool.h>



static struct thread *__machine__findnew_thread(struct machine *machine, pid_t pid,

						bool create)

{

	struct rb_node **p = &machine->threads.rb_node;

	struct rb_node *parent = NULL;

	struct thread *th;



	/*

	 * Font-end cache - PID lookups come in blocks,

	 * so most of the time we dont have to look up

	 * the full rbtree:

	 */

	if (machine->last_match && machine->last_match->pid == pid)

		return machine->last_match;



	while (*p != NULL) {

		parent = *p;

		th = rb_entry(parent, struct thread, rb_node);



		if (th->pid == pid) {

			machine->last_match = th;

			return th;

		}



		if (pid < th->pid)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;

	}



	if (!create)

		return NULL;



	th = thread__new(pid);

	if (th != NULL) {

		rb_link_node(&th->rb_node, parent, p);

		rb_insert_color(&th->rb_node, &machine->threads);

		machine->last_match = th;

	}



	return th;

}



struct thread *machine__findnew_thread(struct machine *machine, pid_t pid)

{

	return __machine__findnew_thread(machine, pid, true);

}



struct thread *machine__find_thread(struct machine *machine, pid_t pid)

{

	return __machine__findnew_thread(machine, pid, false);

}

tools/perf/util/machine.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#ifndef __PERF_MACHINE_H

#define __PERF_MACHINE_H



#include <sys/types.h>



struct thread;

struct machine;



struct thread *machine__find_thread(struct machine *machine, pid_t pid);



#endif /* __PERF_MACHINE_H */

tools/perf/util/thread.c

+1 −40
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include "util.h"

#include "debug.h"



static struct thread *thread__new(pid_t pid)

struct thread *thread__new(pid_t pid)

{

	struct thread *self = zalloc(sizeof(*self));
@@ -61,45 +61,6 @@ static size_t thread__fprintf(struct thread *self, FILE *fp) 
	       map_groups__fprintf(&self->mg, verbose, fp);

}



struct thread *machine__findnew_thread(struct machine *self, pid_t pid)

{

	struct rb_node **p = &self->threads.rb_node;

	struct rb_node *parent = NULL;

	struct thread *th;



	/*

	 * Font-end cache - PID lookups come in blocks,

	 * so most of the time we dont have to look up

	 * the full rbtree:

	 */

	if (self->last_match && self->last_match->pid == pid)

		return self->last_match;



	while (*p != NULL) {

		parent = *p;

		th = rb_entry(parent, struct thread, rb_node);



		if (th->pid == pid) {

			self->last_match = th;

			return th;

		}



		if (pid < th->pid)

			p = &(*p)->rb_left;

		else

			p = &(*p)->rb_right;

	}



	th = thread__new(pid);

	if (th != NULL) {

		rb_link_node(&th->rb_node, parent, p);

		rb_insert_color(&th->rb_node, &self->threads);

		self->last_match = th;

	}



	return th;

}



void thread__insert_map(struct thread *self, struct map *map)

{

	map_groups__fixup_overlappings(&self->mg, map, verbose, stderr);

tools/perf/util/thread.h

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/rbtree.h>

#include <unistd.h>

#include <sys/types.h>

#include "symbol.h"



struct thread {
@@ -22,6 +23,7 @@ struct thread { 


struct machine;



struct thread *thread__new(pid_t pid);

void thread__delete(struct thread *self);



int thread__set_comm(struct thread *self, const char *comm);