From nobody Tue Nov 11 12:08:16 2025 X-Original-To: dev-commits-src-main@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 4d5QKY0qmvz6GLW7; Tue, 11 Nov 2025 12:08:17 +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 4d5QKX5qnFz3byd; Tue, 11 Nov 2025 12:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862896; 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=hPGWrkfExSgQYsfR6JcwfO+jbwi8P/EUGhUmCb7Q9Go=; b=Eu+7xegYxCskR9nVd5CBMRuEjwbrnhFV4FytmX/adlEhTc1f6SffdXfycRFansLosr5IBT eipOoatzGY7eKygzOxR27ht/IcEZxSQ1FCPYiMl4FlaotwWMkUuvTfr+TY0E6y48pxJUSV /prbp0HADldJ8RE3A3OUxIpyJUoOh04VoKwGx6eBJiQ+cCoGFUNa+1UrNhzD3m9UDL36X5 nL2ga9uhAON6S34/UnCBeizmTHIwNyAPAYOaGZteIoA/PcFTnQIMzyI9EqVHQOilDR6TJs 1x3Ub7chHt7W33d8P2o7xqjbY63pj+lae6/XWCwolBqfiWAvgojmwoiSgxHBxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762862896; 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=hPGWrkfExSgQYsfR6JcwfO+jbwi8P/EUGhUmCb7Q9Go=; b=A/5p+oIDMF5EWxzeP9Cq0vw2MNaNPR9z+BbB2lfSKa9SF2yI0c4+ZPw8OMuVIJmJxkRe9g aWdOOKEV82bHhEHO+mMQ57RVrcXOVu+UNiKZymHkkeW/n9psmshTAudZGBD3B8QO950und m00pRNYli/p/sgZm9UOn3c8iVAIdQCo2sv9gMMl5J0zr0z2aJPYcfz0N18/J0pfY8JZ074 39pMh1Y76yDTuwD+dPLrcimXu6Lw7vDEEdQSTLze7v62lwMnhO0zhP5nh+IiEfJmYgkBlC RAnDYUtAwlwUVLc3wWJ/j4IMc+NaoTKb1O0vqpndj5zx8SD22vM6ODOhRRoniQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762862896; a=rsa-sha256; cv=none; b=T/AEpMLWaXNpAUK9XVfJrtiRfUHlZ7Li4hOKRuHrjfsZPI58vzagfr7rGzSzYMxHe8r70j +Ip5z1ze9G0kKNZCZ8zQVSvjgTXvdgmwbpGED2xn7IDe6BBpN9ehQprPNbCrwEubw730pJ CDrRoSrNOMSK7Axu2UgJq6pVcQ5o1BlCZV1SsyamQO/uZmt0ElDB8/UbDVesQ6qyTn1WGA 2HAxG97vK0zXe0Y5y1D1D19c8kGu6durcOaZvjR2JRm+HEE+AxJzx/6VRF52uQk1SFJAEn BEzXWW5Cwe/BIlzRzkpmc0yOlfG7wyPTFO6V9VpeWhF3KriuoC13kgqhYnk2xQ== 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 4d5QKX5Mt8z13cR; Tue, 11 Nov 2025 12:08:16 +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 5ABC8GxS035312; Tue, 11 Nov 2025 12:08:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ABC8GOX035309; Tue, 11 Nov 2025 12:08:16 GMT (envelope-from git) Date: Tue, 11 Nov 2025 12:08:16 GMT Message-Id: <202511111208.5ABC8GOX035309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: c24ca02c4c85 - main - sound: Retire feedertab_entry List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c24ca02c4c85d0b691a6100fd3006b1f23061858 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c24ca02c4c85d0b691a6100fd3006b1f23061858 commit c24ca02c4c85d0b691a6100fd3006b1f23061858 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:14 +0000 Commit: Christos Margiolis CommitDate: 2025-11-11 12:06:14 +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 --- 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 {