From owner-p4-projects@FreeBSD.ORG Fri Nov 30 01:32:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D438416A41B; Fri, 30 Nov 2007 01:32:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F27216A419 for ; Fri, 30 Nov 2007 01:32:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63F5313C442 for ; Fri, 30 Nov 2007 01:32:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAU1WOeG070539 for ; Fri, 30 Nov 2007 01:32:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAU1WNIO070536 for perforce@freebsd.org; Fri, 30 Nov 2007 01:32:23 GMT (envelope-from jb@freebsd.org) Date: Fri, 30 Nov 2007 01:32:23 GMT Message-Id: <200711300132.lAU1WNIO070536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Nov 2007 01:32:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=129803 Change 129803 by jb@jb_freebsd1 on 2007/11/30 01:31:42 IFC Affected files ... .. //depot/projects/dtrace/src/ObsoleteFiles.inc#32 integrate .. //depot/projects/dtrace/src/lib/libkse/Makefile#4 integrate .. //depot/projects/dtrace/src/share/man/man4/aac.4#7 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#23 integrate .. //depot/projects/dtrace/src/share/man/man9/stack.9#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/prof_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/random/yarrow.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/isa/prof_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_clock.c#11 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#14 integrate .. //depot/projects/dtrace/src/sys/sys/pcpu.h#16 integrate .. //depot/projects/dtrace/src/sys/sys/resource.h#5 integrate .. //depot/projects/dtrace/www/en/cgi/man.cgi#5 integrate .. //depot/projects/dtrace/www/share/sgml/advisories.xml#14 integrate Differences ... ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#32 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.122 2007/11/28 23:21:55 jb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071129: Disabled static versions of libkse by default +.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" +OLD_FILES+=usr/lib/libkse.a +OLD_FILES+=usr/lib/libkse_p.a +OLD_FILES+=usr/lib/libkse_pic.a +.endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071108: Removed very crunch OLDCARD support file ==== //depot/projects/dtrace/src/lib/libkse/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libkse/Makefile,v 1.67 2007/11/20 02:07:28 jb Exp $ +# $FreeBSD: src/lib/libkse/Makefile,v 1.68 2007/11/29 21:49:08 brooks Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -10,12 +10,15 @@ .include -.if (${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no") && \ - ${SHLIBDIR} == "/usr/lib" +.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no" +LIB=kse +.if ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif +.else +SHLIB=kse +.endif -LIB=kse SHLIB_MAJOR= 3 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ ==== //depot/projects/dtrace/src/share/man/man4/aac.4#7 (text+ko) ==== @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/aac.4,v 1.36 2007/08/23 20:12:40 emaste Exp $ -.Dd August 23, 2007 +.\" $FreeBSD: src/share/man/man4/aac.4,v 1.38 2007/11/29 18:53:11 emaste Exp $ +.Dd November 29, 2007 .Dt AAC 4 .Os .Sh NAME @@ -113,6 +113,22 @@ .It Adaptec AAC-364 .It +Adaptec RAID 3085 +.It +Adaptec RAID 31205 +.It +Adaptec RAID 31605 +.It +Adaptec RAID 5085 +.It +Adaptec RAID 51205 +.It +Adaptec RAID 51605 +.It +Adaptec RAID 5445 +.It +Adaptec RAID 5805 +.It Adaptec SAS RAID 3405 .It Adaptec SAS RAID 3805 @@ -187,12 +203,36 @@ .It IBM ServeRAID 8k .It +IBM ServeRAID 8s +.It +ICP RAID ICP5045BL +.It +ICP RAID ICP5085BL +.It +ICP RAID ICP5085SL +.It +ICP RAID ICP5125BR +.It +ICP RAID ICP5125SL +.It +ICP RAID ICP5165BR +.It +ICP RAID ICP5165SL +.It +ICP RAID ICP5445SL +.It +ICP RAID ICP5805BL +.It +ICP RAID ICP5805SL +.It ICP ICP5085BR SAS RAID .It ICP ICP9085LI SAS RAID .It ICP ICP9047MA SATA RAID .It +ICP ICP9067MA SATA RAID +.It ICP ICP9087MA SATA RAID .It ICP ICP9014RO SCSI RAID ==== //depot/projects/dtrace/src/share/man/man9/Makefile#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.318 2007/11/27 11:02:41 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.319 2007/11/29 17:16:55 rwatson Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1070,6 +1070,7 @@ MLINKS+=stack.9 stack_copy.9 \ stack.9 stack_create.9 \ stack.9 stack_destroy.9 \ + stack.9 stack_printf.9 \ stack.9 stack_put.9 \ stack.9 stack_save.9 \ stack.9 stack_sbuf_print.9 \ ==== //depot/projects/dtrace/src/share/man/man9/stack.9#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/stack.9,v 1.2 2007/11/28 12:04:08 rwatson Exp $ +.\" $FreeBSD: src/share/man/man9/stack.9,v 1.3 2007/11/29 17:16:55 rwatson Exp $ .\" .Dd February 27, 2007 .Dt STACK 9 @@ -50,6 +50,8 @@ .Ft void .Fn stack_zero "struct stack *st" .Ft void +.Fn stack_print "struct stack *st" +.Ft void .Fn stack_sbuf_print "struct sbuf sb*" "struct stack *st" .Ft void .Fn stack_save "struct stack *st" @@ -78,6 +80,10 @@ A trace of the current kernel thread's call stack may be captured using .Fn stack_save . .Pp +.Fn stack_print +may be used to print a stack trace using the kernel +.Xr printf 9 . +.Pp .Fn stack_sbuf_print may be used to construct a human-readable string, including conversion (where possible) from a simple kernel instruction pointer to a named symbol and @@ -99,7 +105,9 @@ .Nm stack_put may be used to manipulate stack data structures directly. .Sh SEE ALSO -.Xr DDB 4 +.Xr DDB 4 , +.Xr printf 9 , +.Xr sbuf 9 .Sh AUTHORS .An -nosplit The ==== //depot/projects/dtrace/src/sys/amd64/amd64/prof_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.29 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.31 2007/11/29 02:01:21 bde Exp $"); #ifdef GUPROF #if 0 @@ -82,10 +82,10 @@ # Check that we are profiling. Do it early for speed. \n\ # \n\ cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\ - je .mcount_exit \n\ - # \n\ - # __mcount is the same as [.]mcount except the caller \n\ - # hasn't changed the stack except to call here, so the \n\ + je .mcount_exit \n\ + # \n\ + # __mcount is the same as [.]mcount except the caller \n\ + # hasn't changed the stack except to call here, so the \n\ # caller's raddr is above our raddr. \n\ # \n\ pushq %rax \n\ @@ -96,13 +96,11 @@ pushq %r8 \n\ pushq %r9 \n\ movq 7*8+8(%rsp),%rdi \n\ - jmp .got_frompc \n\ - \n\ - .p2align 4,0x90 \n\ - .globl .mcount \n\ + jmp .got_frompc \n\ + \n\ + .p2align 4,0x90 \n\ + .globl .mcount \n\ .mcount: \n\ - .globl __cyg_profile_func_enter \n\ -__cyg_profile_func_enter: \n\ cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\ je .mcount_exit \n\ # \n\ @@ -137,7 +135,7 @@ popq %rdx \n\ popq %rax \n\ .mcount_exit: \n\ - ret \n\ + ret $0 \n\ "); #else /* !__GNUCLIKE_ASM */ #error "this file needs to be ported to your compiler" @@ -167,8 +165,6 @@ .p2align 4,0x90 \n\ .globl .mexitcount \n\ .mexitcount: \n\ - .globl __cyg_profile_func_exit \n\ -__cyg_profile_func_exit: \n\ cmpl $GMON_PROF_HIRES,_gmonparam+GM_STATE \n\ jne .mexitcount_exit \n\ pushq %rax \n\ @@ -191,7 +187,7 @@ popq %rdx \n\ popq %rax \n\ .mexitcount_exit: \n\ - ret \n\ + ret $0 \n\ "); #endif /* __GNUCLIKE_ASM */ ==== //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#14 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.116 2007/10/12 06:03:42 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.117 2007/11/29 06:34:29 peter Exp $"); #include #include @@ -374,19 +374,28 @@ static int linprocfs_dostat(PFS_FILL_ARGS) { + struct pcpu *pcpu; + long cp_time[CPUSTATES]; + long *cp; int i; + read_cpu_time(cp_time); sbuf_printf(sb, "cpu %ld %ld %ld %ld\n", T2J(cp_time[CP_USER]), T2J(cp_time[CP_NICE]), T2J(cp_time[CP_SYS] /*+ cp_time[CP_INTR]*/), T2J(cp_time[CP_IDLE])); - for (i = 0; i < mp_ncpus; ++i) + for (i = 0; i <= mp_maxid; ++i) { + if (CPU_ABSENT(i)) + continue; + pcpu = pcpu_find(i); + cp = pcpu->pc_cp_time; sbuf_printf(sb, "cpu%d %ld %ld %ld %ld\n", i, - T2J(cp_time[CP_USER]) / mp_ncpus, - T2J(cp_time[CP_NICE]) / mp_ncpus, - T2J(cp_time[CP_SYS]) / mp_ncpus, - T2J(cp_time[CP_IDLE]) / mp_ncpus); + T2J(cp[CP_USER]), + T2J(cp[CP_NICE]), + T2J(cp[CP_SYS] /*+ cp[CP_INTR]*/), + T2J(cp[CP_IDLE])); + } sbuf_printf(sb, "disk 0 0 0 0\n" "page %u %u\n" @@ -410,9 +419,11 @@ static int linprocfs_douptime(PFS_FILL_ARGS) { + long cp_time[CPUSTATES]; struct timeval tv; getmicrouptime(&tv); + read_cpu_time(cp_time); sbuf_printf(sb, "%lld.%02ld %ld.%02ld\n", (long long)tv.tv_sec, tv.tv_usec / 10000, T2S(cp_time[CP_IDLE]), T2J(cp_time[CP_IDLE]) % 100); ==== //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_x86.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.5 2006/04/04 02:36:04 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_x86.c,v 1.6 2007/11/29 06:43:58 jkoshy Exp $"); #include #include @@ -82,7 +82,7 @@ case 0x7: case 0x8: case 0xA: case 0xB: cputype = PMC_CPU_INTEL_PIII; break; - case 0x9: case 0xD: case 0xE: + case 0x9: case 0xD: cputype = PMC_CPU_INTEL_PM; break; } ==== //depot/projects/dtrace/src/sys/dev/random/yarrow.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/random/yarrow.c,v 1.47 2007/05/27 18:54:58 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/random/yarrow.c,v 1.48 2007/11/29 16:04:35 simon Exp $"); #include #include @@ -296,6 +296,7 @@ random_state.outputblocks = 0; } retval += (int)tomove; + cur = 0; } } else { ==== //depot/projects/dtrace/src/sys/i386/isa/prof_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/prof_machdep.c,v 1.30 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/prof_machdep.c,v 1.32 2007/11/29 02:01:20 bde Exp $"); #ifdef GUPROF #include "opt_i586_guprof.h" @@ -90,8 +90,6 @@ .p2align 4,0x90 \n\ .globl .mcount \n\ .mcount: \n\ - .globl __cyg_profile_func_enter \n\ -__cyg_profile_func_enter: \n\ cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\ je .mcount_exit \n\ # \n\ @@ -115,7 +113,7 @@ addl $8,%esp \n\ popfl \n\ .mcount_exit: \n\ - ret \n\ + ret $0 \n\ "); #else /* !__GNUCLIKE_ASM */ #error "this file needs to be ported to your compiler" @@ -145,8 +143,6 @@ .p2align 4,0x90 \n\ .globl .mexitcount \n\ .mexitcount: \n\ - .globl __cyg_profile_func_exit \n\ -__cyg_profile_func_exit: \n\ cmpl $GMON_PROF_HIRES,_gmonparam+GM_STATE \n\ jne .mexitcount_exit \n\ pushl %edx \n\ @@ -161,7 +157,7 @@ popl %eax \n\ popl %edx \n\ .mexitcount_exit: \n\ - ret \n\ + ret $0 \n\ "); #endif /* __GNUCLIKE_ASM */ ==== //depot/projects/dtrace/src/sys/kern/kern_clock.c#11 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.203 2007/11/14 06:21:22 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.205 2007/11/29 08:38:22 rwatson Exp $"); #include "opt_kdb.h" #include "opt_device_polling.h" @@ -81,9 +81,6 @@ static void initclocks(void *dummy); SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL) -/* Some of these don't belong here, but it's easiest to concentrate them. */ -long cp_time[CPUSTATES]; - /* Spin-lock protecting profiling statistics. */ static struct mtx time_lock; @@ -91,10 +88,14 @@ sysctl_kern_cp_time(SYSCTL_HANDLER_ARGS) { int error; + long cp_time[CPUSTATES]; #ifdef SCTL_MASK32 int i; unsigned int cp_time32[CPUSTATES]; +#endif + read_cpu_time(cp_time); +#ifdef SCTL_MASK32 if (req->flags & SCTL_MASK32) { if (!req->oldptr) return SYSCTL_OUT(req, 0, sizeof(cp_time32)); @@ -114,6 +115,67 @@ SYSCTL_PROC(_kern, OID_AUTO, cp_time, CTLTYPE_LONG|CTLFLAG_RD, 0,0, sysctl_kern_cp_time, "LU", "CPU time statistics"); +static long empty[CPUSTATES]; + +static int +sysctl_kern_cp_times(SYSCTL_HANDLER_ARGS) +{ + struct pcpu *pcpu; + int error; + int c; + long *cp_time; +#ifdef SCTL_MASK32 + unsigned int cp_time32[CPUSTATES]; + int i; +#endif + + if (!req->oldptr) { +#ifdef SCTL_MASK32 + if (req->flags & SCTL_MASK32) + return SYSCTL_OUT(req, 0, sizeof(cp_time32) * (mp_maxid + 1)); + else +#endif + return SYSCTL_OUT(req, 0, sizeof(long) * CPUSTATES * (mp_maxid + 1)); + } + for (error = 0, c = 0; error == 0 && c <= mp_maxid; c++) { + if (!CPU_ABSENT(c)) { + pcpu = pcpu_find(c); + cp_time = pcpu->pc_cp_time; + } else { + cp_time = empty; + } +#ifdef SCTL_MASK32 + if (req->flags & SCTL_MASK32) { + for (i = 0; i < CPUSTATES; i++) + cp_time32[i] = (unsigned int)cp_time[i]; + error = SYSCTL_OUT(req, cp_time32, sizeof(cp_time32)); + } else +#endif + error = SYSCTL_OUT(req, cp_time, sizeof(long) * CPUSTATES); + } + return error; +} + +SYSCTL_PROC(_kern, OID_AUTO, cp_times, CTLTYPE_LONG|CTLFLAG_RD, + 0,0, sysctl_kern_cp_times, "LU", "per-CPU time statistics"); + +void +read_cpu_time(long *cp_time) +{ + struct pcpu *pc; + int i, j; + + /* Sum up global cp_time[]. */ + bzero(cp_time, sizeof(long) * CPUSTATES); + for (i = 0; i <= mp_maxid; i++) { + if (CPU_ABSENT(i)) + continue; + pc = pcpu_find(i); + for (j = 0; j < CPUSTATES; j++) + cp_time[j] += pc->pc_cp_time[j]; + } +} + #ifdef SW_WATCHDOG #include @@ -405,11 +467,12 @@ struct thread *td; struct proc *p; long rss; + long *cp_time; td = curthread; p = td->td_proc; - thread_lock_flags(td, MTX_QUIET); + cp_time = (long *)PCPU_PTR(cp_time); if (usermode) { /* * Charge the time as appropriate. @@ -420,9 +483,9 @@ #endif td->td_uticks++; if (p->p_nice > NZERO) - atomic_add_long(&cp_time[CP_NICE], 1); + cp_time[CP_NICE]++; else - atomic_add_long(&cp_time[CP_USER], 1); + cp_time[CP_USER]++; } else { /* * Came from kernel mode, so we were: @@ -439,7 +502,7 @@ if ((td->td_pflags & TDP_ITHREAD) || td->td_intr_nesting_level >= 2) { td->td_iticks++; - atomic_add_long(&cp_time[CP_INTR], 1); + cp_time[CP_INTR]++; } else { #ifdef KSE if (p->p_flag & P_SA) @@ -448,9 +511,9 @@ td->td_pticks++; td->td_sticks++; if (!TD_IS_IDLETHREAD(td)) - atomic_add_long(&cp_time[CP_SYS], 1); + cp_time[CP_SYS]++; else - atomic_add_long(&cp_time[CP_IDLE], 1); + cp_time[CP_IDLE]++; } } @@ -466,6 +529,7 @@ ru->ru_maxrss = rss; CTR4(KTR_SCHED, "statclock: %p(%s) prio %d stathz %d", td, td->td_name, td->td_priority, (stathz)?stathz:hz); + thread_lock_flags(td, MTX_QUIET); sched_clock(td); thread_unlock(td); } ==== //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#14 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/sun4v/include/pcpu.h,v 1.10 2007/11/11 12:30:56 marius Exp $ + * $FreeBSD: src/sys/sun4v/include/pcpu.h,v 1.11 2007/11/29 20:50:40 jb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -74,7 +74,7 @@ u_int pc_kwbuf_full; \ struct rwindow pc_tsbwbuf[2]; \ uint16_t pc_cpulist[MAXCPU]; \ - uint64_t pad[9]; + uint64_t pad[4]; /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick * succession we _really_ want them to be L1 cache line size aligned ==== //depot/projects/dtrace/src/sys/sys/pcpu.h#16 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/pcpu.h,v 1.23 2007/11/08 14:47:55 ups Exp $ + * $FreeBSD: src/sys/sys/pcpu.h,v 1.24 2007/11/29 06:34:30 peter Exp $ */ #ifndef _SYS_PCPU_H_ @@ -43,6 +43,7 @@ #include #include +#include #include struct pcb; @@ -82,6 +83,7 @@ #endif PCPU_MD_FIELDS; struct vmmeter pc_cnt; /* VM stats counters */ + long pc_cp_time[CPUSTATES]; struct device *pc_device; /* ==== //depot/projects/dtrace/src/sys/sys/resource.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)resource.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/resource.h,v 1.31 2007/06/01 01:12:45 jeff Exp $ + * $FreeBSD: src/sys/sys/resource.h,v 1.32 2007/11/29 06:34:30 peter Exp $ */ #ifndef _SYS_RESOURCE_H_ @@ -154,7 +154,7 @@ #ifdef _KERNEL extern struct loadavg averunnable; -extern long cp_time[CPUSTATES]; +void read_cpu_time(long *cp_time); /* Writes array of CPUSTATES */ #else ==== //depot/projects/dtrace/www/en/cgi/man.cgi#5 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.192 2007/11/28 20:36:21 hrs Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.193 2007/11/29 21:00:24 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -1222,7 +1222,7 @@ } sub copyright { - $id = '$Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $'; + $id = '$FreeBSD: www/en/cgi/man.cgi,v 1.193 2007/11/29 21:00:24 wosch Exp $'; return qq{\ 

==== //depot/projects/dtrace/www/share/sgml/advisories.xml#14 (text+ko) ====

@@ -2,7 +2,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/advisories.xml,v 1.213 2007/10/03 21:59:07 simon Exp $
+      $FreeBSD: www/share/sgml/advisories.xml,v 1.214 2007/11/29 16:34:20 simon Exp $
     
   
 
@@ -10,6 +10,22 @@
     2007
 
     
+      11
+
+      
+	29
+
+	
+	  FreeBSD-SA-07:10.gtar
+	
+
+	
+	  FreeBSD-SA-07:09.random
+	
+      
+    
+
+    
       10