From 2e98a1bf774bc8516aa8027411a2fd511e52561c Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 17 Sep 2020 15:04:50 +0100 Subject: scripts/logger: Use new monotonic-ts tool 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 Signed-off-by: Laurent Pinchart --- scripts/logger.sh | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/scripts/logger.sh b/scripts/logger.sh index 97e1f58..75426a5 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 -- cgit v1.2.3