svn commit: r361997 - head/sys/sys

[Ravi Pokala]

Hi Doug,

Shoot, it's still failing, but in a different way:

================================================================
/usr/home/rpokala/freebsd/dev/base/head/sys/kern/subr_stats.c:3385:14: error: expected ')'
                                    qstr);
                                         ^
/usr/home/rpokala/freebsd/dev/base/head/sys/kern/subr_stats.c:3375:11: note: to match this '('
                                printf(" RB ctd=%3d p=%3d l=%3d r=%3d c=%2d "
                                      ^
1 error generated.
--- subr_stats.o ---
================================================================

Thanks,

Ravi (rpokala@)

-----Original Message-----
From: <owner-src-committers at freebsd.org> on behalf of Doug Moore <dougm at FreeBSD.org>
Date: 2020-06-09, Tuesday at 19:50
To: <src-committers at freebsd.org>, <svn-src-all at freebsd.org>, <svn-src-head at freebsd.org>
Subject: svn commit: r361997 - head/sys/sys

    Author: dougm
    Date: Wed Jun 10 02:50:25 2020
    New Revision: 361997
    URL: https://svnweb.freebsd.org/changeset/base/361997

    Log:
      Restore an RB_COLOR macro, for the benefit of a bit of DIAGNOSTIC code
      that depends on it.

      Reported by:	rpokala, mjguzik
      Reviewed by:	markj
      Differential Revision:	https://reviews.freebsd.org/D25204

    Modified:
      head/sys/sys/tree.h

    Modified: head/sys/sys/tree.h
    ==============================================================================
    --- head/sys/sys/tree.h	Wed Jun 10 01:32:13 2020	(r361996)
    +++ head/sys/sys/tree.h	Wed Jun 10 02:50:25 2020	(r361997)
    @@ -333,6 +333,12 @@ struct {								\
     #define RB_TRUE				1
     #define RB_FALSE			0

    +/* For debugging support */
    +#define RB_COLOR(elm, field)		(RB_PARENT(elm, field) == NULL ? RB_FALSE : \
    +					    RB_LEFT(RB_PARENT(elm, field), field) == elm ? \
    +					    RB_RED_LF(RB_PARENT(elm, field), field) : \
    +					    RB_RED_RT(RB_PARENT(elm, field), field)
    +
     /*
      * Something to be invoked in a loop at the root of every modified subtree,
      * from the bottom up to the root, to update augmented node data.