mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
![Ian Rogers](/assets/img/avatar_default.png)
Remove unnecessary include of internal threadmap.h and refcount.h in thread_map.h. Switch to using public APIs when possible or including the internal header file in the C file. Fix a transitive dependency in openat-syscall.c broken by the clean up. Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Masahiro Yamada <masahiroy@kernel.org> Cc: Nick Desaulniers <ndesaulniers@google.com> Cc: Nicolas Schier <nicolas@fjasle.eu> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: bpf@vger.kernel.org Link: http://lore.kernel.org/lkml/20221109184914.1357295-13-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
152 lines
4.2 KiB
C
152 lines
4.2 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>
|
|
#include <internal/threadmap.h>
|
|
|
|
struct perf_sample;
|
|
struct perf_tool;
|
|
struct machine;
|
|
|
|
#define NAME (const char *) "perf"
|
|
#define NAMEUL (unsigned long) NAME
|
|
|
|
static int test__thread_map(struct test_suite *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;
|
|
}
|
|
|
|
static int test__thread_map_synthesize(struct test_suite *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;
|
|
}
|
|
|
|
static int test__thread_map_remove(struct test_suite *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;
|
|
}
|
|
|
|
DEFINE_SUITE("Thread map", thread_map);
|
|
DEFINE_SUITE("Synthesize thread map", thread_map_synthesize);
|
|
DEFINE_SUITE("Remove thread map", thread_map_remove);
|