From nobody Mon Jul 15 13:39:16 2024 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 4WN3Fw6Jfsz5QyF9; Mon, 15 Jul 2024 13:39:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WN3Fw5hNMz4nq7; Mon, 15 Jul 2024 13:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721050756; 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=g4j0m2mY4O+EHGPVa0Sbkw6FkxczZkSaq4yjtByB4zs=; b=XcvQv99LHmg8KqZSaEQyFYiZzRKzrUOjY1Cuq1aaNdv+o5ICeA0mgUoSNN6WBL0F+SlfET RoNTdPtx5dFO87RHtqE9ox0al5Xiqw1z1SXfvv4K4+wuQyLUPi4x9Zddr4AczZKcT9h4O3 hNfQWSxOntN5FNd7vvPbd4o4p0X7R8tOQqbmZ4P+87kGYAOgYK7FSdq34CX28GyAiCqDg/ EXQ9dwgZSZixUbzZnkVT0T9U+HJfBfQbJUYnoBg7tKBr3CQyX4BPhKj7pDAkYhBPxqiF+z V0dSwgIWc5bt2E8xSnExCTAg1UFhIKKuaRWf0gOdEwQWMRfXbmhkecIgep3wtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721050756; a=rsa-sha256; cv=none; b=lwwUohRwMb2jS1/5rPx5BzXiK0/YFv+dGW8aH3tVwoFoj7w8FIfc59ATe7bVOQl04zkvA+ njM3PZ89WfFeLQyOnymZyz07OZzuntGOzvwEZCpiCH1RIx1zP5VhrQyEFRm2hgJQmoIgPk DezqXFARHpLYACEMmCeac+grN1m7ZQlMpoCbuFqFPKhgrj+ApOx/mrk/hBM2EVZ9vLok5b k+w5vvHsoh+zD2VHGvOl446yp6/4FWBx9dH6VFgeDWtVFu/FsadM71yXOTLqAKsSTHoHIw rArg0Qxb+ItBJOp0+18CZ5e16Qnj7fSDe4HuVsefG0jD+rrzDVMr0vksKeznTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721050756; 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=g4j0m2mY4O+EHGPVa0Sbkw6FkxczZkSaq4yjtByB4zs=; b=NfR0WNW/GBeACd5xEpnSutmKGo9I3oEa9/TrT5tfrcjTtHiz1CoH+l3FVQwHdPOdu0r4k/ vtsaDeWv863IY9eddqwVA4S9/3foTqxTjWgTGmx/3cvFg9kbeTE4Qe190q2ZXDYec7/vvS g31agFo8kB5b8HqfYs9HOLDD8zAW5gEhOR9X6km/sOOflgDqiYKiDlMCE6GNKiWrvgg2UR 3ucw8gsjB8YWiybx4plCXKPWAEFCmHRMvzvjWv0/GLCAGyhkXbAwOM68gVZj1BGkY7Z/pH 03ZfeH4Ja8AlTCMxf2G18MDcIkvTH/qI1Gt9QCE0CIVZuPqRr1xMWz3xgpQ6VQ== 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 4WN3Fw5B9czvWc; Mon, 15 Jul 2024 13:39: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 46FDdGhc063471; Mon, 15 Jul 2024 13:39:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FDdGNu063468; Mon, 15 Jul 2024 13:39:16 GMT (envelope-from git) Date: Mon, 15 Jul 2024 13:39:16 GMT Message-Id: <202407151339.46FDdGNu063468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7e32f871b7dd - stable/14 - taskqueue: Move the timeout_task definition to _task.h 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7e32f871b7dd522c2b1d649e8b9e4e7be9032b4a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7e32f871b7dd522c2b1d649e8b9e4e7be9032b4a commit 7e32f871b7dd522c2b1d649e8b9e4e7be9032b4a Author: Mark Johnston AuthorDate: 2024-07-08 16:26:35 +0000 Commit: Mark Johnston CommitDate: 2024-07-15 13:39:06 +0000 taskqueue: Move the timeout_task definition to _task.h So that timeout_task may be embedded into structures without pulling in too many other definitions. No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Stormshield (cherry picked from commit bea256f3c5b9d9608278377576047bf0e591a4e7) --- sys/sys/_task.h | 10 ++++++++++ sys/sys/taskqueue.h | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/sys/_task.h b/sys/sys/_task.h index 0e6f212990ec..86c68da8bab0 100644 --- a/sys/sys/_task.h +++ b/sys/sys/_task.h @@ -29,6 +29,7 @@ #ifndef _SYS__TASK_H_ #define _SYS__TASK_H_ +#include #include /* @@ -58,6 +59,15 @@ struct task { #define TASK_IS_NET(ta) ((ta)->ta_flags & TASK_NETWORK) +struct taskqueue; + +struct timeout_task { + struct taskqueue *q; + struct task t; + struct callout c; + int f; +}; + #ifdef _KERNEL typedef void gtask_fn_t(void *context); diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h index 34d64a5042a6..9757e1fce575 100644 --- a/sys/sys/taskqueue.h +++ b/sys/sys/taskqueue.h @@ -35,7 +35,6 @@ #include #include -#include #include struct taskqueue; @@ -43,13 +42,6 @@ struct taskqgroup; struct proc; struct thread; -struct timeout_task { - struct taskqueue *q; - struct task t; - struct callout c; - int f; -}; - enum taskqueue_callback_type { TASKQUEUE_CALLBACK_TYPE_INIT, TASKQUEUE_CALLBACK_TYPE_SHUTDOWN,