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

Commit 7836e52e authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

libperf: Add perf_thread_map__get()/perf_thread_map__put() 



Move the following functions:

  thread_map__get()
  thread_map__put()
  thread_map__comm()

to libperf with the following names:

  perf_thread_map__get()
  perf_thread_map__put()
  perf_thread_map__comm()

Add the perf_thread_map__comm() function for it to work/compile.

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-34-jolsa@kernel.org


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

tools/perf/builtin-record.c

+1 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ static int record__synthesize_workload(struct record *rec, bool tail) 
						 process_synthesized_event,

						 &rec->session->machines.host,

						 rec->opts.sample_address);

	thread_map__put(thread_map);

	perf_thread_map__put(thread_map);

	return err;

}

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

+4 −0
Original line number Diff line number Diff line
@@ -10,5 +10,9 @@ 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);

LIBPERF_API char *perf_thread_map__comm(struct perf_thread_map *map, int thread);



LIBPERF_API struct perf_thread_map *perf_thread_map__get(struct perf_thread_map *map);

LIBPERF_API void perf_thread_map__put(struct perf_thread_map *map);



#endif /* __LIBPERF_THREADMAP_H */

tools/perf/lib/libperf.map

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ LIBPERF_0.0.1 { 
		perf_cpu_map__put;

		perf_thread_map__new_dummy;

		perf_thread_map__set_pid;

		perf_thread_map__comm;

		perf_thread_map__get;

		perf_thread_map__put;

	local:

		*;

};

tools/perf/lib/threadmap.c

+33 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#include <linux/refcount.h>

#include <internal/threadmap.h>

#include <string.h>

#include <asm/bug.h>

#include <stdio.h>



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

{
@@ -35,6 +37,11 @@ void perf_thread_map__set_pid(struct perf_thread_map *map, int thread, pid_t pid 
	map->map[thread].pid = pid;

}



char *perf_thread_map__comm(struct perf_thread_map *map, int thread)

{

	return map->map[thread].comm;

}



struct perf_thread_map *perf_thread_map__new_dummy(void)

{

	struct perf_thread_map *threads = thread_map__alloc(1);
@@ -46,3 +53,29 @@ struct perf_thread_map *perf_thread_map__new_dummy(void) 
	}

	return threads;

}



static void perf_thread_map__delete(struct perf_thread_map *threads)

{

	if (threads) {

		int i;



		WARN_ONCE(refcount_read(&threads->refcnt) != 0,

			  "thread map refcnt unbalanced\n");

		for (i = 0; i < threads->nr; i++)

			free(perf_thread_map__comm(threads, i));

		free(threads);

	}

}



struct perf_thread_map *perf_thread_map__get(struct perf_thread_map *map)

{

	if (map)

		refcount_inc(&map->refcnt);

	return map;

}



void perf_thread_map__put(struct perf_thread_map *map)

{

	if (map && refcount_dec_and_test(&map->refcnt))

		perf_thread_map__delete(map);

}

tools/perf/tests/code-reading.c

+2 −2
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ static int do_test_code_reading(bool try_kcore) 
				 * call. Getting refference to keep them alive.

				 */

				perf_cpu_map__get(cpus);

				thread_map__get(threads);

				perf_thread_map__get(threads);

				perf_evlist__set_maps(evlist, NULL, NULL);

				evlist__delete(evlist);

				evlist = NULL;
@@ -706,7 +706,7 @@ static int do_test_code_reading(bool try_kcore) 
		evlist__delete(evlist);

	} else {

		perf_cpu_map__put(cpus);

		thread_map__put(threads);

		perf_thread_map__put(threads);

	}

	machine__delete_threads(machine);

	machine__delete(machine);