From patchwork Fri Dec 4 11:57:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1410990 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=ZOEv7Sj+; 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=mzG0V/f3; 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 4CnWVK0LlLz9sX1 for ; Fri, 4 Dec 2020 23:00:01 +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:References:In-Reply-To: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:List-Owner; bh=JfMQiPWIX+cfozBusstIrslSk0ScKepGfJjN7H6TXUo=; b=ZOEv7Sj++W/kPB8vDc+4o2tvRw KLMBE1SB6vjPh6kREsJiZ9HBO82sxJ7Bm1QNibRUNbeezDYeGrjPPJLDtDnG4WLjfezHdpds5wiaw n8BC13ZB/kiOIDtoOOXSxlrwTcawYgOHk7bH8utm28FVgbNf5u2Q1QiH8BEHHy+dc7KzaQmawN4ZA BOCumV5AkoryEtC7GOGpFjk6T6D+vuwPlz7FYYCL+Wo9h/xbKicEi9i8poeLh1/Xip+w4njOl4zE+ 1SeARvgtI7ve4AeqL86Q7uXJj621PGG9oBj36x5u/8txKJUrTa7uzxTLmy52PfFvRKKEQ8KDgFnj6 pD1RAwIw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kl9ib-0002xb-Ia; Fri, 04 Dec 2020 11:57:45 +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 1kl9iY-0002xC-Ip for openwrt-devel@lists.openwrt.org; Fri, 04 Dec 2020 11:57:43 +0000 Received: by mail-wm1-x341.google.com with SMTP id 3so6748817wmg.4 for ; Fri, 04 Dec 2020 03:57:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XfA4nUM61rlgIs74M/vqz2NsfhmYqVqoKQBnJD641TQ=; b=mzG0V/f3xhE0uXe2fS01vur9Ar4LtNTnxQBRBgmOukXSxWqUDDomACq/Z2foR0A934 poqyyxEzz3P223eYwxy5+UJzS2U2jii5MdhDSXAI4NqRbiWWoaeuQvhV1BkTs0VPCs24 1iARU0wCyG9gal9bnw2F/iNy+mqpL0TNz6Dk4RPcaOarzZUe/goDwBLJ9gHlU0fY7qol DLnTGJz9NwbCJtYnTcF9b8tECXem4x9Jet7AcHvkFbcfr9ogbu+4oUuRtlvDJCLJM9CL q5/75kxtdulnpqoSQdHAH75jBzVvsXWYDVu3l6wl260A740mDflIb+innItSVi9CJVlh VSvg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=XfA4nUM61rlgIs74M/vqz2NsfhmYqVqoKQBnJD641TQ=; b=idgFusw8XENmPTA7k9wQHa8tlSo6m0zdWn7mNT0g+yziCxSRRw86ePwyFxs84+0f/p G3TU0boDG4EQA3vdyeZVWqHCuicwwZ1knfBH5WBp7MYtoWN6Z0d+vRtW6SP6ICsp2nBf GLwl5ZjZZleSeHNq+avnsNcoT+GcPm2xwS72gHwgIzHRWbgWL25HyGSGHENpLnpEe10u JoSpc4c82l1g5dCOpJuGjZIjLHEs5a65YrlitYxnDFnqNwAznuwz1CI+vjKIfVH1CYDT FZ63xsXP4kQxg0nohcC4hA1JmVYx6k2uRPx1f9bNZRHHpetdOohoDG68vYLpqIhSCQCm rvag== X-Gm-Message-State: AOAM532H+wKtRwcUhL6htJAfdsFDlVmsql/1NPY0Eo4P7+myY9kMuCrR L8p/HF9a7NgYTEapzz5gSkvKfpRWrn4= X-Google-Smtp-Source: ABdhPJx+2SqwT5tKziUK1sSyV8ymasUnWKZTLZ2gzUJsc/Kz3Ei5/xZB3uJenFBEPgr66HD3wCxx1g== X-Received: by 2002:a1c:7c19:: with SMTP id x25mr3732636wmc.145.1607083061137; Fri, 04 Dec 2020 03:57:41 -0800 (PST) Received: from mamamia.internal (a89-183-82-101.net-htp.de. [89.183.82.101]) by smtp.gmail.com with ESMTPSA id c4sm3011630wmf.19.2020.12.04.03.57.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 03:57:36 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2] ltq-dsl-base: only lock the dsl pipe once for all stats Date: Fri, 4 Dec 2020 12:57:34 +0100 Message-Id: <20201204115734.31639-1-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201204074331.24639-1-a.heider@gmail.com> References: <20201204074331.24639-1-a.heider@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201204_065742_669423_D2C722B1 X-CRM114-Status: GOOD ( 10.78 ) 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 package/network/utils/ltq-dsl-base/Makefile | 2 +- .../files/lib/functions/lantiq_dsl.sh | 21 +++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/package/network/utils/ltq-dsl-base/Makefile b/package/network/utils/ltq-dsl-base/Makefile index e2cfc4004c..aae07bc299 100644 --- a/package/network/utils/ltq-dsl-base/Makefile +++ b/package/network/utils/ltq-dsl-base/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ltq-dsl-base -PKG_RELEASE:=2 +PKG_RELEASE:=3 include $(INCLUDE_DIR)/package.mk 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 39011f134f..89dc5c25c9 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 @@ -7,16 +7,24 @@ else XDSL_CTRL=dsl_cpe_control fi +DSL_PIPE_LOCKED=0 + # # Basic functions to send CLI commands to the vdsl_cpe_control daemon # +dsl_init() { + killall -q -0 ${XDSL_CTRL} && lock /var/lock/dsl_pipe && DSL_PIPE_LOCKED=1 + trap dsl_deinit EXIT INT KILL TERM +} +dsl_deinit() { + test $DSL_PIPE_LOCKED -gt 0 && lock -u /var/lock/dsl_pipe && DSL_PIPE_LOCKED=0 + exit +} 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 - ) + test $DSL_PIPE_LOCKED -eq 0 && return + + echo "$@" > /tmp/pipe/dsl_cpe0_cmd + cat /tmp/pipe/dsl_cpe0_ack } dsl_val() { expr "$1" : '.*'$2'=\([-\.[:alnum:]]*\).*' @@ -783,6 +791,7 @@ line_features() { } dslstat() { + dsl_init vendor chipset xtse