From patchwork Fri Dec 4 13:32:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1411036 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=SqrNd4NQ; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=pU1FjAs8; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CnYbB62S0z9sWj for ; Sat, 5 Dec 2020 00:34:30 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=mXqNkETa7CzxrOOKrF575cGdw3XZ8UiOnwqFuJTbgHI=; b=SqrNd4NQsCOMPlrcS1SCIfHCnX OaPiupqEY8bq/eUCQKe0/2GBy0z3743LprHxyKVcyuv9JjGYGaiFJpj5adoxF2gaW+/D4SldJaq46 0MUnKmtp9iHOim4rwCqW+//SrR926UUIgCeS6VclO8tuiD+uYNa7u5x96+7i+8kZb6jrapbROb4Vb OGzM05PLqfskA7DpVB9ePSK2zbiaPTeOLNWG3VTOF8YzSbKavEkRyX0dD1d52UV7TYYymHHOtJgzS aruJQaENh2pEHxV6DIYPZdRGeN8eaEFVOEe05P8ppdt7TvkFoZSIxNGsG31WF+xh8S2tjmZOHZN9a +FL7vrjQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1klBCg-0005Yq-Gn; Fri, 04 Dec 2020 13:32:54 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1klBCe-0005Y8-3z for openwrt-devel@lists.openwrt.org; Fri, 04 Dec 2020 13:32:52 +0000 Received: by mail-wm1-x341.google.com with SMTP id w206so4730892wma.0 for ; Fri, 04 Dec 2020 05:32:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=uO4fhr+3rmYiNFXcprIfFikG0MQROl2MJu5lJ2WtljE=; b=pU1FjAs8gL2iFuzLAtbDTjkBYLEPv1zK5zflHkFcGDd4taTcaB+gna7j7peYtp2X8R mymfMVvhmMOSqIdFZqJDc03PJe8vtWQs+l21uUOaIDvMf0/S4TdvNfSE2dKHxfZSGS0s 6nZA6XXBacisZrwJLp/NquN8BVtOFpOb3PcRd9WMWvAjIs+QGkrzXRQzgYhRGoY+vITA 1S7JcQedQNngh6ESV/q00GC8zPaqOCClkB4+q9DrOIxepLiEYRKKlL/52c83FHswPD5S kp+SSxWEiughIfV2cD8NcP9pJx6pie46Vve9m9EFF28a4xS9H0ooFwoQ1FT+5J79zlH2 48Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=uO4fhr+3rmYiNFXcprIfFikG0MQROl2MJu5lJ2WtljE=; b=GXAMBE9INp7spDAxxoiZTU79prEtKr4/EVowkpbyFzCRXQhNCVslH7pjG6zde5KpEv zitR9UzaV050xbC7FiRWAmVz7ml9PWpDEQRnZv68G0XCFH0cNd619ZKuPfBgQxjPWRhO h7tbRhWkaKUTsyT8nQ+y23IGj7vuzXIfeLsYekKQ2mx4HlgRSv5b5lhUaVlzJY3q6tW8 vTSchDHVdlIvzExnahoNHE3MGxcsffIY5NTHxTpEiY+rmrDM0KN69X9aBe4o5ix1KK7V 6aeyrIQCXI5NZOFw25iN4+dfVAr88RuGdtR0M+F2zSegahmFPWQfu7NQCrjngGfBQubm j4+A== X-Gm-Message-State: AOAM532+E07ZasTWEle99kIMxGfBPRoNtfXumY0+RgYkfrKLYeHCp7kv QhDJY/fXMGrmU7OdEUAxB3EBXcr5WLM= X-Google-Smtp-Source: ABdhPJws5jhhQNTS9EC4tUkA06u5vujgehCmVVV0bXrgv2IIR2EXHn5a5Kv3/J1nwwb43uWABcitag== X-Received: by 2002:a1c:27c4:: with SMTP id n187mr4162061wmn.157.1607088770867; Fri, 04 Dec 2020 05:32:50 -0800 (PST) Received: from mamamia.internal (a89-183-82-101.net-htp.de. [89.183.82.101]) by smtp.gmail.com with ESMTPSA id x9sm3621288wru.55.2020.12.04.05.32.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 05:32:48 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH v3 1/3] ltq-dsl-base: only lock the dsl pipe once for all stats Date: Fri, 4 Dec 2020 14:32:45 +0100 Message-Id: <20201204133247.35877-1-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201204_083252_197429_2A9E608A X-CRM114-Status: GOOD ( 10.18 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Instead of locking/unlocking it for every command. Reduces the runtime for the dslstat/lucistat commands to ~66%. Before: real 0m 2.66s user 0m 0.90s sys 0m 1.76s After: real 0m 1.76s user 0m 0.63s sys 0m 1.13s Signed-off-by: Andre Heider --- v2: bump PKG_RELEASE v3: use flock style suggested by Jo, bump release in different patch .../files/lib/functions/lantiq_dsl.sh | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh b/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh index 5842a7879f..1a28633c79 100755 --- a/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh +++ b/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh @@ -11,12 +11,8 @@ fi # Basic functions to send CLI commands to the vdsl_cpe_control daemon # dsl_cmd() { - killall -q -0 ${XDSL_CTRL} && ( - lock /var/lock/dsl_pipe - echo "$@" > /tmp/pipe/dsl_cpe0_cmd - cat /tmp/pipe/dsl_cpe0_ack - lock -u /var/lock/dsl_pipe - ) + echo "$@" > /tmp/pipe/dsl_cpe0_cmd + cat /tmp/pipe/dsl_cpe0_ack } dsl_val() { expr "$1" : '.*'$2'=\([-\.[:alnum:]]*\).*' @@ -729,17 +725,22 @@ profile() { } dslstat() { - vendor - chipset - xtse - profile - line_state - errors - power_mode - latency_delay - data_rates - line_data - line_uptime + killall -q -0 ${XDSL_CTRL} || exit 1 + ( + flock -x 323 + + vendor + chipset + xtse + profile + line_state + errors + power_mode + latency_delay + data_rates + line_data + line_uptime + ) 323> /var/lock/dsl_pipe } lucistat() {