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

Commit 4b49cce2 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

libperf: Add perf_thread_map__new_dummy() function 



Moving the following functions:

  thread_map__new_dummy()
  thread_map__realloc()
  thread_map__set_pid()

to libperf with the following names:

  perf_thread_map__new_dummy()
  perf_thread_map__realloc()
  perf_thread_map__set_pid()

the other 2 functions are dependencies of the
perf_thread_map__new_dummy() function.

The perf_thread_map__realloc() function is not exported.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-33-jolsa@kernel.org


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

tools/perf/lib/include/internal/threadmap.h

+2 −0
Original line number Diff line number Diff line
@@ -18,4 +18,6 @@ struct perf_thread_map { 
	struct thread_map_data map[];

};



struct perf_thread_map *perf_thread_map__realloc(struct perf_thread_map *map, int nr);



#endif /* __LIBPERF_INTERNAL_THREADMAP_H */

tools/perf/lib/include/perf/threadmap.h

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,13 @@ 
#ifndef __LIBPERF_THREADMAP_H

#define __LIBPERF_THREADMAP_H



#include <perf/core.h>

#include <sys/types.h>



struct perf_thread_map;



LIBPERF_API struct perf_thread_map *perf_thread_map__new_dummy(void);



LIBPERF_API void perf_thread_map__set_pid(struct perf_thread_map *map, int thread, pid_t pid);



#endif /* __LIBPERF_THREADMAP_H */

tools/perf/lib/libperf.map

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ LIBPERF_0.0.1 { 
		perf_cpu_map__dummy_new;

		perf_cpu_map__get;

		perf_cpu_map__put;

		perf_thread_map__new_dummy;

		perf_thread_map__set_pid;

	local:

		*;

};

tools/perf/lib/threadmap.c

+43 −0
Original line number Diff line number Diff line
@@ -3,3 +3,46 @@ 
#include <stdlib.h>

#include <linux/refcount.h>

#include <internal/threadmap.h>

#include <string.h>



static void perf_thread_map__reset(struct perf_thread_map *map, int start, int nr)

{

	size_t size = (nr - start) * sizeof(map->map[0]);



	memset(&map->map[start], 0, size);

	map->err_thread = -1;

}



struct perf_thread_map *perf_thread_map__realloc(struct perf_thread_map *map, int nr)

{

	size_t size = sizeof(*map) + sizeof(map->map[0]) * nr;

	int start = map ? map->nr : 0;



	map = realloc(map, size);

	/*

	 * We only realloc to add more items, let's reset new items.

	 */

	if (map)

		perf_thread_map__reset(map, start, nr);



	return map;

}



#define thread_map__alloc(__nr) perf_thread_map__realloc(NULL, __nr)



void perf_thread_map__set_pid(struct perf_thread_map *map, int thread, pid_t pid)

{

	map->map[thread].pid = pid;

}



struct perf_thread_map *perf_thread_map__new_dummy(void)

{

	struct perf_thread_map *threads = thread_map__alloc(1);



	if (threads != NULL) {

		perf_thread_map__set_pid(threads, 0, -1);

		threads->nr = 1;

		refcount_set(&threads->refcnt, 1);

	}

	return threads;

}

tools/perf/tests/openat-syscall-tp-fields.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest 


	perf_evsel__config(evsel, &opts, NULL);



	thread_map__set_pid(evlist->threads, 0, getpid());

	perf_thread_map__set_pid(evlist->threads, 0, getpid());



	err = evlist__open(evlist);

	if (err < 0) {