mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-16 16:54:20 +08:00
641b625033
The str should be freed after creating a thread map. Also change the
open-coded thread map deletion to a call to perf_thread_map__put().
$ perf test -v 44
44: Remove thread map :
--- start ---
test child forked, pid 165536
2 threads: 165535, 165536
1 thread: 165536
0 thread:
=================================================================
==165536==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 14 byte(s) in 1 object(s) allocated from:
#0 0x7f54453ffe8f in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:145
#1 0x7f5444f8c6a7 in __vasprintf_internal libio/vasprintf.c:71
SUMMARY: AddressSanitizer: 14 byte(s) leaked in 1 allocation(s).
test child finished with 1
---- end ----
Remove thread map: FAILED!
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20210301140409.184570-10-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
148 lines
4.0 KiB
C
148 lines
4.0 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
#include <sys/prctl.h>
|
|
#include "tests.h"
|
|
#include "thread_map.h"
|
|
#include "debug.h"
|
|
#include "event.h"
|
|
#include "util/synthetic-events.h"
|
|
#include <linux/zalloc.h>
|
|
#include <perf/event.h>
|
|
|
|
struct perf_sample;
|
|
struct perf_tool;
|
|
struct machine;
|
|
|
|
#define NAME (const char *) "perf"
|
|
#define NAMEUL (unsigned long) NAME
|
|
|
|
int test__thread_map(struct test *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
struct perf_thread_map *map;
|
|
|
|
TEST_ASSERT_VAL("failed to set process name",
|
|
!prctl(PR_SET_NAME, NAMEUL, 0, 0, 0));
|
|
|
|
/* test map on current pid */
|
|
map = thread_map__new_by_pid(getpid());
|
|
TEST_ASSERT_VAL("failed to alloc map", map);
|
|
|
|
thread_map__read_comms(map);
|
|
|
|
TEST_ASSERT_VAL("wrong nr", map->nr == 1);
|
|
TEST_ASSERT_VAL("wrong pid",
|
|
perf_thread_map__pid(map, 0) == getpid());
|
|
TEST_ASSERT_VAL("wrong comm",
|
|
perf_thread_map__comm(map, 0) &&
|
|
!strcmp(perf_thread_map__comm(map, 0), NAME));
|
|
TEST_ASSERT_VAL("wrong refcnt",
|
|
refcount_read(&map->refcnt) == 1);
|
|
perf_thread_map__put(map);
|
|
|
|
/* test dummy pid */
|
|
map = perf_thread_map__new_dummy();
|
|
TEST_ASSERT_VAL("failed to alloc map", map);
|
|
|
|
thread_map__read_comms(map);
|
|
|
|
TEST_ASSERT_VAL("wrong nr", map->nr == 1);
|
|
TEST_ASSERT_VAL("wrong pid", perf_thread_map__pid(map, 0) == -1);
|
|
TEST_ASSERT_VAL("wrong comm",
|
|
perf_thread_map__comm(map, 0) &&
|
|
!strcmp(perf_thread_map__comm(map, 0), "dummy"));
|
|
TEST_ASSERT_VAL("wrong refcnt",
|
|
refcount_read(&map->refcnt) == 1);
|
|
perf_thread_map__put(map);
|
|
return 0;
|
|
}
|
|
|
|
static int process_event(struct perf_tool *tool __maybe_unused,
|
|
union perf_event *event,
|
|
struct perf_sample *sample __maybe_unused,
|
|
struct machine *machine __maybe_unused)
|
|
{
|
|
struct perf_record_thread_map *map = &event->thread_map;
|
|
struct perf_thread_map *threads;
|
|
|
|
TEST_ASSERT_VAL("wrong nr", map->nr == 1);
|
|
TEST_ASSERT_VAL("wrong pid", map->entries[0].pid == (u64) getpid());
|
|
TEST_ASSERT_VAL("wrong comm", !strcmp(map->entries[0].comm, NAME));
|
|
|
|
threads = thread_map__new_event(&event->thread_map);
|
|
TEST_ASSERT_VAL("failed to alloc map", threads);
|
|
|
|
TEST_ASSERT_VAL("wrong nr", threads->nr == 1);
|
|
TEST_ASSERT_VAL("wrong pid",
|
|
perf_thread_map__pid(threads, 0) == getpid());
|
|
TEST_ASSERT_VAL("wrong comm",
|
|
perf_thread_map__comm(threads, 0) &&
|
|
!strcmp(perf_thread_map__comm(threads, 0), NAME));
|
|
TEST_ASSERT_VAL("wrong refcnt",
|
|
refcount_read(&threads->refcnt) == 1);
|
|
perf_thread_map__put(threads);
|
|
return 0;
|
|
}
|
|
|
|
int test__thread_map_synthesize(struct test *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
struct perf_thread_map *threads;
|
|
|
|
TEST_ASSERT_VAL("failed to set process name",
|
|
!prctl(PR_SET_NAME, NAMEUL, 0, 0, 0));
|
|
|
|
/* test map on current pid */
|
|
threads = thread_map__new_by_pid(getpid());
|
|
TEST_ASSERT_VAL("failed to alloc map", threads);
|
|
|
|
thread_map__read_comms(threads);
|
|
|
|
TEST_ASSERT_VAL("failed to synthesize map",
|
|
!perf_event__synthesize_thread_map2(NULL, threads, process_event, NULL));
|
|
|
|
perf_thread_map__put(threads);
|
|
return 0;
|
|
}
|
|
|
|
int test__thread_map_remove(struct test *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
struct perf_thread_map *threads;
|
|
char *str;
|
|
|
|
TEST_ASSERT_VAL("failed to allocate map string",
|
|
asprintf(&str, "%d,%d", getpid(), getppid()) >= 0);
|
|
|
|
threads = thread_map__new_str(str, NULL, 0, false);
|
|
free(str);
|
|
|
|
TEST_ASSERT_VAL("failed to allocate thread_map",
|
|
threads);
|
|
|
|
if (verbose > 0)
|
|
thread_map__fprintf(threads, stderr);
|
|
|
|
TEST_ASSERT_VAL("failed to remove thread",
|
|
!thread_map__remove(threads, 0));
|
|
|
|
TEST_ASSERT_VAL("thread_map count != 1", threads->nr == 1);
|
|
|
|
if (verbose > 0)
|
|
thread_map__fprintf(threads, stderr);
|
|
|
|
TEST_ASSERT_VAL("failed to remove thread",
|
|
!thread_map__remove(threads, 0));
|
|
|
|
TEST_ASSERT_VAL("thread_map count != 0", threads->nr == 0);
|
|
|
|
if (verbose > 0)
|
|
thread_map__fprintf(threads, stderr);
|
|
|
|
TEST_ASSERT_VAL("failed to not remove thread",
|
|
thread_map__remove(threads, 0));
|
|
|
|
perf_thread_map__put(threads);
|
|
return 0;
|
|
}
|