From patchwork Thu Sep 17 14:04:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 11782679 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C592139A for ; Thu, 17 Sep 2020 14:43:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E61B206DB for ; Thu, 17 Sep 2020 14:43:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="PD3RbaKy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727427AbgIQOXD (ORCPT ); Thu, 17 Sep 2020 10:23:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727215AbgIQOW7 (ORCPT ); Thu, 17 Sep 2020 10:22:59 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0708DC06121F for ; Thu, 17 Sep 2020 07:05:56 -0700 (PDT) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 75A60E42; Thu, 17 Sep 2020 16:04:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600351494; bh=KQBqnyxRO2sIlg6gyYJh95uWwBue81D65leYpMBntls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PD3RbaKyDsBCHdf4vEXOvOM0IWs/268Stusn3FjMMj0sky405W/bEclJfJPNZqmfP V+nad9w90lrydOLKqTYSoXSvnQ7rEbAHT7OBogpfFpUeTVuI/QodQZI9hLZAK7OZ/G LeyMO+8sptDH/KHZVIAxVBSwmg8uMlX/RZKbH4i0= From: Kieran Bingham To: Laurent Pinchart , linux-renesas-soc@vger.kernel.org Cc: Kieran Bingham Subject: [VSP-Tests PATCH v2 1/3] gen-lut: Update for python3 Date: Thu, 17 Sep 2020 15:04:48 +0100 Message-Id: <20200917140450.12264-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917140450.12264-1-kieran.bingham@ideasonboard.com> References: <20200917140450.12264-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Python2 has now gone end-of-life and is discontinued. Update the gen-lut utility to use python3 directly, converting xrange usages to range, and using bytearray to store the tables and write them directly removing the discontinued file object. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- data/frames/gen-lut.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/frames/gen-lut.py b/data/frames/gen-lut.py index 07889b11f4ac..335b9f1613bc 100755 --- a/data/frames/gen-lut.py +++ b/data/frames/gen-lut.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # SPDX-License-Identifier: GPL-2.0-or-later # SPDX-FileCopyrightText: 2016 Renesas Electronics Corporation @@ -49,26 +49,26 @@ def clu_value(x, y, z, scale, a, freq, weights): return (z, y, x, 0) def generate_clu(config): - clu = [] + clu = bytearray() - for z in xrange(17): - for y in xrange(17): - for x in xrange(17): + for z in range(17): + for y in range(17): + for x in range(17): clu.extend(clu_value(x, y, z, **config[1])) - file('clu-%s.bin' % config[0], 'wb').write(''.join([chr(c) for c in clu])) + open('clu-%s.bin' % config[0], 'wb').write(clu) def gamma(vin, gamma, scale): return int(255 * scale * math.pow(vin / 255., gamma)) def generate_lut(config): - lut = [] - for i in xrange(256): + lut = bytearray() + for i in range(256): lut.extend([gamma(i, g, config[1]) for g in config[2:]]) lut.append(0) - file('lut-%s.bin' % config[0], 'wb').write(''.join([chr(c) for c in lut])) + open('lut-%s.bin' % config[0], 'wb').write(lut) def main(argv): From patchwork Thu Sep 17 14:04:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 11782689 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF3F2618 for ; Thu, 17 Sep 2020 14:46:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7DA6720639 for ; Thu, 17 Sep 2020 14:46:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="a45pVR1V" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727312AbgIQOqb (ORCPT ); Thu, 17 Sep 2020 10:46:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727390AbgIQOW7 (ORCPT ); Thu, 17 Sep 2020 10:22:59 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AF28C061220 for ; Thu, 17 Sep 2020 07:06:59 -0700 (PDT) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D0D4AE89; Thu, 17 Sep 2020 16:04:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600351495; bh=Gu9H/xV3s6YCY19HKwLUdp3+Syo05ZN2xbzwE55stos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a45pVR1VsyzGTGVGUGJwsTD8X91bOtFnXnHuxP8eh1NedUCit6v8BwuzX+2h3XlRz y6CmKuXPVmPODKKsx5eK2eA/g5lL2dEyUqTHbkruOd3Hemn5NFpbiqWx1LS1mFWOO3 3/vUzmgEfXCxE2jVPAebJDD3ttGxYOBLrpo706nI= From: Kieran Bingham To: Laurent Pinchart , linux-renesas-soc@vger.kernel.org Cc: Kieran Bingham Subject: [VSP-Tests PATCH v2 2/3] src: monotonic-ts: Monotonic timestamp logging Date: Thu, 17 Sep 2020 15:04:49 +0100 Message-Id: <20200917140450.12264-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917140450.12264-1-kieran.bingham@ideasonboard.com> References: <20200917140450.12264-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Introduce a new utility which prefixes a monotonic timestamp rendered in the same format as the kernel logs to all lines fed in through stdin. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- v2: - Clean up Makefile - Use separate line for each installed binary - Remove blank line from c file src/Makefile | 9 +++++++-- src/monotonic-ts.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 src/monotonic-ts.c diff --git a/src/Makefile b/src/Makefile index d7f901f58be6..c40e95afca50 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,18 +7,23 @@ CFLAGS ?= -O0 -g -W -Wall -Wno-unused-parameter -Iinclude LDFLAGS ?= LIBS := -lm GEN-IMAGE := gen-image +MONOTONIC-TS := monotonic-ts %.o : %.c $(CC) $(CFLAGS) -c -o $@ $< -all: $(GEN-IMAGE) +all: $(GEN-IMAGE) $(MONOTONIC-TS) $(GEN-IMAGE): gen-image.o $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) +$(MONOTONIC-TS): monotonic-ts.o + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + clean: -rm -f *.o - -rm -f $(GEN-IMAGE) + -rm -f $(GEN-IMAGE) $(MONOTONIC_TS) install: cp $(GEN-IMAGE) $(INSTALL_DIR)/ + cp $(MONOTONIC-TS) $(INSTALL_DIR)/ diff --git a/src/monotonic-ts.c b/src/monotonic-ts.c new file mode 100644 index 000000000000..69a1809de1d1 --- /dev/null +++ b/src/monotonic-ts.c @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* SPDX-FileCopyrightText: 2020 Kieran Bingham */ + +#include +#include +#include + +int main(int argc, char ** argv) +{ + struct timespec tp; + char *line = NULL; + size_t size = 0; + const char *label = ""; + + if (argc > 1) + label = argv[1]; + + /* + * Explicitly set line buffering on stdin to be sure it is delivered + * in a timely fashion for our timestamping purposes when data is fed + * through a pipe. + */ + setlinebuf(stdin); + + do { + if (getline(&line, &size, stdin) <= 0) + break; + + clock_gettime(CLOCK_MONOTONIC, &tp); + printf("[%ld.%.9ld]%s %s", tp.tv_sec, tp.tv_nsec, label, line); + } while (!feof(stdin)); + + free(line); + + return 0; +} From patchwork Thu Sep 17 14:04:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 11782673 X-Patchwork-Delegate: kieran@bingham.xyz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E69BD618 for ; Thu, 17 Sep 2020 14:43:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7385206DB for ; Thu, 17 Sep 2020 14:43:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="dUiksMAR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727533AbgIQO3x (ORCPT ); Thu, 17 Sep 2020 10:29:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727459AbgIQO2U (ORCPT ); Thu, 17 Sep 2020 10:28:20 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4377C061221 for ; Thu, 17 Sep 2020 07:06:59 -0700 (PDT) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3F815FD1; Thu, 17 Sep 2020 16:04:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600351495; bh=+7sUnGZ68km0meTEvB8O1jKlI8Rh59owgpNCisitIns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dUiksMARFXCuahOKjFPCNOc+5g4PB8GhybVf0NlOcTm5uXUpdT+pLM1dzUE04zqj4 nxv9Uewa4IUzIuaDPW7v2SXVvtpTLro8LSujZgjo5jLbQ4f/SfmP9NEtebOg5n2Rhm qi4e0gMo1YnUDEcFwFYJNwMZz1h3cUacfb23QDMg= From: Kieran Bingham To: Laurent Pinchart , linux-renesas-soc@vger.kernel.org Cc: Kieran Bingham Subject: [VSP-Tests PATCH v2 3/3] scripts/logger: Use new monotonic-ts tool Date: Thu, 17 Sep 2020 15:04:50 +0100 Message-Id: <20200917140450.12264-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200917140450.12264-1-kieran.bingham@ideasonboard.com> References: <20200917140450.12264-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Utilise the new monotonic timestamping tool to remove the manual parsing of timestamps via /proc/timer_list which can only be read by root. This also simplifies the processing required and contains all timestamping actions within a single process space. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- v2: - Fix shellcheck issues scripts/logger.sh | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/scripts/logger.sh b/scripts/logger.sh index 97e1f582da2b..75426a51961a 100755 --- a/scripts/logger.sh +++ b/scripts/logger.sh @@ -2,23 +2,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later # SPDX-FileCopyrightText: 2016 Renesas Electronics Corporation -now() { - awk '/^now/ {time=$3; printf("[%u.%06u]", time / 1000000000, (time % 1000000000) / 1000) ; exit}' /proc/timer_list -} - label=${1:+ [$1]} TRACE_MARKER=/sys/kernel/debug/tracing/trace_marker -if [ -e $TRACE_MARKER ]; then - extra_log_files=$TRACE_MARKER +if [ -e $TRACE_MARKER ] && [ "$(id -u)" = 0 ]; then + ./monotonic-ts "$label" | tee -a $TRACE_MARKER +else + ./monotonic-ts "$label" fi - -while read line ; do - newline="$(now)$label $line" - - echo "$newline" - - for f in $extra_log_files; do - echo "$newline" >> $f; - done; -done