From 7f41115ef69fe190a1b17d812ec5c091d3e6ec40 Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 21 Jul 2008 15:05:25 +0000
Subject: [PATCH] Implement the following macros for completeness:

	SYSCTL_QUAD()
	SYSCTL_ADD_QUAD()
	TUNABLE_QUAD()
	TUNABLE_QUAD_FETCH()

Now we can use 64bit tunables on 32bit systems.
---
 share/man/man9/sysctl.9         |  7 +++++--
 share/man/man9/sysctl_add_oid.9 | 14 ++++++++++++++
 sys/kern/kern_environment.c     |  8 ++++++++
 sys/sys/kernel.h                | 19 +++++++++++++++++++
 sys/sys/sysctl.h                |  9 +++++++++
 5 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9
index fe346687c373..547c8cc940e0 100644
--- a/share/man/man9/sysctl.9
+++ b/share/man/man9/sysctl.9
@@ -40,7 +40,8 @@
 .Nm SYSCTL_UINT ,
 .Nm SYSCTL_ULONG ,
 .Nm SYSCTL_XINT ,
-.Nm SYSCTL_XLONG
+.Nm SYSCTL_XLONG ,
+.Nm SYSCTL_QUAD
 .Nd Static sysctl declaration functions
 .Sh SYNOPSIS
 .In sys/types.h
@@ -57,6 +58,7 @@
 .Fn SYSCTL_ULONG parent nbr name access ptr val descr
 .Fn SYSCTL_XINT parent nbr name access ptr val descr
 .Fn SYSCTL_XLONG parent nbr name access ptr val descr
+.Fn SYSCTL_QUAD parent nbr name access ptr val descr
 .Sh DESCRIPTION
 The
 .Nm SYSCTL
@@ -83,8 +85,9 @@ New nodes are declared using one of
 .Fn SYSCTL_UINT ,
 .Fn SYSCTL_ULONG ,
 .Fn SYSCTL_XINT ,
+.Fn SYSCTL_XLONG ,
 and
-.Fn SYSCTL_XLONG .
+.Fn SYSCTL_QUAD .
 Each macro accepts a parent name, as declared using
 .Fn SYSCTL_DECL ,
 an OID number, typically
diff --git a/share/man/man9/sysctl_add_oid.9 b/share/man/man9/sysctl_add_oid.9
index 41de908d3e89..43f3112a4d09 100644
--- a/share/man/man9/sysctl_add_oid.9
+++ b/share/man/man9/sysctl_add_oid.9
@@ -147,6 +147,16 @@
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_QUAD
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int access"
+.Fa "int64_t *arg"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_OPAQUE
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
@@ -430,6 +440,10 @@ variable.
 creates an oid that handles an
 .Li unsigned long
 variable.
+.It Fn SYSCTL_ADD_QUAD
+creates an oid that handles an
+.Li int64_t
+variable.
 .It Fn SYSCTL_ADD_OPAQUE
 creates an oid that handles any chunk of opaque data
 of the size specified by the
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 34b1eecefd2d..a5658cace2dc 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -563,6 +563,14 @@ tunable_ulong_init(void *data)
 	TUNABLE_ULONG_FETCH(d->path, d->var);
 }
 
+void
+tunable_quad_init(void *data)
+{
+	struct tunable_quad *d = (struct tunable_quad *)data;
+
+	TUNABLE_QUAD_FETCH(d->path, d->var);
+}
+
 void
 tunable_str_init(void *data)
 {
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 951d6bca8c0b..e491c6e9466d 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -329,6 +329,25 @@ struct tunable_ulong {
 
 #define	TUNABLE_ULONG_FETCH(path, var)	getenv_ulong((path), (var))
 
+/*
+ * quad
+ */
+extern void tunable_quad_init(void *);
+struct tunable_quad {
+	const char *path;
+	quad_t *var;
+};
+#define	TUNABLE_QUAD(path, var)					\
+	static struct tunable_quad __CONCAT(__tunable_quad_, __LINE__) = { \
+		(path),						\
+		(var),						\
+	};							\
+	SYSINIT(__CONCAT(__Tunable_init_, __LINE__),		\
+	    SI_SUB_TUNABLES, SI_ORDER_MIDDLE, tunable_quad_init, \
+	    &__CONCAT(__tunable_quad_, __LINE__))
+
+#define	TUNABLE_QUAD_FETCH(path, var)	getenv_quad((path), (var))
+
 extern void tunable_str_init(void *);
 struct tunable_str {
 	const char *path;
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index ebd83e7ba300..bec41c05260d 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -294,6 +294,15 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
 	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_ULONG|(access),	    \
 	ptr, 0, sysctl_handle_long, "LX", __DESCR(descr))
 
+/* Oid for a quad.  The pointer must be non NULL. */
+#define SYSCTL_QUAD(parent, nbr, name, access, ptr, val, descr) \
+	SYSCTL_OID(parent, nbr, name, CTLTYPE_QUAD|(access), \
+		ptr, val, sysctl_handle_quad, "Q", __DESCR(descr))
+
+#define SYSCTL_ADD_QUAD(ctx, parent, nbr, name, access, ptr, descr)	    \
+	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_QUAD|(access),	    \
+	ptr, 0, sysctl_handle_quad, "Q", __DESCR(descr))
+
 /* Oid for an opaque object.  Specified by a pointer and a length. */
 #define SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr) \
 	SYSCTL_OID(parent, nbr, name, CTLTYPE_OPAQUE|(access), \