PERFORCE change 43573 for review

[Marcel Moolenaar]

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

Change 43573 by marcel at marcel_nfs on 2003/12/07 13:21:12

	IFC @43572

Affected files ...

.. //depot/projects/ia64/sys/ia64/ia64/machdep.c#102 integrate
.. //depot/projects/ia64/sys/ia64/include/ucontext.h#7 integrate
.. //depot/projects/ia64/sys/kern/kern_timeout.c#11 integrate
.. //depot/projects/ia64/sys/sys/_null.h#2 integrate
.. //depot/projects/ia64/sys/sys/param.h#52 integrate
.. //depot/projects/ia64/sys/sys/stddef.h#5 integrate

Differences ...

==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#102 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.172 2003/11/20 16:42:39 marcel Exp $
+ * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.173 2003/12/07 20:47:32 marcel Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/ia64/sys/ia64/include/ucontext.h#7 (text+ko) ====

@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/ia64/include/ucontext.h,v 1.6 2003/11/09 22:17:36 marcel Exp $
+ * $FreeBSD: src/sys/ia64/include/ucontext.h,v 1.7 2003/12/07 20:47:33 marcel Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_
@@ -48,7 +48,7 @@
  * The second variation is for synchronous contexts. When the kernel creates
  * a synchronous context if needs to preserve the scratch registers, because
  * the syscall argument and return values are stored there in the trapframe
- * and they need to be preserved in other to restart a syscall or return the
+ * and they need to be preserved in order to restart a syscall or return the
  * proper return values. Also, the IIP and CFM fields need to be preserved
  * as they point to the syscall stub, which the kernel saves as a favor to
  * userland (it keeps the stubs small and simple).
@@ -79,7 +79,7 @@
 	unsigned long		mc_flags;
 #define	_MC_FLAGS_ASYNC_CONTEXT		0x0001
 #define	_MC_FLAGS_HIGHFP_VALID		0x0002
-#define	_MC_FLAGS_KSE_SET_MBOX		0x0004	/* undocumented. Has to go. */
+#define	_MC_FLAGS_KSE_SET_MBOX		0x0004	/* Undocumented. Has to go. */
 #define	_MC_FLAGS_SYSCALL_CONTEXT	0x0008
 	unsigned long		_reserved_;
 	struct _special		mc_special;

==== //depot/projects/ia64/sys/kern/kern_timeout.c#11 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.83 2003/11/15 18:33:54 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_timeout.c,v 1.84 2003/12/07 20:03:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -158,6 +158,7 @@
 	struct bintime bt1, bt2;
 	struct timespec ts2;
 	static uint64_t maxdt = 36893488147419102LL;	/* 2 msec */
+	static timeout_t *lastfunc;
 #endif
 
 #ifndef MAX_SOFTCLOCK_STEPS
@@ -228,12 +229,17 @@
 				binuptime(&bt2);
 				bintime_sub(&bt2, &bt1);
 				if (bt2.frac > maxdt) {
+					if (lastfunc != c_func ||
+					    bt2.frac > maxdt * 2) {
+						bintime2timespec(&bt2, &ts2);
+						printf(
+			"Expensive timeout(9) function: %p(%p) %jd.%09ld s\n",
+						    c_func, c_arg,
+						    (intmax_t)ts2.tv_sec,
+						    ts2.tv_nsec);
+					}
 					maxdt = bt2.frac;
-					bintime2timespec(&bt2, &ts2);
-					printf(
-			"Expensive timeout(9) function: %p(%p) %ld.%09ld s\n",
-					c_func, c_arg,
-					(long)ts2.tv_sec, ts2.tv_nsec);
+					lastfunc = c_func;
 				}
 #endif
 				if (!(c_flags & CALLOUT_MPSAFE))

==== //depot/projects/ia64/sys/sys/_null.h#2 (text+ko) ====


==== //depot/projects/ia64/sys/sys/param.h#52 (text+ko) ====

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.175 2003/12/07 03:56:54 scottl Exp $
+ * $FreeBSD: src/sys/sys/param.h,v 1.176 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _SYS_PARAM_H_

==== //depot/projects/ia64/sys/sys/stddef.h#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sys/stddef.h,v 1.1 2002/11/13 15:14:57 mux Exp $
+ * $FreeBSD: src/sys/sys/stddef.h,v 1.2 2003/12/07 21:10:06 marcel Exp $
  */
 
 #ifndef _SYS_STDDEF_H_