From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754154AbbA2IQm (ORCPT ); Thu, 29 Jan 2015 03:16:42 -0500 Received: from LGEMRELSE6Q.lge.com ([156.147.1.121]:51398 "EHLO lgemrelse6q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753206AbbA2IKO (ORCPT ); Thu, 29 Jan 2015 03:10:14 -0500 X-Original-SENDERIP: 10.177.220.203 X-Original-MAILFROM: namhyung@kernel.org From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , David Ahern , Adrian Hunter , Andi Kleen , Stephane Eranian , Frederic Weisbecker Subject: [PATCH 23/42] perf tools: Add a test case for timed thread handling Date: Thu, 29 Jan 2015 17:07:04 +0900 Message-Id: <1422518843-25818-24-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1422518843-25818-1-git-send-email-namhyung@kernel.org> References: <1422518843-25818-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A test case for verifying live and dead thread tree management during time change and new machine__find{,new}_thread_time(). Cc: Frederic Weisbecker Signed-off-by: Namhyung Kim --- tools/perf/Makefile.perf | 1 + tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/tests.h | 1 + tools/perf/tests/thread-lookup-time.c | 174 ++++++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+) create mode 100644 tools/perf/tests/thread-lookup-time.c diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 8507891db69d..8bb35ee91fd5 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -459,6 +459,7 @@ LIB_OBJS += $(OUTPUT)tests/mmap-thread-lookup.o LIB_OBJS += $(OUTPUT)tests/thread-mg-share.o LIB_OBJS += $(OUTPUT)tests/switch-tracking.o LIB_OBJS += $(OUTPUT)tests/thread-comm.o +LIB_OBJS += $(OUTPUT)tests/thread-lookup-time.o BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o BUILTIN_OBJS += $(OUTPUT)builtin-bench.o diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 1b463d82a71a..e4d335de19ea 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -171,6 +171,10 @@ static struct test { .func = test__thread_comm, }, { + .desc = "Test thread lookup with time", + .func = test__thread_lookup_time, + }, + { .func = NULL, }, }; diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index 43ac17780629..1090337f63e5 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -52,6 +52,7 @@ int test__switch_tracking(void); int test__fdarray__filter(void); int test__fdarray__add(void); int test__thread_comm(void); +int test__thread_lookup_time(void); #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) #ifdef HAVE_DWARF_UNWIND_SUPPORT diff --git a/tools/perf/tests/thread-lookup-time.c b/tools/perf/tests/thread-lookup-time.c new file mode 100644 index 000000000000..6237ecf8caae --- /dev/null +++ b/tools/perf/tests/thread-lookup-time.c @@ -0,0 +1,174 @@ +#include "tests.h" +#include "machine.h" +#include "thread.h" +#include "map.h" +#include "debug.h" + +static int thread__print_cb(struct thread *th, void *arg __maybe_unused) +{ + printf("thread: %d, start time: %"PRIu64" %s\n", + th->tid, th->start_time, th->dead ? "(dead)" : ""); + return 0; +} + +static int lookup_with_timestamp(struct machine *machine) +{ + struct thread *t1, *t2, *t3; + union perf_event fork = { + .fork = { + .pid = 0, + .tid = 0, + .ppid = 1, + .ptid = 1, + }, + }; + struct perf_sample sample = { + .time = 50000, + }; + + /* start_time is set to 0 */ + t1 = machine__findnew_thread(machine, 0, 0); + + if (verbose > 1) { + printf("========= after t1 created ==========\n"); + machine__for_each_thread(machine, thread__print_cb, NULL); + } + + TEST_ASSERT_VAL("wrong start time of old thread", t1->start_time == 0); + + TEST_ASSERT_VAL("cannot find current thread", + machine__find_thread(machine, 0, 0) == t1); + + TEST_ASSERT_VAL("cannot find current thread with time", + machine__findnew_thread_time(machine, 0, 0, 10000) == t1); + + /* start_time is overwritten to new value */ + thread__set_comm(t1, "/usr/bin/perf", 20000); + + if (verbose > 1) { + printf("========= after t1 set comm ==========\n"); + machine__for_each_thread(machine, thread__print_cb, NULL); + } + + TEST_ASSERT_VAL("failed to update start time", t1->start_time == 20000); + + TEST_ASSERT_VAL("should not find passed thread", + /* this will create yet another dead thread */ + machine__findnew_thread_time(machine, 0, 0, 10000) != t1); + + TEST_ASSERT_VAL("cannot find overwritten thread with time", + machine__find_thread_time(machine, 0, 0, 20000) == t1); + + /* now t1 goes to dead thread tree, and create t2 */ + machine__process_fork_event(machine, &fork, &sample); + + if (verbose > 1) { + printf("========= after t2 forked ==========\n"); + machine__for_each_thread(machine, thread__print_cb, NULL); + } + + t2 = machine__find_thread(machine, 0, 0); + TEST_ASSERT_VAL("cannot find current thread", t2 != NULL); + + TEST_ASSERT_VAL("wrong start time of new thread", t2->start_time == 50000); + + TEST_ASSERT_VAL("dead thread cannot be found", + machine__find_thread_time(machine, 0, 0, 10000) != t1); + + TEST_ASSERT_VAL("cannot find dead thread after new thread", + machine__find_thread_time(machine, 0, 0, 30000) == t1); + + TEST_ASSERT_VAL("cannot find current thread after new thread", + machine__find_thread_time(machine, 0, 0, 50000) == t2); + + /* now t2 goes to dead thread tree, and create t3 */ + sample.time = 60000; + machine__process_fork_event(machine, &fork, &sample); + + if (verbose > 1) { + printf("========= after t3 forked ==========\n"); + machine__for_each_thread(machine, thread__print_cb, NULL); + } + + t3 = machine__find_thread(machine, 0, 0); + TEST_ASSERT_VAL("cannot find current thread", t3 != NULL); + + TEST_ASSERT_VAL("wrong start time of new thread", t3->start_time == 60000); + + TEST_ASSERT_VAL("cannot find dead thread after new thread", + machine__findnew_thread_time(machine, 0, 0, 30000) == t1); + + TEST_ASSERT_VAL("cannot find dead thread after new thread", + machine__findnew_thread_time(machine, 0, 0, 50000) == t2); + + TEST_ASSERT_VAL("cannot find current thread after new thread", + machine__findnew_thread_time(machine, 0, 0, 70000) == t3); + + machine__delete_threads(machine); + return 0; +} + +static int lookup_without_timestamp(struct machine *machine) +{ + struct thread *t1, *t2, *t3; + union perf_event fork = { + .fork = { + .pid = 0, + .tid = 0, + .ppid = 1, + .ptid = 1, + }, + }; + struct perf_sample sample = { + .time = -1ULL, + }; + + t1 = machine__findnew_thread(machine, 0, 0); + TEST_ASSERT_VAL("cannot find current thread", t1 != NULL); + + TEST_ASSERT_VAL("cannot find new thread with time", + machine__findnew_thread_time(machine, 0, 0, -1ULL) == t1); + + machine__process_fork_event(machine, &fork, &sample); + + t2 = machine__find_thread(machine, 0, 0); + TEST_ASSERT_VAL("cannot find current thread", t2 != NULL); + + TEST_ASSERT_VAL("cannot find new thread with time", + machine__find_thread_time(machine, 0, 0, -1ULL) == t2); + + machine__process_fork_event(machine, &fork, &sample); + + t3 = machine__find_thread(machine, 0, 0); + TEST_ASSERT_VAL("cannot find current thread", t3 != NULL); + + TEST_ASSERT_VAL("cannot find new thread with time", + machine__findnew_thread_time(machine, 0, 0, -1ULL) == t3); + + machine__delete_threads(machine); + return 0; +} + +int test__thread_lookup_time(void) +{ + struct machines machines; + struct machine *machine; + + /* + * This test is to check whether it can retrieve a correct + * thread for a given time. When multi-file data storage is + * enabled, those task/comm/mmap events are processed first so + * the later sample should find a matching thread properly. + */ + machines__init(&machines); + machine = &machines.host; + + if (lookup_with_timestamp(machine) < 0) + return -1; + + if (lookup_without_timestamp(machine) < 0) + return -1; + + machines__exit(&machines); + return 0; +} -- 2.2.2