From nobody Tue Nov 18 00:52:06 2025 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 4d9R0666dhz6HH0b; Tue, 18 Nov 2025 00:52:06 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R062bQHz3yDh; Tue, 18 Nov 2025 00:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427126; 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=zxk6P9CCFJhxTkzwz6wTPUVMRbSdZWqaRij3bLFs/K8=; b=PXtedD/lRewcAP5eDnnW6E0IW6pdlgWrZ6VrE5w7S00TMPVnVYGF1MkPCnkCquhEkotcSF hIvlh/+w+bnpFeREbDdXGu5IBJ4N7BeODVUGqo+JW9NZxV0RP9OY7KcMXiP4+na37jMRij BpGxYG24yjEKQyIKq1Tn1SbyeWAPMnXoUsm2hLg4v0jy10bV9P+CzoRXMezP4uWvwGq7Ot pOtXYKNaj4VfHBTGx3HX01z+mim3+jWwq+a8C0VZzG8LKLFirktDX9QYo4GfhZgZE8UvcB OEKLn5ZmPmowwWSEyEq8mAltooPElKp0jMggz+jBDAwqQVeRLdppnQ3jNEUWuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427126; 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=zxk6P9CCFJhxTkzwz6wTPUVMRbSdZWqaRij3bLFs/K8=; b=Zu93qvVXajA4wH2PQmkmVnH848D41THnbEk7EkWvv/fX/6E23qw2NQZcX7n6tqLAhKKwHo Dvjq5kAEFqzr4lX5xnhTVFo96kz+1GwcAc4f14uBqmMfhF0EGSxEAyohxvVeatloaTnSZF n1HxHsMDJuBIhFIng9GynGj7MpJOotdjvNnR4Ku7CWHztARA0B2WCwv9iQaBBoAEV2dwdz rbp4IUfLPAkHC8dqBiJPeFZQ7rh4O8mwM6MWhnPdxQnYpBlA77JDLGzy/7FwXgdlVmzOdf eyce4r4QwPvpAVU6FzBZkfSkrPNrbPCCxFlLMB83GYP0bdQNZhiKgGVBRMaR+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427126; a=rsa-sha256; cv=none; b=JOgUInqTt2wc6ERlUowBtwcXrYpZP2SxU4Q59CDf+FF/29amQNOrn7b4ULQHwCdSKcWRO+ FI7/pvZxtBv4SbjqTFITZhdLpAHwqLIwgo9zHgjor7L6Yi+xsgA5dTwxY7/XvUPrQAK8KI C2kA4qfcBZsCnPLnJhY7YYQOuXEEAlIA3J7ZE1iDuDKqI9mWDfxwTtAEg2WD++Cd+QzIHY syhtteObWtSKBH2TvdjpMI9Dpnt0MatlR8gW++e/YWv8ak3P4SuNPHmJt68tEc9bYHRTPs 5+d+ZBS9YpkeAEGbVlwLY6AO0QOWse5RvOLETs0Yh5XtuWp80xYYR2NyQJIbxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d9R061mczzXdb; Tue, 18 Nov 2025 00:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AI0q6xD046078; Tue, 18 Nov 2025 00:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0q6ZE046075; Tue, 18 Nov 2025 00:52:06 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:06 GMT Message-Id: <202511180052.5AI0q6ZE046075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2acd16ce68be - stable/15 - sound: Retire feedertab_entry 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2acd16ce68be04755508d63c05d3eb15a5916c6f Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2acd16ce68be04755508d63c05d3eb15a5916c6f commit 2acd16ce68be04755508d63c05d3eb15a5916c6f Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:14 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:23 +0000 sound: Retire feedertab_entry Have an SLIST of feeder_class directly. This way we simplify the code, and also avoid the additional malloc()/free() for each entry. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53554 (cherry picked from commit c24ca02c4c85d0b691a6100fd3006b1f23061858) --- sys/dev/sound/pcm/feeder.c | 37 +++++++++---------------------------- sys/dev/sound/pcm/feeder.h | 1 + 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index e818ed4a1a5d..6f7b225af3b9 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -41,53 +41,34 @@ static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); -struct feedertab_entry { - SLIST_ENTRY(feedertab_entry) link; - struct feeder_class *feederclass; -}; -static SLIST_HEAD(, feedertab_entry) feedertab; - -/*****************************************************************************/ +static SLIST_HEAD(, feeder_class) feedertab; static void feeder_register_root(void *p) { struct feeder_class *fc = p; - struct feedertab_entry *fte; KASSERT(fc->desc.type == FEEDER_ROOT, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); - fte->feederclass = fc; - SLIST_INSERT_HEAD(&feedertab, fte, link); + SLIST_INSERT_HEAD(&feedertab, fc, link); } void feeder_register(void *p) { struct feeder_class *fc = p; - struct feedertab_entry *fte; KASSERT(fc->desc.type != 0, ("feeder '%s' has no descriptor", fc->name)); - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); - fte->feederclass = fc; - SLIST_INSERT_HEAD(&feedertab, fte, link); + SLIST_INSERT_HEAD(&feedertab, fc, link); } static void -feeder_unregisterall(void *p) +feeder_unregisterall(void *p __unused) { - struct feedertab_entry *fte, *next; - - next = SLIST_FIRST(&feedertab); - while (next != NULL) { - fte = next; - next = SLIST_NEXT(fte, link); - free(fte, M_FEEDER); - } + SLIST_INIT(&feedertab); } static void @@ -135,11 +116,11 @@ feeder_create(struct feeder_class *fc, struct pcm_feederdesc *desc) struct feeder_class * feeder_getclass(u_int32_t type) { - struct feedertab_entry *fte; + struct feeder_class *fc; - SLIST_FOREACH(fte, &feedertab, link) { - if (fte->feederclass->desc.type == type) - return (fte->feederclass); + SLIST_FOREACH(fc, &feedertab, link) { + if (fc->desc.type == type) + return (fc); } return (NULL); } diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index e883083f7504..5ac92bf13735 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -36,6 +36,7 @@ struct feeder_class { KOBJ_CLASS_FIELDS; struct pcm_feederdesc desc; void *data; + SLIST_ENTRY(feeder_class) link; }; struct pcm_feeder {