From patchwork Wed Mar 28 08:30:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 892016 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.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; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="T2n7yFxy"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="r3i0XutG"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40B1LX0rv6z9s08 for ; Wed, 28 Mar 2018 19:31:16 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=JvFxQK15BOvD/7j7pwGnu1pyVn0WDEKdWwN7dJ/ZPTw=; b=T2n7yFxyOtw5wO ZuISwZ6NwrxIsq6AXZloKczEQ1bb1wpcV5E1VUGYDHZpkSssUjYCyxACbwP8KfF4sUemZKE/F4w/2 1UeSJ6GrA6ExIN8VnYe0rklRl8A/9FrAZUAACiqY7NiiwU+RbL8i9T/dO+LVKgCksN5qOpTK67fv8 BlUtwPTOUCnF70JQ++PiHPxqF5a/3iRREv/GezEU0eNPMX6km8Hmon55XU8qnEvhH8EnIsIW38lhZ i9tfGSCACwPHWtb+3IhPg2Bc0pXma0+XoAyp9BJH6IWI21Tp4mX4licEvkN3Fe22P/KsOi1vYUgf0 Sl62D4tKjreb+igPs+qQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f16U4-0004ZX-Tp; Wed, 28 Mar 2018 08:31:04 +0000 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f16Th-00045S-Kt for lede-dev@lists.infradead.org; Wed, 28 Mar 2018 08:30:43 +0000 Received: by mail-lf0-x244.google.com with SMTP id v207-v6so2240804lfa.10 for ; Wed, 28 Mar 2018 01:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q5yuB8N05ppan9HPpwvhzoe7qf61OSPqVWlSLV5V1jM=; b=r3i0XutGeBord79RmGdhl7Rrel+GoeLzCRgnm9WB1f9oeXuC5+739shJ9X7ZvziDtQ 03DaTcxbteTYHU72+JZn6ysKIUWo7Q+0VeSovN7nZLGNTo6LQofM5nYPluQerDcHpir/ tMqzJV7HDZt01wZgLYO/W9gjjwL5SLuzPRV9bKzQwlyOK+B0+70//ki/XVQi/jwqRUZG 1vd/+mgVTjJqxHAX/cU/CPzdqtHFIQW1HHC0gDzJCVtTUg4hQJ3iFXtZVhJxJqmDPO8G i/Wcddz65i9siOWfX1hpwSGamw7rETRcw9tigZzQ1aebavudbKm/NPq54mEY3/AIKV2S A0gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q5yuB8N05ppan9HPpwvhzoe7qf61OSPqVWlSLV5V1jM=; b=HXnLMnnIlenTSfbCf0hzrbtElRtsufPAeAnypVGd+prF4xb1yCu7wkbVKRqF+C/G5W 8OWpNsRzhOxwWB6xuGQI0HIcCv/1wG9uZR7bPzTujx5/yEDPXFi2w6VwrlE7QYbdN4Uw QAhbePlM6grEYAx7Vbq2KOUtX+g1n/qZdn78EAMdYBtSx7xpW1cj4lHFDSdc/V4FFk40 xKEyMktswlDxbexnHGaVg37wf74UvYIH6415jQtZj9wOxUAtT2UrUWHuT4WUGibzjtBW J//tZgXzl7TFrC7aRItNGJgY67yspjZ10mCnDYZY8AO5vyd4N8xH1cqXabDO+qgW3pHr QuKQ== X-Gm-Message-State: AElRT7G5UJqExPB4Ye8VjXuZUjS7nxNXpoJTP4b0C4d4xWYKAxaXv5Ja AshY+BjfWXqTiSU6CrZbeys= X-Google-Smtp-Source: AIpwx4/lN9aVrNDAl19pXy1dbW69BCrRguynV/x4DCBOu2qkRwwSsn28qnxfjvLbj8M4z7wd+b3gLA== X-Received: by 10.46.64.26 with SMTP id n26mr1727002lja.50.1522225829565; Wed, 28 Mar 2018 01:30:29 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id 81sm524683ljz.67.2018.03.28.01.30.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Mar 2018 01:30:28 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Jo-Philipp Wich , lede-dev@lists.infradead.org Date: Wed, 28 Mar 2018 10:30:07 +0200 Message-Id: <20180328083007.1876-1-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180328_013041_733731_D819D9FF X-CRM114-Status: GOOD ( 14.69 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4010:c07:0:0:0:244 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 (zajec5[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH iwinfo] nl80211: fix code calculating average signal and rate X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Rafał Miłecki Using average of previous average and the next value is highly imprecise. E.g. for values 20, 20, 20, 180 it would result in /average/ of 100 (instead of 60). Fix it by storing & using an info of how many samples were used for the previous calculation. Signed-off-by: Rafał Miłecki --- iwinfo_nl80211.c | 14 +++++++------- iwinfo_nl80211.h | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c index 738e2f5..de5d2b4 100644 --- a/iwinfo_nl80211.c +++ b/iwinfo_nl80211.c @@ -1279,7 +1279,8 @@ static int nl80211_fill_signal_cb(struct nl_msg *msg, void *arg) if (sinfo[NL80211_STA_INFO_SIGNAL]) { dbm = nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]); - rr->rssi = rr->rssi ? (int8_t)((rr->rssi + dbm) / 2) : dbm; + rr->rssi = (rr->rssi * rr->rssi_samples + dbm) / (rr->rssi_samples + 1); + rr->rssi_samples++; } if (sinfo[NL80211_STA_INFO_TX_BITRATE]) @@ -1291,8 +1292,8 @@ static int nl80211_fill_signal_cb(struct nl_msg *msg, void *arg) if (rinfo[NL80211_RATE_INFO_BITRATE]) { mbit = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]); - rr->rate = rr->rate - ? (int16_t)((rr->rate + mbit) / 2) : mbit; + rr->rate = (rr->rate * rr->rate_samples + mbit) / (rr->rate_samples + 1); + rr->rate_samples++; } } } @@ -1307,8 +1308,7 @@ static void nl80211_fill_signal(const char *ifname, struct nl80211_rssi_rate *r) DIR *d; struct dirent *de; - r->rssi = 0; - r->rate = 0; + memset(r, 0, sizeof(*r)); if ((d = opendir("/sys/class/net")) != NULL) { @@ -1333,7 +1333,7 @@ static int nl80211_get_bitrate(const char *ifname, int *buf) nl80211_fill_signal(ifname, &rr); - if (rr.rate) + if (rr.rate_samples) { *buf = (rr.rate * 100); return 0; @@ -1348,7 +1348,7 @@ static int nl80211_get_signal(const char *ifname, int *buf) nl80211_fill_signal(ifname, &rr); - if (rr.rssi) + if (rr.rssi_samples) { *buf = rr.rssi; return 0; diff --git a/iwinfo_nl80211.h b/iwinfo_nl80211.h index 566ffce..2dff08b 100644 --- a/iwinfo_nl80211.h +++ b/iwinfo_nl80211.h @@ -59,7 +59,9 @@ struct nl80211_group_conveyor { struct nl80211_rssi_rate { int16_t rate; + int rate_samples; int8_t rssi; + int rssi_samples; }; struct nl80211_array_buf {