Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Jan 2011 10:35:08 -0800
From:      mdf@FreeBSD.org
To:        src-committers@freebsd.org, svn-src-all@freebsd.org,  svn-src-head@freebsd.org
Subject:   Re: svn commit: r217369 - in head/sys: cam/scsi sys
Message-ID:  <AANLkTinh619WaGgq=5fFxTvEX0JPir34k8xb%2Bs6oSH8Y@mail.gmail.com>
In-Reply-To: <201101131820.p0DIKXip059402@svn.freebsd.org>
References:  <201101131820.p0DIKXip059402@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
There appear to be 330 uses of SYSCTL and QUAD on the same line in
CURRENT.  This seems reasonable to change them to S64, U64 and X64 so
they correctly reflect the size they operate upon.

What do y'all think?

Thanks,
matthew

On Thu, Jan 13, 2011 at 10:20 AM, Matthew D Fleming <mdf@freebsd.org> wrote=
:
> Author: mdf
> Date: Thu Jan 13 18:20:33 2011
> New Revision: 217369
> URL: http://svn.freebsd.org/changeset/base/217369
>
> Log:
> =A0Add a 64-bit hex-printed sysctl(9) since there is at least one place i=
n
> =A0the code that wanted it. =A0It is named X64 rather than XQUAD since th=
e
> =A0quad name is a historical abomination that should not be perpetuated.
>
> Modified:
> =A0head/sys/cam/scsi/scsi_da.c
> =A0head/sys/sys/sysctl.h
>
> Modified: head/sys/cam/scsi/scsi_da.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/cam/scsi/scsi_da.c Thu Jan 13 18:20:27 2011 =A0 =A0 =A0 =A0(=
r217368)
> +++ head/sys/cam/scsi/scsi_da.c Thu Jan 13 18:20:33 2011 =A0 =A0 =A0 =A0(=
r217369)
> @@ -1127,9 +1127,9 @@ dasysctlinit(void *context, int pending)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct ccb_trans_settings_fc *fc =3D &cts.=
xport_specific.fc;
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (fc->valid & CTS_FC_VALID_WWPN) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0softc->wwpn =3D fc->wwpn;
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 SYSCTL_ADD_XLONG(&softc->sy=
sctl_ctx,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 SYSCTL_ADD_X64(&softc->sysc=
tl_ctx,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0SYSCTL_CHILDREN(so=
ftc->sysctl_tree),
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 OID_AUTO, "wwpn", C=
TLTYPE_QUAD | CTLFLAG_RD,
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 OID_AUTO, "wwpn", C=
TLFLAG_RD,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&softc->wwpn, "Wor=
ld Wide Port Name");
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
> =A0 =A0 =A0 =A0}
>
> Modified: head/sys/sys/sysctl.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/sys/sysctl.h =A0 =A0 =A0 Thu Jan 13 18:20:27 2011 =A0 =A0 =
=A0 =A0(r217368)
> +++ head/sys/sys/sysctl.h =A0 =A0 =A0 Thu Jan 13 18:20:33 2011 =A0 =A0 =
=A0 =A0(r217369)
> @@ -245,6 +245,8 @@ SYSCTL_ALLOWED_TYPES(ULONG, unsigned lon
> =A0SYSCTL_ALLOWED_TYPES(XLONG, unsigned long *a; long *b; );
> =A0SYSCTL_ALLOWED_TYPES(INT64, int64_t *a; long long *b; );
> =A0SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a; unsigned long long *b; );
> +SYSCTL_ALLOWED_TYPES(XINT64, uint64_t *a; int64_t *b;
> + =A0 =A0unsigned long long *c; long long *d; );
>
> =A0#ifdef notyet
> =A0#define =A0 =A0 =A0 =A0SYSCTL_ADD_ASSERT_TYPE(type, ptr) =A0 =A0 =A0 \
> @@ -389,7 +391,6 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a
> =A0 =A0 =A0 =A0 =A0 =A0SYSCTL_ADD_ASSERT_TYPE(INT64, ptr), 0, =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0\
> =A0 =A0 =A0 =A0 =A0 =A0sysctl_handle_quad, "Q", __DESCR(descr))
>
> -/* Oid for a quad. =A0The pointer must be non NULL. */
> =A0#define =A0 =A0 =A0 =A0SYSCTL_UQUAD(parent, nbr, name, access, ptr, va=
l, descr) =A0 =A0 =A0 =A0\
> =A0 =A0 =A0 =A0SYSCTL_ASSERT_TYPE(UINT64, ptr, parent, name); =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0\
> =A0 =A0 =A0 =A0SYSCTL_OID(parent, nbr, name, =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 \
> @@ -402,6 +403,18 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a
> =A0 =A0 =A0 =A0 =A0 =A0SYSCTL_ADD_ASSERT_TYPE(UINT64, ptr), 0, =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 \
> =A0 =A0 =A0 =A0 =A0 =A0sysctl_handle_quad, "QU", __DESCR(descr))
>
> +#define =A0 =A0 =A0 =A0SYSCTL_X64(parent, nbr, name, access, ptr, val, d=
escr) =A0\
> + =A0 =A0 =A0 SYSCTL_ASSERT_TYPE(XINT64, ptr, parent, name); =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0\
> + =A0 =A0 =A0 SYSCTL_OID(parent, nbr, name, =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 \
> + =A0 =A0 =A0 =A0 =A0 CTLTYPE_QUAD | CTLFLAG_MPSAFE | (access), =A0 \
> + =A0 =A0 =A0 =A0 =A0 ptr, val, sysctl_handle_quad, "QX", descr)
> +
> +#define =A0 =A0 =A0 =A0SYSCTL_ADD_X64(ctx, parent, nbr, name, access, pt=
r, descr) =A0 =A0 =A0\
> + =A0 =A0 =A0 sysctl_add_oid(ctx, parent, nbr, name, =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0\
> + =A0 =A0 =A0 =A0 =A0 CTLTYPE_QUAD | CTLFLAG_MPSAFE | (access), =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 \
> + =A0 =A0 =A0 =A0 =A0 SYSCTL_ADD_ASSERT_TYPE(XINT64, ptr), 0, =A0 =A0 =A0=
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 \
> + =A0 =A0 =A0 =A0 =A0 sysctl_handle_quad, "QX", __DESCR(descr))
> +
> =A0/* Oid for an opaque object. =A0Specified by a pointer and a length. *=
/
> =A0#define SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr)=
 \
> =A0 =A0 =A0 =A0SYSCTL_OID(parent, nbr, name, CTLTYPE_OPAQUE|(access), \
>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTinh619WaGgq=5fFxTvEX0JPir34k8xb%2Bs6oSH8Y>