From nobody Sun Jul 24 11:01:43 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LrKxN0wLdz4XX09; Sun, 24 Jul 2022 11:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LrKxM67SWz3ZWh; Sun, 24 Jul 2022 11:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658660503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fhDHpTbxxwh8EJ580x4S9PEeUdhpznSI5nAPDGU1ls=; b=H5mx3U8h/bSOotn3M1KsGUjTsu6IQL0ehUpAUqoO5xUkqSHeAKhC8ibLXfZjjsiZvrlHxO BEIW4Y2dbU3N+oze9JZzhUAzvgmncXvSlTsBhAkONNqYkznsBnvFgLuZD7pgyF4qQ/5yU/ bozj/4yBujmOMua+cMUhrBNrqcZXGzvesv32V46MgU4D13fuGmQMQKufvq6C3vLcbYfHPa xzdB+nmaWdLWe7B5tQgL4YRN/AiiVZBsLh1WAG7TwqWRKr7bX+6XsYmy1TelCclUZhKlES KIgDlECDPMroNFRE7kWdplrSoB1HWU9o4YSlLC3MXZOavKkrWV1WhIl9/HXIfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LrKxM56R6zGBh; Sun, 24 Jul 2022 11:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26OB1h2J040674; Sun, 24 Jul 2022 11:01:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OB1hdk040673; Sun, 24 Jul 2022 11:01:43 GMT (envelope-from git) Date: Sun, 24 Jul 2022 11:01:43 GMT Message-Id: <202207241101.26OB1hdk040673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e2fae920c5bd - stable/13 - Fix unused variable warnings in hwpmc_mod.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e2fae920c5bdf6bf59f7ac2da8efd16c12b13987 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658660503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fhDHpTbxxwh8EJ580x4S9PEeUdhpznSI5nAPDGU1ls=; b=oxaFgjmaoP0bNXZgBO37yK1iDicIElL94J5pPKi6pHPaA1sVtXGoqFFZUJyryWAyCga6ct 7x+WjIxGQzOoGkJtQVE3kSaMzQ60icGztL2SgRoB9t9ii4kCq/HIeEqZztjJbdZgVbfid2 E6bJuC+b6dxxVC44XXcXL4X20+OJhbfDtxO6LDTujYzta3W/2W2ve2/zwgYrO+cfr5VtfY aG4aAxLuSqxYPNjO0N76HLEpgHbE87jzRCoBJnwRsaNGeMb8ml0e4zpMsEHS1fL371xkmD hfrJ5zBT6VMYl8VHSUR2HC4ArY62FAXt+Wl32cg7I6GaaKKWFhGeVNoMr09gNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658660503; a=rsa-sha256; cv=none; b=aEpaKpNf3coItBHP6cTzqEMfw45CkVDhFEc6pMzEJkMc45GzBg7PcRNxxgizWlxbjvYChS rIxw7MM3ZmjD9ARfJMmiLzHEd9Ln4AMbqaW5PWBSU7ocZ/84N5ZbfrKscjdqrZjYpT4J2q XqiCVvKUGYJzqzIXp1V83a7O4+yyl8zO4xbYl+GCLoRf/KLxaKFOVTgVscgqAIN+PTc6wC /8gL3w/hV2+mzSxzAfjl0gvXVJpGEHQCS8YTszwSERaNGRL6clzCci2HnX8eCOskXNVkwi JlyQNCIcGkbdr0CZLv2xi3ICkLdpdHnjln0qZa0UzYl6h+6Fy7/E/l2I73zSJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e2fae920c5bdf6bf59f7ac2da8efd16c12b13987 commit e2fae920c5bdf6bf59f7ac2da8efd16c12b13987 Author: Dimitry Andric AuthorDate: 2022-07-21 18:35:41 +0000 Commit: Dimitry Andric CommitDate: 2022-07-24 11:00:07 +0000 Fix unused variable warnings in hwpmc_mod.c With clang 15, the following -Werror warnings are produced: sys/dev/hwpmc/hwpmc_mod.c:4805:6: error: variable 'nfree' set but not used [-Werror,-Wunused-but-set-variable] int nfree; ^ sys/dev/hwpmc/hwpmc_mod.c:4804:6: error: variable 'ncallchains' set but not used [-Werror,-Wunused-but-set-variable] int ncallchains; ^ The 'nfree' and 'ncallchains' variables were used in KASSERTs, but these were removed due to refactoring in d9f1b8dbf29d. Remove the variables since they no longer serve any purpose. MFC after: 3 days (cherry picked from commit 38a9b8a00ce933e99b4a643cdcc3220be82e7d62) --- sys/dev/hwpmc/hwpmc_mod.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 50b4f3bc9d3b..47d0add3a383 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -4801,8 +4801,6 @@ pmc_capture_user_callchain(int cpu, int ring, struct trapframe *tf) uint64_t considx, prodidx; int nsamples, nrecords, pass, iter; #ifdef INVARIANTS - int ncallchains; - int nfree; int start_ticks = ticks; #endif psb = pmc_pcpu[cpu]->pc_sb[ring]; @@ -4812,10 +4810,6 @@ pmc_capture_user_callchain(int cpu, int ring, struct trapframe *tf) ("[pmc,%d] Retrieving callchain for thread that doesn't want it", __LINE__)); -#ifdef INVARIANTS - ncallchains = 0; - nfree = 0; -#endif nrecords = INT_MAX; pass = 0; restart: @@ -4834,13 +4828,8 @@ pmc_capture_user_callchain(int cpu, int ring, struct trapframe *tf) #ifdef INVARIANTS if (ps->ps_nsamples == PMC_SAMPLE_FREE) { - nfree++; continue; } - - if ((ps->ps_pmc == NULL) || - (ps->ps_pmc->pm_state != PMC_STATE_RUNNING)) - nfree++; #endif if (ps->ps_td != td || ps->ps_nsamples != PMC_USER_CALLCHAIN_PENDING || @@ -4871,10 +4860,6 @@ pmc_capture_user_callchain(int cpu, int ring, struct trapframe *tf) * as 'processable' by the timer tick sweep code. */ -#ifdef INVARIANTS - ncallchains++; -#endif - if (__predict_true(nsamples < pmc_callchaindepth - 1)) nsamples += pmc_save_user_callchain(ps->ps_pc + nsamples, pmc_callchaindepth - nsamples - 1, tf);