From nobody Fri Dec 17 11:38:58 2021 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 4082B18EEB2F; Fri, 17 Dec 2021 11:39:00 +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 4JFn7R1N3Hz4kL5; Fri, 17 Dec 2021 11:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DF2DB1AC7B; Fri, 17 Dec 2021 11:38:58 +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 1BHBcw3i073810; Fri, 17 Dec 2021 11:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BHBcwF0073809; Fri, 17 Dec 2021 11:38:58 GMT (envelope-from git) Date: Fri, 17 Dec 2021 11:38:58 GMT Message-Id: <202112171138.1BHBcwF0073809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 959af5a89b20 - main - sys: make callout.h self-contained 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 959af5a89b205dce41405ec1a52078c7acaca49b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639741139; 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=Kh6IIVPCivyoh9w/DWGOVehdSkG0B8oRDLPMVKMweoM=; b=QJ+FGWTvWTHRmxB54TQQGoLd8giGapmPETFYm+U1s3SZiJjClXfIwKrq9uq4Qg/Cmoh+O0 nKSvwhckPwYv+MqJvJzKtLsVbv18IoVd4x7pnT1MUtdjbti0NUmfIAKyvMjzZWLz+GsjrQ V839DcuHb7GIM5TrdXPphhyLIuNBMq1x+F+DkgtK3N8eJRNPjJsSRolOoaDKEcO8oS2wYy 1wR2D7lieaxuTVDNXF/HanKC5BFeUJyVCMt7YPdXpc2QwRU8dI55kvznZk/p0ECjrY79rX XiC65AGzS64PfkMwS2P3QhmKqbI7Ld9oUnK30Mqj7rfVfJgEHy60Fhg9jSQ2EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639741139; a=rsa-sha256; cv=none; b=VuVQdhGobRhJ6cW1pSFBrxD8Lc1ml2oGcHuEaCP7ns8LHbhUqPqcy8VYR6YFvZ17+yS94w FhOC5t/7VOlgomngVO5J1KO+2ebzC91dfdnQb8dd5B/ciZBs1KJvUpDcNawbkZnd+RRZ/W rTDTBj+GRLG7prl7hSsLf5QDOC2ITz5n11zqlg4jMFcg0VslWPyuYG0s4Apiunqi9Mh2FU TVf9cJh0sBw7Zy318iIk2LarGA1YfmbcsxFBy7Dg6Jq+jgKY0ifwicJVE4I1uREJHsfZEX wmnNNIjYjxPYx2+uNmsiEBfz5KmHp/qx0zAaF4zNHPNxW9Di+XCuKSVxOQNiLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=959af5a89b205dce41405ec1a52078c7acaca49b commit 959af5a89b205dce41405ec1a52078c7acaca49b Author: Kristof Provost AuthorDate: 2021-12-15 19:22:41 +0000 Commit: Kristof Provost CommitDate: 2021-12-17 11:38:34 +0000 sys: make callout.h self-contained Avoid including sys/types.h from sys/_callout.h (as we try to avoid having headers starting with underscores depending on non-underscore headers) by introducing __sbintime_t in sys/_types.h and including that header instead. Reviewed by: imp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D33500 --- sys/sys/_callout.h | 5 +++-- sys/sys/_types.h | 1 + sys/sys/types.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/sys/_callout.h b/sys/sys/_callout.h index 1108d8ad74fd..468286ff9fec 100644 --- a/sys/sys/_callout.h +++ b/sys/sys/_callout.h @@ -40,6 +40,7 @@ #ifndef _SYS__CALLOUT_H #define _SYS__CALLOUT_H +#include #include struct lock_object; @@ -56,8 +57,8 @@ struct callout { SLIST_ENTRY(callout) sle; TAILQ_ENTRY(callout) tqe; } c_links; - sbintime_t c_time; /* ticks to the event */ - sbintime_t c_precision; /* delta allowed wrt opt */ + __sbintime_t c_time; /* ticks to the event */ + __sbintime_t c_precision; /* delta allowed wrt opt */ void *c_arg; /* function argument */ callout_func_t *c_func; /* function to call */ struct lock_object *c_lock; /* lock to handle */ diff --git a/sys/sys/_types.h b/sys/sys/_types.h index 1669111a437c..46711a938bc4 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -133,6 +133,7 @@ typedef __uint64_t __nlink_t; /* link count */ typedef __int64_t __off_t; /* file offset */ typedef __int64_t __off64_t; /* file offset (alias) */ typedef __int32_t __pid_t; /* process [group] */ +typedef __int64_t __sbintime_t; typedef __int64_t __rlim_t; /* resource limit - intentionally */ /* signed, because of legacy code */ /* that uses -1 for RLIM_INFINITY */ diff --git a/sys/sys/types.h b/sys/sys/types.h index 58abcf00cebb..66f11aa3e31d 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -193,7 +193,7 @@ typedef __rlim_t rlim_t; /* resource limit */ #define _RLIM_T_DECLARED #endif -typedef __int64_t sbintime_t; +typedef __sbintime_t sbintime_t; typedef __segsz_t segsz_t; /* segment size (in pages) */