From nobody Mon Jul 08 17:48:24 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 4WHs6c48fvz5QG3J; Mon, 08 Jul 2024 17:48:24 +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 4WHs6c3LF9z4QL9; Mon, 8 Jul 2024 17:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720460904; 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=YComnYd/WrbbN3TUEM+ZRP5tRflo7vXVg0+/UI2XAzg=; b=mdFnsFg56XCvGCAtdbF3hj5ySU7VJrw79fz7cx+oJfyUPzV6EQGYslDiavZghz/wu4RIRG nr2S/q8kexqS5J+KHEHHTi/9wq7ROEWRgUGnkL2SXeaLzlW36h5IeFgWnamX0ftXEsLok3 KHfjrFEPmpCHxPWBb7WoLy2Gy2UvDyNpWQq4x2FlsMEyf4L36Ee4sCUNWr5MHINF9Q9Aks /rI9WsdOfU8qkCqcCvAMs1THM96q6V4HCm/etMGX0kjpldT2s3CNuPCMwatnmNfc9HOgmZ LoSTc2xVTbTSWbLi+UMrte4qXA392YOhRagcr7yWH6yDdWytNJ+f8ibMv24ASw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720460904; a=rsa-sha256; cv=none; b=xtwrd7ENPPtsH4Ke+4MvVQw+YUqHyEqPcVSovG/OyaQWND0POw9d6f7pu4ekCM474s9Nfx WiqwuHLW6L0nRO2QEB1k6WwmzP7Gc8elPkYOLJjc/fGHA5bLO00c11Fr2OeZ3arz5ir9Tj RsDqMfJb7kkVosXK9NL/8r05GZOmFXjz5vHOkHhUaOm5OZ8VKYkHC6eL30AwGAvMdvk379 SNTloNnTWZQ0PW3mzXHNQWl2lLdOTQiea7huqbykDj8phVUxlggHuIW1rFGc4YugAjhMhn Yi+qVXiwuheBqV5rMC9rpqJUEL5Iivz9D5H3Vaf8YWdkvyuADNjwMjMtCwTK7A== 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=1720460904; 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=YComnYd/WrbbN3TUEM+ZRP5tRflo7vXVg0+/UI2XAzg=; b=UlVbFvt8VrF3ZCZlKdEw7HXrMo4EHQAwq/J3WEcPyyMlpVlqjXimz+ypFsbfsch/ruLxfi o7Zek8ttIFLSiQSl+JVC0K7NxWN9cfnqsWCZ5clW50b8SJNHowuyCt64Q0eFRfLZNh84WN 38qpDYUwzNbai42nK+6+DNurQJXCDKojKrVjAFDOl0SNdHdqBNl3kp13GdKS5cFSqukbZO 8Mj6swC8QyzNXOD+kXzeU/Xx6O41rpsjKhO4iIixfaBJszK1egx8Ar6W83dPTfdIfXqxzd Qg5AyDvhjaRVyOZ+2BlOnwhZlQ4Yx0NwdnJ1IKS2nM2ubUpgDf50dKZlppC/aQ== 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 4WHs6c2qZqz11fn; Mon, 8 Jul 2024 17:48:24 +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 468HmOXd041036; Mon, 8 Jul 2024 17:48:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 468HmOb0041033; Mon, 8 Jul 2024 17:48:24 GMT (envelope-from git) Date: Mon, 8 Jul 2024 17:48:24 GMT Message-Id: <202407081748.468HmOb0041033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bea256f3c5b9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bea256f3c5b9d9608278377576047bf0e591a4e7 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bea256f3c5b9d9608278377576047bf0e591a4e7 commit bea256f3c5b9d9608278377576047bf0e591a4e7 Author: Mark Johnston AuthorDate: 2024-07-08 16:26:35 +0000 Commit: Mark Johnston CommitDate: 2024-07-08 16:26:35 +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 --- 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,