From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752232AbbERAlo (ORCPT ); Sun, 17 May 2015 20:41:44 -0400 Received: from LGEMRELSE6Q.lge.com ([156.147.1.121]:54781 "EHLO lgemrelse6q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752092AbbERAlQ (ORCPT ); Sun, 17 May 2015 20:41:16 -0400 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 , Frederic Weisbecker , Stephane Eranian Subject: [PATCH 11/40] perf tools: Add a test case for thread comm handling Date: Mon, 18 May 2015 09:30:26 +0900 Message-Id: <1431909055-21442-12-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1431909055-21442-1-git-send-email-namhyung@kernel.org> References: <1431909055-21442-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new test case checks various thread comm handling like overridding and time sorting. Cc: Frederic Weisbecker Signed-off-by: Namhyung Kim --- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 4 ++++ tools/perf/tests/perf-targz-src-pkg | 21 ----------------- tools/perf/tests/tests.h | 1 + tools/perf/tests/thread-comm.c | 47 +++++++++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 21 deletions(-) delete mode 100755 tools/perf/tests/perf-targz-src-pkg create mode 100644 tools/perf/tests/thread-comm.c diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index 6a8801b32017..78d29a3a6a97 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -24,6 +24,7 @@ perf-y += bp_signal_overflow.o perf-y += task-exit.o perf-y += sw-clock.o perf-y += mmap-thread-lookup.o +perf-y += thread-comm.o perf-y += thread-mg-share.o perf-y += switch-tracking.o perf-y += keep-tracking.o diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index f42af98a5c16..372b6395a448 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -171,6 +171,10 @@ static struct test { .func = test__kmod_path__parse, }, { + .desc = "Test thread comm handling", + .func = test__thread_comm, + }, + { .func = NULL, }, }; diff --git a/tools/perf/tests/perf-targz-src-pkg b/tools/perf/tests/perf-targz-src-pkg deleted file mode 100755 index 238aa3927c71..000000000000 --- a/tools/perf/tests/perf-targz-src-pkg +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# Test one of the main kernel Makefile targets to generate a perf sources tarball -# suitable for build outside the full kernel sources. -# -# This is to test that the tools/perf/MANIFEST file lists all the files needed to -# be in such tarball, which sometimes gets broken when we move files around, -# like when we made some files that were in tools/perf/ available to other tools/ -# codebases by moving it to tools/include/, etc. - -PERF=$1 -cd ${PERF}/../.. -make perf-targz-src-pkg > /dev/null -TARBALL=$(ls -rt perf-*.tar.gz) -TMP_DEST=$(mktemp -d) -tar xf ${TARBALL} -C $TMP_DEST -rm -f ${TARBALL} -cd - > /dev/null -make -C $TMP_DEST/perf*/tools/perf > /dev/null 2>&1 -RC=$? -rm -rf ${TMP_DEST} -exit $RC diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index a10eaf5c4767..aa269eff798a 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -61,6 +61,7 @@ int test__switch_tracking(void); int test__fdarray__filter(void); int test__fdarray__add(void); int test__kmod_path__parse(void); +int test__thread_comm(void); #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) #ifdef HAVE_DWARF_UNWIND_SUPPORT diff --git a/tools/perf/tests/thread-comm.c b/tools/perf/tests/thread-comm.c new file mode 100644 index 000000000000..d146dedf63b4 --- /dev/null +++ b/tools/perf/tests/thread-comm.c @@ -0,0 +1,47 @@ +#include "tests.h" +#include "machine.h" +#include "thread.h" +#include "debug.h" + +int test__thread_comm(void) +{ + struct machines machines; + struct machine *machine; + struct thread *t; + + /* + * This test is to check whether it can retrieve a correct + * comm for a given time. When multi-file data storage is + * enabled, those task/comm events are processed first so the + * later sample should find a matching comm properly. + */ + machines__init(&machines); + machine = &machines.host; + + t = machine__findnew_thread(machine, 100, 100); + TEST_ASSERT_VAL("wrong init thread comm", + !strcmp(thread__comm_str(t), ":100")); + + thread__set_comm(t, "perf-test1", 10000); + TEST_ASSERT_VAL("failed to override thread comm", + !strcmp(thread__comm_str(t), "perf-test1")); + + thread__set_comm(t, "perf-test2", 20000); + thread__set_comm(t, "perf-test3", 30000); + thread__set_comm(t, "perf-test4", 40000); + + TEST_ASSERT_VAL("failed to find timed comm", + !strcmp(thread__comm_str_by_time(t, 20000), "perf-test2")); + TEST_ASSERT_VAL("failed to find timed comm", + !strcmp(thread__comm_str_by_time(t, 35000), "perf-test3")); + TEST_ASSERT_VAL("failed to find timed comm", + !strcmp(thread__comm_str_by_time(t, 50000), "perf-test4")); + + thread__set_comm(t, "perf-test1.5", 15000); + TEST_ASSERT_VAL("failed to sort timed comm", + !strcmp(thread__comm_str_by_time(t, 15000), "perf-test1.5")); + + machine__delete_threads(machine); + machines__exit(&machines); + return 0; +} -- 2.4.0