PERFORCE change 49890 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=49890

Change 49890 by rwatson at rwatson_tislabs on 2004/03/29 07:29:24

	Integrate netperf_socket:
	
	- Warning fix for red-black tree macros.
	- Comments for pc98 clock foo.

Affected files ...

.. //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#3 integrate
.. //depot/projects/netperf_socket/sys/sys/tree.h#4 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.135 2004/03/15 10:39:01 imp Exp $
+ * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.136 2004/03/29 12:51:46 nyan Exp $
  */
 
 /*
@@ -593,7 +593,7 @@
 		else
 			tot_count += prev_count - count;
 		prev_count = count;
-		if ((sec == start_sec + 1200) ||
+		if ((sec == start_sec + 1200) || /* 1200 = 307.2KHz >> 8 */
 		    (sec < start_sec &&
 		        (u_int)sec + 0x10000 == (u_int)start_sec + 1200))
 			break;

==== //depot/projects/netperf_socket/sys/sys/tree.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$NetBSD: tree.h,v 1.7 2004/01/24 21:59:47 dbj Exp $	*/
+/*	$NetBSD: tree.h,v 1.8 2004/03/28 19:38:30 provos Exp $	*/
 /*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
 /*
  * Copyright 2002 Niels Provos <provos at citi.umich.edu>
@@ -380,7 +380,7 @@
 struct type *name##_RB_REMOVE(struct name *, struct type *);		\
 struct type *name##_RB_INSERT(struct name *, struct type *);		\
 struct type *name##_RB_FIND(struct name *, struct type *);		\
-struct type *name##_RB_NEXT(struct name *, struct type *);		\
+struct type *name##_RB_NEXT(struct type *);				\
 struct type *name##_RB_MINMAX(struct name *, int);			\
 									\
 
@@ -628,7 +628,7 @@
 									\
 /* ARGSUSED */								\
 struct type *								\
-name##_RB_NEXT(struct name *head, struct type *elm)			\
+name##_RB_NEXT(struct type *elm)					\
 {									\
 	if (RB_RIGHT(elm, field)) {					\
 		elm = RB_RIGHT(elm, field);				\
@@ -669,13 +669,13 @@
 #define RB_INSERT(name, x, y)	name##_RB_INSERT(x, y)
 #define RB_REMOVE(name, x, y)	name##_RB_REMOVE(x, y)
 #define RB_FIND(name, x, y)	name##_RB_FIND(x, y)
-#define RB_NEXT(name, x, y)	name##_RB_NEXT(x, y)
+#define RB_NEXT(name, x, y)	name##_RB_NEXT(y)
 #define RB_MIN(name, x)		name##_RB_MINMAX(x, RB_NEGINF)
 #define RB_MAX(name, x)		name##_RB_MINMAX(x, RB_INF)
 
 #define RB_FOREACH(x, name, head)					\
 	for ((x) = RB_MIN(name, head);					\
 	     (x) != NULL;						\
-	     (x) = name##_RB_NEXT(head, x))
+	     (x) = name##_RB_NEXT(x))
 
 #endif	/* _SYS_TREE_H_ */