Received: by 2002:a05:6a10:e898:0:0:0:0 with SMTP id gl24csp4316713pxb; Mon, 8 Feb 2021 13:21:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJziw75EBf9KRxhyvBU1Bbok7k85aprGy0HBVx8TjErd0IhobgysJgSDmZSnPjxVxYfcEpIM X-Received: by 2002:a17:906:ca0d:: with SMTP id jt13mr18460137ejb.170.1612819302326; Mon, 08 Feb 2021 13:21:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612819302; cv=none; d=google.com; s=arc-20160816; b=M+5yPYByjQr5TtnucaP+gay2yj15xwqLdFyqbuLOlYaem/TK8UxJFRSPv3TmsHiWZQ arqbvtlz1ZRF2TlQ1pVtL+nXLDwv8/zrLFY49cTEdnddyN9JB0zQL97eZGph7K7FqdCM 6r28rCY+S3zUbs64Ltw4dDhPJ5ZrRjT7/CJodna8los3B2a90VvHAOG40gZlxSo0gAKA hEy7YmzK9xPCGpijJPILIKjIiwAQdM5P9CqdLZZaYpB8LjbPpxt3GvKe2HNfqmDqG8eo ts16yVzPoXL/3cMDFx9Nj9nfzlTScn1V4WPf5AyqkEZtkLBzx6PP0E/ndwh8Xx3N0IUZ +cFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=xjMPjI0Uqpwk123Vqc+JKO6BHILeTcq+8RL4push5a8=; b=SBQ1II5ng8Ata9IS8/lSVhE/YyRPQfoHM7gwhwGBUOoQaddAsQbeXh7XDu0y8AfPvQ bpBSy+KK3QwaxZS4jQUgJRKjWCNoFGshUhKmCUTycWECVrCvyogHjpnEMMEeNNfdhMTG CMsodUGV4wHzPUXkZHliNQYiYdl/6Eb2IB/xk37bQQSsY8SLuZEnHFsL3+J0+UgjHboO ePU+Ka6bSOc3gvwurc0xHiAUzVCFXRMWfew8oX23BNL+dIcnX8S38k5kkfv8lIW3yPy+ H0mVyIqBOQM849nLAMxdcBxm+grVOgLsu3H8CGO5IxJIZR4EF6nrpiIfs5NhQ2s4Q48S PwqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cn3si14505033edb.69.2021.02.08.13.21.18; Mon, 08 Feb 2021 13:21:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233332AbhBHVTj convert rfc822-to-8bit (ORCPT + 99 others); Mon, 8 Feb 2021 16:19:39 -0500 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:51784 "EHLO us-smtp-delivery-44.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236687AbhBHUK7 (ORCPT ); Mon, 8 Feb 2021 15:10:59 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-454-d9DOQLLgO3-FT5zLkoYL_A-1; Mon, 08 Feb 2021 15:10:06 -0500 X-MC-Unique: d9DOQLLgO3-FT5zLkoYL_A-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94259107ACE3; Mon, 8 Feb 2021 20:10:04 +0000 (UTC) Received: from krava.redhat.com (unknown [10.40.194.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5685419727; Mon, 8 Feb 2021 20:10:02 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Peter Zijlstra , Ingo Molnar , Mark Rutland , Namhyung Kim , Alexander Shishkin , Michael Petlan , Ian Rogers , Alexei Budankov Subject: [PATCH 20/24] perf tests: Add daemon reconfig test Date: Mon, 8 Feb 2021 21:09:04 +0100 Message-Id: <20210208200908.1019149-21-jolsa@kernel.org> In-Reply-To: <20210208200908.1019149-1-jolsa@kernel.org> References: <20210208200908.1019149-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jolsa@kernel.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset=WINDOWS-1252 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding test for daemon reconfiguration. The test changes the configuration file and checks that the session is changed properly. Signed-off-by: Jiri Olsa --- tools/perf/tests/shell/daemon.sh | 119 +++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/tools/perf/tests/shell/daemon.sh b/tools/perf/tests/shell/daemon.sh index 874e1fd77c7e..90a6e8caddfb 100755 --- a/tools/perf/tests/shell/daemon.sh +++ b/tools/perf/tests/shell/daemon.sh @@ -177,8 +177,127 @@ EOF rm -f ${config} } +test_reconfig() +{ + echo "test daemon reconfig" + + local config=$(mktemp /tmp/perf.daemon.config.XXX) + local base=$(mktemp -d /tmp/perf.daemon.base.XXX) + + # prepare config + cat < ${config} +[daemon] +base=BASE + +[session-size] +run = -e cpu-clock + +[session-time] +run = -e task-clock +EOF + + sed -i -e "s|BASE|${base}|" ${config} + + # start daemon + daemon_start ${config} size + + # check 2nd session + # pid:time:-e task-clock:base/time:base/time/output:base/time/control:base/time/ack:0 + local line=`perf daemon --config ${config} -x: | head -3 | tail -1` + check_line_other "${line}" time "-e task-clock" ${base}/session-time \ + ${base}/session-time/output ${base}/session-time/control ${base}/session-time/ack "0" + local pid=`echo "${line}" | awk 'BEGIN { FS = ":" } ; { print $1 }'` + + # prepare new config + local config_new=${config}.new + cat < ${config_new} +[daemon] +base=BASE + +[session-size] +run = -e cpu-clock + +[session-time] +run = -e cpu-clock +EOF + + # TEST 1 - change config + + sed -i -e "s|BASE|${base}|" ${config_new} + cp ${config_new} ${config} + + # wait for old session to finish + tail --pid=${pid} -f /dev/null + + # wait for new one to start + local state="FAIL" + while [ "${state}" != "OK" ]; do + state=`perf daemon ping --config ${config} --session time | awk '{ print $1 }'` + done + + # check reconfigured 2nd session + # pid:time:-e task-clock:base/time:base/time/output:base/time/control:base/time/ack:0 + local line=`perf daemon --config ${config} -x: | head -3 | tail -1` + check_line_other "${line}" time "-e cpu-clock" ${base}/session-time \ + ${base}/session-time/output ${base}/session-time/control ${base}/session-time/ack "0" + + # TEST 2 - empty config + + local config_empty=${config}.empty + cat < ${config_empty} +[daemon] +base=BASE +EOF + + # change config + sed -i -e "s|BASE|${base}|" ${config_empty} + cp ${config_empty} ${config} + + # wait for sessions to finish + local state="OK" + while [ "${state}" != "FAIL" ]; do + state=`perf daemon ping --config ${config} --session time | awk '{ print $1 }'` + done + + local state="OK" + while [ "${state}" != "FAIL" ]; do + state=`perf daemon ping --config ${config} --session size | awk '{ print $1 }'` + done + + local one=`perf daemon --config ${config} -x: | wc -l` + + if [ ${one} -ne "1" ]; then + echo "FAILED: wrong list output" + error=1 + fi + + # TEST 3 - config again + + cp ${config_new} ${config} + + # wait for size to start + local state="FAIL" + while [ "${state}" != "OK" ]; do + state=`perf daemon ping --config ${config} --session size | awk '{ print $1 }'` + done + + # wait for time to start + local state="FAIL" + while [ "${state}" != "OK" ]; do + state=`perf daemon ping --config ${config} --session time | awk '{ print $1 }'` + done + + # stop daemon + daemon_exit ${base} ${config} + + rm -rf ${base} + rm -f ${config} + rm -f ${config_new} + rm -f ${config_empty} +} error=0 test_list +test_reconfig exit ${error} -- 2.29.2