From owner-p4-projects@FreeBSD.ORG Sun Jan 9 12:42:04 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E20E1065672; Sun, 9 Jan 2011 12:42:04 +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 275EE106566C for ; Sun, 9 Jan 2011 12:42:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 14FDA8FC14 for ; Sun, 9 Jan 2011 12:42:04 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p09Cg3oK066862 for ; Sun, 9 Jan 2011 12:42:03 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p09Cg3Ab066859 for perforce@freebsd.org; Sun, 9 Jan 2011 12:42:03 GMT (envelope-from trasz@freebsd.org) Date: Sun, 9 Jan 2011 12:42:03 GMT Message-Id: <201101091242.p09Cg3Ab066859@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jan 2011 12:42:04 -0000 http://p4web.freebsd.org/@@187637?ac=10 Change 187637 by trasz@trasz_victim on 2011/01/09 12:41:43 Implement dampening. This breaks %CPU horribly, this will be fixed soon. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#49 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#49 (text+ko) ==== @@ -159,6 +159,17 @@ } } +static int +container_resource_dampened(int resource) +{ + switch (resource) { + case RUSAGE_PCTCPU: + return (1); + default: + return (0); + } +} + static void container_add(struct container *dest, const struct container *src) { @@ -189,7 +200,8 @@ * Update resource usage in dest. */ for (i = 0; i <= RUSAGE_MAX; i++) { - if (!container_resource_sloppy(i)) { + if (!container_resource_sloppy(i) && + !container_resource_dampened(i)) { KASSERT(dest->c_resources[i] >= 0, ("resource usage propagation meltdown: dest < 0")); KASSERT(src->c_resources[i] >= 0, @@ -199,7 +211,7 @@ } if (container_resource_reclaimable(i)) { dest->c_resources[i] -= src->c_resources[i]; - if (container_resource_sloppy(i) && dest->c_resources[i] < 0) + if (dest->c_resources[i] < 0) dest->c_resources[i] = 0; } } @@ -230,8 +242,11 @@ for (i = 0; i <= RUSAGE_MAX; i++) { if (container_resource_sloppy(i)) continue; - KASSERT(container->c_resources[i] == 0 || - !container_resource_reclaimable(i), + if (!container_resource_reclaimable(i)) + continue; + if (container_resource_dampened(i)) + continue; + KASSERT(container->c_resources[i] == 0, ("destroying non-empty container: " "%ju allocated for resource %d\n", container->c_resources[i], i)); @@ -261,8 +276,12 @@ KASSERT(container != NULL, ("NULL container")); container->c_resources[resource] += amount; - if (container_resource_sloppy(resource) && container->c_resources[resource] < 0) + if (container->c_resources[resource] < 0) { + KASSERT(container_resource_sloppy(resource) || + container_resource_dampened(resource), + ("container_alloc_resource: usage < 0")); container->c_resources[resource] = 0; + } } /* @@ -587,7 +606,6 @@ /* * XXX: Free this some other way. */ - rusage_set(p, RUSAGE_PCTCPU, 0); rusage_set(p, RUSAGE_FSIZE, 0); rusage_set(p, RUSAGE_NPTS, 0); rusage_set(p, RUSAGE_NTHR, 0); @@ -673,6 +691,31 @@ } } +static int +container_dampen_callback(struct container *container, void *arg2, void *arg3) +{ + int orig, diff, hz; + + hz = *(int *)arg2; + + mtx_lock(&container_lock); + orig = container->c_resources[RUSAGE_PCTCPU]; + KASSERT(orig >= 0, ("container_dampen_callback: orig < 0")); + if (orig == 0) { + mtx_unlock(&container_lock); + return (0); + } + diff = orig / 10; + if (diff == 0) + diff = 1; + container->c_resources[RUSAGE_PCTCPU] -= diff; + KASSERT(container->c_resources[RUSAGE_PCTCPU] >= 0, + ("container_dampen_callback: result < 0")); + mtx_unlock(&container_lock); + + return (0); +} + static void containerd(void) { @@ -683,6 +726,11 @@ uint64_t pctcpu_limit; for (;;) { + loginclass_container_foreach(container_dampen_callback, &hz, + NULL); + ui_container_foreach(container_dampen_callback, &hz, NULL); + prison_container_foreach(container_dampen_callback, &hz, NULL); + sx_slock(&allproc_lock); FOREACH_PROC_IN_SYSTEM(p) { pctcpu_limit = rusage_get_limit(p, RUSAGE_PCTCPU); From owner-p4-projects@FreeBSD.ORG Mon Jan 10 13:04:13 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D5151065679; Mon, 10 Jan 2011 13:04:13 +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 156A71065673 for ; Mon, 10 Jan 2011 13:04:13 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 02BF08FC17 for ; Mon, 10 Jan 2011 13:04:13 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0AD4CNw069273 for ; Mon, 10 Jan 2011 13:04:12 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0AD4CcN069270 for perforce@freebsd.org; Mon, 10 Jan 2011 13:04:12 GMT (envelope-from trasz@freebsd.org) Date: Mon, 10 Jan 2011 13:04:12 GMT Message-Id: <201101101304.p0AD4CcN069270@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187657 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jan 2011 13:04:13 -0000 http://p4web.freebsd.org/@@187657?ac=10 Change 187657 by trasz@trasz_victim on 2011/01/10 13:03:54 Fix assertion. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#50 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#50 (text+ko) ==== @@ -211,8 +211,12 @@ } if (container_resource_reclaimable(i)) { dest->c_resources[i] -= src->c_resources[i]; - if (dest->c_resources[i] < 0) + if (dest->c_resources[i] < 0) { + KASSERT(container_resource_sloppy(i) || + container_resource_dampened(i), + ("container_sub: usage < 0")); dest->c_resources[i] = 0; + } } } } From owner-p4-projects@FreeBSD.ORG Mon Jan 10 14:15:37 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDD141065693; Mon, 10 Jan 2011 14:15:36 +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 4613B1065672 for ; Mon, 10 Jan 2011 14:15:36 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 316258FC1D for ; Mon, 10 Jan 2011 14:15:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0AEFamv084560 for ; Mon, 10 Jan 2011 14:15:36 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0AEFPe9084549 for perforce@freebsd.org; Mon, 10 Jan 2011 14:15:25 GMT (envelope-from trasz@freebsd.org) Date: Mon, 10 Jan 2011 14:15:25 GMT Message-Id: <201101101415.p0AEFPe9084549@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jan 2011 14:15:37 -0000 http://p4web.freebsd.org/@@187659?ac=10 Change 187659 by trasz@trasz_victim on 2011/01/10 14:14:38 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/COPYRIGHT#3 integrate .. //depot/projects/soc2009/trasz_limits/Makefile#8 integrate .. //depot/projects/soc2009/trasz_limits/Makefile.inc1#18 integrate .. //depot/projects/soc2009/trasz_limits/Makefile.mips#4 integrate .. //depot/projects/soc2009/trasz_limits/UPDATING#31 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/print.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/setfacl.c#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#18 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#11 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/main.c#13 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/memalloc.c#7 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/memalloc.h#7 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/redir.c#6 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/trap.c#7 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/trap.h#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.c#13 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.h#5 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/i386/freebsd.h#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/defaults/rc.conf#20 integrate .. //depot/projects/soc2009/trasz_limits/etc/devd.conf#6 integrate .. //depot/projects/soc2009/trasz_limits/etc/portsnap.conf#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/ldconfig#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.subr#12 integrate .. //depot/projects/soc2009/trasz_limits/gnu/lib/libgcc/Makefile#11 integrate .. //depot/projects/soc2009/trasz_limits/gnu/lib/libgomp/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/Makefile.inc0#6 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/ld/Makefile.mips#6 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/libbfd/Makefile.mips#4 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/Makefile.inc#5 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/Makefile.tgt#6 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/Makefile.inc#5 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/libgdb/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/include/assert.h#3 integrate .. //depot/projects/soc2009/trasz_limits/include/pthread.h#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/bind/config.mk#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/csu/amd64/crti.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/csu/amd64/crtn.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/csu/i386-elf/crt1_s.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/csu/i386-elf/crti.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/csu/i386-elf/crtn.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/Makefile#10 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/gen/fabs.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/gen/rfork_thread.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/stdlib/div.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/stdlib/ldiv.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/stdlib/lldiv.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/string/bcmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/string/bcopy.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/string/bzero.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/string/memcmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/string/memmove.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/string/memset.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/string/strcat.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/string/strcmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/string/strcpy.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/getcontext.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/Symbol.map#10 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/dlfcn.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/elf_utils.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/gen/_setjmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/gen/fabs.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/gen/modf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/gen/rfork_thread.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/gen/setjmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/gen/sigsetjmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/stdlib/div.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/stdlib/ldiv.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/bcmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/bcopy.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/bzero.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/ffs.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/index.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/memchr.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/memcmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/memcpy.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/memmove.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/memset.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/rindex.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/strcat.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/strchr.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/strcmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/strcpy.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/strncmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/strrchr.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/swab.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/wcschr.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/wcscmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/wcslen.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/string/wmemchr.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/Ovfork.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/brk.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/cerror.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/exect.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/getcontext.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/pipe.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/ptrace.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/reboot.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/sbrk.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/setlogin.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/sigreturn.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/i386/sys/syscall.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/net/hesiod.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/realpath.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/soc2009/trasz_limits/lib/libcompiler_rt/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libstand/Makefile#6 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/arch/i386/i386/_umtx_op_err.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/pthread.map#6 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_cond.c#6 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_create.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_private.h#9 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_rtld.c#5 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_stack.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libugidfw/ugidfw.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/e_remainder.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/e_remainderf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/e_remainderl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/e_sqrt.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/e_sqrtf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/e_sqrtl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_llrint.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_llrintf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_llrintl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_logbl.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_lrint.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_lrintf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_lrintl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_remquo.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_remquof.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_remquol.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_rintl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_scalbn.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_scalbnf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_scalbnl.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_exp.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_fmod.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_log.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_log10.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_log10f.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_logf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_remainder.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_remainderf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_remainderl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_sqrt.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_sqrtf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_sqrtl.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_ceil.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_ceilf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_ceill.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_copysign.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_copysignf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_copysignl.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_cos.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_finite.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_floor.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_floorf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_floorl.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_llrint.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_llrintf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_llrintl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_logb.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_logbf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_logbl.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_lrint.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_lrintf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_lrintl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_remquo.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_remquof.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_remquol.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_rint.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_rintf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_rintl.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_scalbn.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_scalbnf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_scalbnl.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_significand.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_significandf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_sin.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_tan.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_trunc.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_truncf.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_truncl.S#3 integrate .. //depot/projects/soc2009/trasz_limits/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/Symbol.map#4 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/amd64/Makefile.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/amd64/rtld_start.S#2 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/i386/Makefile.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/i386/rtld_start.S#2 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/map_object.c#4 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/powerpc64/reloc.c#4 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.c#15 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sbin/camcontrol/camcontrol.8#11 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifmedia.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sbin/shutdown/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/shutdown/shutdown.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/shutdown/shutdown.c#4 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/etc/make.conf#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/Makefile#28 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/altq.4#8 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/miibus.4#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/tcp.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/vlan.4#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/vte.4#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man4/wi.4#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/rc.conf.5#18 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/BUS_SETUP_INTR.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#22 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ithread.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/mutex.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/osd.9#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man9/style.9#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/swi.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/committers-doc.dot#4 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/committers-src.dot#17 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.cpu.mk#9 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.endian.mk#4 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.lib.mk#8 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/sys.mk#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/machdep.c#24 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/ia32/ia32_signal.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/_inttypes.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/elf.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/vmparam.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/at91/at91rm9200.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/at91/if_macb.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/conf/SKYEYE#6 delete .. //depot/projects/soc2009/trasz_limits/sys/arm/include/_limits.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/include/_stdint.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/include/_types.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/include/elf.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/include/pmap.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/mv/gpio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/s3c2xx0/s3c24x0_clk.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/efi/libefi/efipart.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/ficl/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/Makefile.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/boot2/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/gptboot/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/gptzfsboot/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/zfsboot/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/boot2/Makefile#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/conf.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/devicename.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/help.ps3#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/ldscript.powerpc#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/lv1call.S#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/lv1call.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/main.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/metadata.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/ppc64_elf_freebsd.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/ps3.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/ps3cons.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/ps3mmu.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/ps3net.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/start.S#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/powerpc/ps3/version#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/zfs/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_misc.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/ia32/ia32_util.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_ioctl.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/Makefile.mips#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#29 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#41 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.powerpc#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/kern.mk#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options.i386#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options.powerpc#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/octeon-sdk/cvmx-helper-board.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/octeon-sdk/cvmx-mgmt-port.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/octeon-sdk/cvmx-mgmt-port.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_ec.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/adlink/adlink.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ae/if_ae.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ae/if_aevar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/age/if_age.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/age/if_agevar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alc.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alcvar.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ale/if_ale.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ale/if_alevar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bge.c#23 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ispfw/asm_2322.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ispfw/asm_2400.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ispfw/asm_2500.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ixgbe/ixgbe.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ixgbe/ixgbe.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ixgbe/ixv.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/miidevs#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/rdcphy.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/rdcphyreg.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mmc/mmc.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_msk.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/mwlhal.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pty/pty.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_mv.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uplcom.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uslcom.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#31 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/vte/if_vte.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/vte/if_vtereg.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/vte/if_vtevar.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/wpi/if_wpi.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/xen/balloon/balloon.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/xen/blkfront/blkfront.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/xen/netfront/netfront.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/xen/xenpci/evtchn.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonsubs.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_var.h#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfsdport.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfsport.h#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clvfsops.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfsmount.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdport.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdserv.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdsocket.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdstate.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part_gpt.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/_inttypes.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/_limits.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/_stdint.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/_types.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/elf.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/pcpu.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/pmap.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/segments.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/vmparam.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/xen/hypercall.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/xen/xen-os.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/xen/xenvar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/clock.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/mp_machdep.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/pmap.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/xen_machdep.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/_limits.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/_stdint.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/elf.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/float.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/vmparam.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#21 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#34 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#22 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#30 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#30 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_kthread.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_linker.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_synch.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sched_ule.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_autoconf.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_bus.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_clock.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_devstat.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_log.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty_tty.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_mountroot.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#22 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/ar91xxreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/ciu.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/cvmx_config.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/files.octeon1#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/if_octm.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/octe/ethernet-defines.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/octe/ethernet-rx.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/octe/ethernet.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/octeon_mp.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/octeon_wdog.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/OCTEON1#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/OCTEON1-32#6 delete .. //depot/projects/soc2009/trasz_limits/sys/mips/include/_inttypes.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/_limits.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/_stdint.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/_types.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/cpufunc.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/elf.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/vmparam.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/machdep.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/mp_machdep.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/dev/nlge/if_nlge.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/dev/xlr/rge.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/fmn.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/Makefile#27 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/aha/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/ahb/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/mii/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/vte/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/net/flowtable.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_llatbl.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_media.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/vnet.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/if_ether.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_output.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_dummynet.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_indata.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_input.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_output.c#21 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_pcb.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_timer.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_uio.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctputil.c#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_lro.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_lro.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_reass.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_syncache.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/udp.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/udp_var.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netsmb/smb_dev.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netsmb/smb_subr.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netsmb/smb_subr.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfs/nfs_lock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfs/nfs_mountcommon.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_vfsops.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfsmount.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_advlock.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/include/_inttypes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/pc98/machdep.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/nexus.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/vm_machdep.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/conf/GENERIC64#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/conf/NOTES#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/cpufreq/dfs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/cpufreq/pcr.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_inttypes.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_limits.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_stdint.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/_types.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/elf.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/float.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/pte.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/vmparam.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ofw/ofw_real.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/macgpio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/intr_machdep.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ehci_ps3.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/if_glc.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/if_glcreg.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/mmu_ps3.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/platform_ps3.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ps3-hv-asm.awk#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ps3-hv-header.awk#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ps3-hvcall.S#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ps3-hvcall.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ps3-hvcall.master#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ps3_syscons.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ps3bus.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ps3bus.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ps3pic.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/_limits.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/_stdint.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/elf.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/float.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/intr_machdep.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/vmparam.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/apb.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/fire.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/psycho.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/schizo.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sbus/sbus.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/intr_machdep.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/tsb.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/_limits.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/_stdint.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/elf.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/float.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/vmparam.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/bus.h#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/cdefs.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/copyright.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/imgact.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/link_elf.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/priority.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sysent.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/vmmeter.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_vnops.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_glue.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_meter.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_object.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.c#23 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#21 integrate .. //depot/projects/soc2009/trasz_limits/sys/x86/include/_inttypes.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/xen/evtchn/evtchn.c#6 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/acct/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/acct/pack.c#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/acct/regress.t#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/date/regress.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/exit1.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/exit2.8#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/exit3.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/trap4.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/errors/assignment-error2.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/errors/redirection-error7.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/execution/path1.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/expansion/cmdsubst10.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/expansion/cmdsubst8.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/expansion/cmdsubst9.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/inplace_race.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/nanobsd/gateworks/common#4 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/nanobsd/nanobsd.sh#12 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendar.1#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendars/calendar.freebsd#16 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/sed/main.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/xlint/Makefile.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile.mips#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/cpucontrol/cpucontrol.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fwcontrol/fwdv.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fwcontrol/fwmpegts.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/ndp/ndp.c#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/newsyslog/newsyslog.c#7 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/disk-part.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/send-logs.sh#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-disk.sh#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-networking.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/rtprio/rtprio.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/sysinstall/devices.c#10 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/COPYRIGHT#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.12 2009/12/31 10:00:37 obrien Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.13 2010/12/31 18:07:16 bz Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2010 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/soc2009/trasz_limits/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.371 2010/12/24 04:55:56 imp Exp $ +# $FreeBSD: src/Makefile,v 1.374 2011/01/07 20:36:27 imp Exp $ # # The user-driven targets are: # @@ -26,6 +26,7 @@ # delete-old-dirs - Delete obsolete directories. # delete-old-files - Delete obsolete files. # delete-old-libs - Delete obsolete libraries. +# targets - Print a list of supported TARGET/TARGET_ARCH pairs. # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the @@ -280,10 +281,10 @@ # with a reasonable chance of success, regardless of how old your # existing system is. # -.if make(universe) || make(universe_kernels) || make(tinderbox) +.if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v TARGET_ARCHES_arm?= arm armeb -TARGET_ARCHES_mips?= mipsel mipseb +TARGET_ARCHES_mips?= mipsel mipseb mips64el mips64eb TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_pc98?= i386 TARGET_ARCHES_sun4v?= sparc64 @@ -291,6 +292,14 @@ TARGET_ARCHES_${target}?= ${target} .endfor +targets: + @echo "Supported TARGET/TARGET_ARCH pairs" +.for target in ${TARGETS} +.for target_arch in ${TARGET_ARCHES_${target}} + @echo " ${target}/${target_arch}" +.endfor +.endfor + .if defined(DOING_TINDERBOX) FAILFILE=tinderbox.failed MAKEFAIL=tee -a ${FAILFILE} @@ -351,7 +360,10 @@ .for kernel in ${KERNCONFS} TARGET_ARCH_${kernel}!= cd ${.CURDIR}/sys/${TARGET}/conf && \ config -m ${.CURDIR}/sys/${TARGET}/conf/${kernel} 2> /dev/null | \ - cut -f 2 + grep -v WARNING: | cut -f 2 +.if empty(TARGET_ARCH_${kernel}) +.error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old." +.endif universe_kernconfs: universe_kernconf_${TARGET}_${kernel} universe_kernconf_${TARGET}_${kernel}: @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ ==== //depot/projects/soc2009/trasz_limits/Makefile.inc1#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.675 2010/11/18 16:32:52 markm Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.676 2011/01/07 20:26:33 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -121,7 +121,7 @@ TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/:S/mips/mipsel/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -TARGET= ${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm/} +TARGET= ${TARGET_ARCH:C/mips.*e[lb]/mips/:C/armeb/arm/} .endif # Legacy names, for a transition period mips:mips -> mipsel:mips .if defined(TARGET) && defined(TARGET_ARCH) && \ @@ -142,7 +142,7 @@ TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 mipsel/mips mipseb/mips powerpc powerpc64/powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 mipsel/mips mipseb/mips mips64el/mips mips64eb/mips mipsn32el/mips mipsn32eb/mips powerpc powerpc64/powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else ==== //depot/projects/soc2009/trasz_limits/Makefile.mips#4 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/Makefile.mips,v 1.4 2010/08/26 14:54:12 imp Exp $ +# $FreeBSD: src/Makefile.mips,v 1.5 2011/01/07 20:26:33 imp Exp $ -.if defined(TARGET_ABI) && ${TARGET_ABI} == "n64" +.if ${MACHINE_ARCH} != "mipsel" && ${MACHINE_ARCH} != "mipseb" MK_RESCUE=no .endif ==== //depot/projects/soc2009/trasz_limits/UPDATING#31 (text+ko) ==== @@ -22,6 +22,20 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20110103: + If you are trying to run make universe on a -stable system, and you get + the following warning: +"Makefile", line 356: "Target architecture for i386/conf/GENERIC unknown. config(8) likely too old." + or something similar to it, then you must upgrade your -stable system + to 8.2-Release or newer (really, any time after r210146 7/15/2010 in + stable/8) or build the config from the latest stable/8 branch and + install it on your system. + + Prior to this date, building a current universe on 8-stable system from + between 7/15/2010 and 1/2/2011 would result in a weird shell parsing + error in the first kernel build phase. A new config on those old systems + will fix that problem for older versions of -current. + 20101228: The TCP stack has been modified to allow Khelp modules to interact with it via helper hook points and store per-connection data in the TCP @@ -1279,4 +1293,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.673 2010/12/28 12:13:30 lstewart Exp $ +$FreeBSD: src/UPDATING,v 1.674 2011/01/03 23:05:20 imp Exp $ ==== //depot/projects/soc2009/trasz_limits/bin/ps/print.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.101 2010/03/17 22:57:58 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.102 2011/01/09 12:50:44 kib Exp $"); #include #include @@ -45,6 +45,7 @@ #include #include #include +#include #include #include ==== //depot/projects/soc2009/trasz_limits/bin/setfacl/setfacl.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.16 2010/03/07 07:59:05 joel Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.17 2011/01/03 17:17:31 jh Exp $"); #include #include @@ -201,12 +201,14 @@ if (stat(file->filename, &sb) == -1) { warn("%s: stat() failed", file->filename); + carried_error++; continue; } if (acl_type == ACL_TYPE_DEFAULT && S_ISDIR(sb.st_mode) == 0) { warnx("%s: default ACL may only be set on a directory", file->filename); + carried_error++; continue; } @@ -218,6 +220,7 @@ if (acl_type == ACL_TYPE_DEFAULT) { warnx("%s: there are no default entries " "in NFSv4 ACLs", file->filename); + carried_error++; continue; } acl_type = ACL_TYPE_NFS4; @@ -240,6 +243,7 @@ else warn("%s: acl_get_file() failed", file->filename); + carried_error++; continue; } ==== //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#18 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.96 2010/12/28 21:27:08 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.99 2011/01/05 23:17:29 jilles Exp $"); #include #include @@ -643,10 +643,35 @@ result->fd, result->buf, result->nleft, result->jp)); } - +/* + * Check if a builtin can safely be executed in the same process, + * even though it should be in a subshell (command substitution). + * Note that jobid, jobs, times and trap can show information not + * available in a child process; this is deliberate. + * The arguments should already have been expanded. + */ +static int +safe_builtin(int idx, int argc, char **argv) +{ + if (idx == BLTINCMD || idx == COMMANDCMD || idx == ECHOCMD || + idx == FALSECMD || idx == JOBIDCMD || idx == JOBSCMD || + idx == KILLCMD || idx == PRINTFCMD || idx == PWDCMD || + idx == TESTCMD || idx == TIMESCMD || idx == TRUECMD || + idx == TYPECMD) + return (1); + if (idx == EXPORTCMD || idx == TRAPCMD || idx == ULIMITCMD || + idx == UMASKCMD) + return (argc <= 1 || (argc == 2 && argv[1][0] == '-')); + if (idx == SETCMD) + return (argc <= 1 || (argc == 2 && (argv[1][0] == '-' || + argv[1][0] == '+') && argv[1][1] == 'o' && + argv[1][2] == '\0')); + return (0); +} /* * Execute a simple command. + * Note: This may or may not return if (flags & EV_EXIT). */ static void @@ -683,6 +708,7 @@ arglist.lastp = &arglist.list; varlist.lastp = &varlist.list; varflag = 1; + jp = NULL; do_clearcmdentry = 0; oexitstatus = exitstatus; exitstatus = 0; @@ -861,10 +887,8 @@ || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN) && ((flags & EV_EXIT) == 0 || have_traps())) || ((flags & EV_BACKCMD) != 0 - && (cmdentry.cmdtype != CMDBUILTIN - || cmdentry.u.index == CDCMD - || cmdentry.u.index == DOTCMD - || cmdentry.u.index == EVALCMD))) { + && (cmdentry.cmdtype != CMDBUILTIN || + !safe_builtin(cmdentry.u.index, argc, argv)))) { jp = makejob(cmd, 1); mode = cmd->ncmd.backgnd; if (flags & EV_BACKCMD) { @@ -943,7 +967,7 @@ evalskip = 0; skipcount = 0; } - if (flags & EV_EXIT) + if (jp) exitshell(exitstatus); } else if (cmdentry.cmdtype == CMDBUILTIN) { #ifdef DEBUG @@ -975,8 +999,7 @@ */ if (argc == 0 && !(flags & EV_BACKCMD)) cmdentry.special = 1; - if (cmdentry.special) - listsetvar(cmdenviron); + listsetvar(cmdenviron, cmdentry.special ? 0 : VNOSET); if (argc > 0) bltinsetlocale(); commandname = argv[0]; @@ -992,13 +1015,12 @@ out1 = &output; out2 = &errout; freestdout(); + handler = savehandler; if (e != EXSHELLPROC) { commandname = savecmdname; - if (flags & EV_EXIT) { + if (jp) exitshell(exitstatus); - } } - handler = savehandler; if (flags == EV_BACKCMD) { backcmd->buf = memout.buf; backcmd->nleft = memout.nextc - memout.buf; ==== //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.46 2010/12/26 13:25:47 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.47 2011/01/09 21:07:30 jilles Exp $"); #include #include @@ -92,7 +92,6 @@ static struct tblentry *cmdtable[CMDTABLESIZE]; -static int builtinloc = -1; /* index in path of %builtin, or -1 */ int exerrno = 0; /* Last exec error */ @@ -244,8 +243,7 @@ } while ((name = *argptr) != NULL) { if ((cmdp = cmdlookup(name, 0)) != NULL - && (cmdp->cmdtype == CMDNORMAL - || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))) + && cmdp->cmdtype == CMDNORMAL) delete_cmd_entry(); find_command(name, &entry, DO_ERR, pathval()); if (verbose) { @@ -336,8 +334,8 @@ goto success; } - /* If %builtin not in path, check for builtin next */ - if (builtinloc < 0 && (i = find_builtin(name, &spec)) >= 0) { + /* Check for builtin next */ + if ((i = find_builtin(name, &spec)) >= 0) { INTOFF; cmdp = cmdlookup(name, 1); if (cmdp->cmdtype == CMDFUNCTION) @@ -353,7 +351,7 @@ prev = -1; /* where to start */ if (cmdp) { /* doing a rehash */ if (cmdp->cmdtype == CMDBUILTIN) - prev = builtinloc; + prev = -1; else prev = cmdp->param.index; } @@ -365,19 +363,7 @@ stunalloc(fullname); idx++; if (pathopt) { - if (prefix("builtin", pathopt)) { - if ((i = find_builtin(name, &spec)) < 0) - goto loop; - INTOFF; - cmdp = cmdlookup(name, 1); - if (cmdp->cmdtype == CMDFUNCTION) - cmdp = &loc_cmd; - cmdp->cmdtype = CMDBUILTIN; - cmdp->param.index = i; - cmdp->special = spec; - INTON; - goto success; - } else if (prefix("func", pathopt)) { + if (prefix("func", pathopt)) { /* handled below */ } else { goto loop; /* ignore unimplemented options */ @@ -484,8 +470,7 @@ for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) { for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) { - if (cmdp->cmdtype == CMDNORMAL - || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)) + if (cmdp->cmdtype == CMDNORMAL) cmdp->rehash = 1; } } @@ -505,13 +490,11 @@ const char *old, *new; int idx; int firstchange; - int bltin; old = pathval(); new = newval; firstchange = 9999; /* assume no change */ idx = 0; - bltin = -1; for (;;) { if (*old != *new) { firstchange = idx; @@ -522,19 +505,12 @@ } if (*new == '\0') break; - if (*new == '%' && bltin < 0 && prefix("builtin", new + 1)) - bltin = idx; if (*new == ':') { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 10 21:31:04 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B30B1065694; Mon, 10 Jan 2011 21:31:04 +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 F0C72106566B for ; Mon, 10 Jan 2011 21:31:03 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DC5698FC16 for ; Mon, 10 Jan 2011 21:31:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0ALV36t075919 for ; Mon, 10 Jan 2011 21:31:03 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0ALV3PW075915 for perforce@freebsd.org; Mon, 10 Jan 2011 21:31:03 GMT (envelope-from trasz@freebsd.org) Date: Mon, 10 Jan 2011 21:31:03 GMT Message-Id: <201101102131.p0ALV3PW075915@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jan 2011 21:31:04 -0000 http://p4web.freebsd.org/@@187675?ac=10 Change 187675 by trasz@trasz_victim on 2011/01/10 21:30:07 Get rid of the HRL name, replacing it with "rctl". It's a good name; Solaris uses it, although our syntax is completely different. Affected files ... .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Symbol.map#12 edit .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#12 edit .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscall.h#11 edit .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscalls.c#11 edit .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_sysent.c#12 edit .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#14 edit .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#30 edit .. //depot/projects/soc2009/trasz_limits/sys/conf/files#42 edit .. //depot/projects/soc2009/trasz_limits/sys/conf/options#26 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_aout.c#13 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#22 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#35 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#14 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#51 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#105 delete .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#25 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#31 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#1 add .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#58 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#13 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#15 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/systrace_args.c#12 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/container.h#20 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#51 delete .. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#18 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#11 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#13 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#1 add .. //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#23 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#13 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#13 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#14 edit .. //depot/projects/soc2009/trasz_limits/usr.bin/Makefile#15 edit .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/Makefile#1 add .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#1 add .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#1 add .. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#3 edit .. //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#19 edit .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/Makefile#7 delete .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.8#5 delete .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#29 delete Differences ... ==== //depot/projects/soc2009/trasz_limits/lib/libc/sys/Symbol.map#12 (text) ==== @@ -360,11 +360,11 @@ shmctl; symlinkat; unlinkat; - hrl_get_usage; - hrl_get_rules; - hrl_get_limits; - hrl_add_rule; - hrl_remove_rule; + rctl_get_usage; + rctl_get_rules; + rctl_get_limits; + rctl_add_rule; + rctl_remove_rule; }; FBSDprivate_1.0 { ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#12 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.116 2010/06/28 18:17:21 kib Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 209579 2010-06-28 18:06:46Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.132 2010/06/28 18:06:46 kib Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscall.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.112 2010/06/28 18:17:21 kib Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 209579 2010-06-28 18:06:46Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.132 2010/06/28 18:06:46 kib Exp */ #define FREEBSD32_SYS_syscall 0 @@ -410,4 +410,11 @@ #define FREEBSD32_SYS_freebsd32_shmctl 512 #define FREEBSD32_SYS_lpathconf 513 #define FREEBSD32_SYS_freebsd32_pselect 522 -#define FREEBSD32_SYS_MAXSYSCALL 523 +#define FREEBSD32_SYS_getloginclass 523 +#define FREEBSD32_SYS_setloginclass 524 +#define FREEBSD32_SYS_rctl_get_usage 525 +#define FREEBSD32_SYS_rctl_get_rules 526 +#define FREEBSD32_SYS_rctl_get_limits 527 +#define FREEBSD32_SYS_rctl_add_rule 528 +#define FREEBSD32_SYS_rctl_remove_rule 529 +#define FREEBSD32_SYS_MAXSYSCALL 530 ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscalls.c#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.103 2010/06/28 18:17:21 kib Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 209579 2010-06-28 18:06:46Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.132 2010/06/28 18:06:46 kib Exp */ const char *freebsd32_syscallnames[] = { @@ -546,4 +546,11 @@ "#520", /* 520 = pdgetpid */ "#521", /* 521 = pdwait */ "freebsd32_pselect", /* 522 = freebsd32_pselect */ + "getloginclass", /* 523 = getloginclass */ + "setloginclass", /* 524 = setloginclass */ + "rctl_get_usage", /* 525 = rctl_get_usage */ + "rctl_get_rules", /* 526 = rctl_get_rules */ + "rctl_get_limits", /* 527 = rctl_get_limits */ + "rctl_add_rule", /* 528 = rctl_add_rule */ + "rctl_remove_rule", /* 529 = rctl_remove_rule */ }; ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_sysent.c#12 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.114 2010/06/28 18:17:21 kib Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 209579 2010-06-28 18:06:46Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.132 2010/06/28 18:06:46 kib Exp */ #include "opt_compat.h" @@ -583,4 +583,11 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 520 = pdgetpid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 521 = pdwait */ { AS(freebsd32_pselect_args), (sy_call_t *)freebsd32_pselect, AUE_SELECT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 522 = freebsd32_pselect */ + { AS(getloginclass_args), (sy_call_t *)getloginclass, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 523 = getloginclass */ + { AS(setloginclass_args), (sy_call_t *)setloginclass, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 524 = setloginclass */ + { AS(rctl_get_usage_args), (sy_call_t *)rctl_get_usage, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 525 = rctl_get_usage */ + { AS(rctl_get_rules_args), (sy_call_t *)rctl_get_rules, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 526 = rctl_get_rules */ + { AS(rctl_get_limits_args), (sy_call_t *)rctl_get_limits, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 527 = rctl_get_limits */ + { AS(rctl_add_rule_args), (sy_call_t *)rctl_add_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 528 = rctl_add_rule */ + { AS(rctl_remove_rule_args), (sy_call_t *)rctl_remove_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 529 = rctl_remove_rule */ }; ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#14 (text+ko) ==== @@ -965,8 +965,8 @@ 523 AUE_NULL NOPROTO { int getloginclass(char *namebuf, size_t \ namelen); } 524 AUE_NULL NOPROTO { int setloginclass(const char *namebuf); } -525 AUE_NULL NOPROTO { int hrl_get_usage(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -526 AUE_NULL NOPROTO { int hrl_get_rules(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -527 AUE_NULL NOPROTO { int hrl_get_limits(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -528 AUE_NULL NOPROTO { int hrl_add_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -529 AUE_NULL NOPROTO { int hrl_remove_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +525 AUE_NULL NOPROTO { int rctl_get_usage(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +526 AUE_NULL NOPROTO { int rctl_get_rules(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +527 AUE_NULL NOPROTO { int rctl_get_limits(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +528 AUE_NULL NOPROTO { int rctl_add_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +529 AUE_NULL NOPROTO { int rctl_remove_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } ==== //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#30 (text+ko) ==== @@ -1160,8 +1160,8 @@ # Resource Containers options CONTAINERS -# Hierarchical Resource Limits -options HRL +# Resource Limits +options RCTL ##################################################################### ==== //depot/projects/soc2009/trasz_limits/sys/conf/files#42 (text+ko) ==== @@ -2142,7 +2142,6 @@ kern/kern_fork.c standard kern/kern_gzio.c optional gzio kern/kern_hhook.c standard -kern/kern_hrl.c standard kern/kern_idle.c standard kern/kern_intr.c standard kern/kern_jail.c standard @@ -2169,6 +2168,7 @@ kern/kern_priv.c standard kern/kern_proc.c standard kern/kern_prot.c standard +kern/kern_rctl.c standard kern/kern_resource.c standard kern/kern_rmlock.c standard kern/kern_rwlock.c standard ==== //depot/projects/soc2009/trasz_limits/sys/conf/options#26 (text+ko) ==== @@ -860,5 +860,5 @@ # Resource Containers CONTAINERS opt_global.h -# Hierarchical Resource Limits -HRL opt_global.h +# Resource Limits +RCTL opt_global.h ==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_aout.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include ==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#22 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#35 (text+ko) ==== @@ -49,10 +49,10 @@ #include #include +#include #include #include #include -#include #include #include #include ==== //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.257 2010/08/30 14:26:02 kib Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 211998 2010-08-30 14:24:44Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.265 2010/08/30 14:24:44 kib Exp */ #include "opt_compat.h" @@ -557,4 +557,11 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 520 = pdgetpid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 521 = pdwait */ { AS(pselect_args), (sy_call_t *)pselect, AUE_SELECT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 522 = pselect */ + { AS(getloginclass_args), (sy_call_t *)getloginclass, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 523 = getloginclass */ + { AS(setloginclass_args), (sy_call_t *)setloginclass, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 524 = setloginclass */ + { AS(rctl_get_usage_args), (sy_call_t *)rctl_get_usage, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 525 = rctl_get_usage */ + { AS(rctl_get_rules_args), (sy_call_t *)rctl_get_rules, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 526 = rctl_get_rules */ + { AS(rctl_get_limits_args), (sy_call_t *)rctl_get_limits, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 527 = rctl_get_limits */ + { AS(rctl_add_rule_args), (sy_call_t *)rctl_add_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 528 = rctl_add_rule */ + { AS(rctl_remove_rule_args), (sy_call_t *)rctl_remove_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 529 = rctl_remove_rule */ }; ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#51 (text+ko) ==== @@ -56,8 +56,8 @@ #include #include -#ifdef HRL -#include +#ifdef RCTL +#include #endif #ifdef CONTAINERS @@ -295,7 +295,7 @@ int rusage_add(struct proc *p, int resource, uint64_t amount) { -#ifdef HRL +#ifdef RCTL int error; #endif @@ -308,8 +308,8 @@ resource, amount)); mtx_lock(&container_lock); -#ifdef HRL - error = hrl_enforce_proc(p, resource, amount); +#ifdef RCTL + error = rctl_enforce_proc(p, resource, amount); if (error && container_resource_deniable(resource)) { SDT_PROBE(container, kernel, rusage, add_failure, p, resource, amount, 0, 0); mtx_unlock(&container_lock); @@ -380,7 +380,7 @@ rusage_set_locked(struct proc *p, int resource, uint64_t amount) { int64_t diff; -#ifdef HRL +#ifdef RCTL int error; #endif @@ -398,9 +398,9 @@ ("rusage_set: usage of non-reclaimable resource %d dropping", resource)); #endif -#ifdef HRL +#ifdef RCTL if (diff > 0) { - error = hrl_enforce_proc(p, resource, diff); + error = rctl_enforce_proc(p, resource, diff); if (error && container_resource_deniable(resource)) { SDT_PROBE(container, kernel, rusage, set_failure, p, resource, amount, 0, 0); return (error); @@ -466,8 +466,8 @@ rusage_get_limit(struct proc *p, int resource) { -#ifdef HRL - return (hrl_available_proc(p, resource)); +#ifdef RCTL + return (rctl_available_proc(p, resource)); #else return (UINT64_MAX); #endif @@ -584,9 +584,9 @@ PROC_UNLOCK(child); PROC_UNLOCK(parent); -#ifdef HRL +#ifdef RCTL if (error == 0) { - error = hrl_proc_fork(parent, child); + error = rctl_proc_fork(parent, child); if (error != 0) { mtx_lock(&container_lock); /* @@ -614,8 +614,8 @@ rusage_set(p, RUSAGE_NPTS, 0); rusage_set(p, RUSAGE_NTHR, 0); -#ifdef HRL - hrl_proc_exit(p); +#ifdef RCTL + rctl_proc_exit(p); #endif container_destroy(&p->p_container); } @@ -657,8 +657,8 @@ } mtx_unlock(&container_lock); -#ifdef HRL - hrl_proc_ucred_changing(p, newcred); +#ifdef RCTL + rctl_proc_ucred_changing(p, newcred); #endif } ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#25 (text+ko) ==== @@ -70,7 +70,7 @@ static struct mtx loginclasses_lock; static void lc_init(void); -SYSINIT(hrl, SI_SUB_CPU, SI_ORDER_FIRST, lc_init, NULL); +SYSINIT(loginclass, SI_SUB_CPU, SI_ORDER_FIRST, lc_init, NULL); void loginclass_acquire(struct loginclass *lc) ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#31 (text+ko) ==== @@ -2117,7 +2117,7 @@ } /* - * Assign new credential to the process, fixing up HRL accounting + * Assign new credential to the process, fixing up RCTL accounting * as neccessary. */ void ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#58 (text+ko) ==== @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.240 2010/08/30 14:26:02 kib Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 211998 2010-08-30 14:24:44Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.265 2010/08/30 14:24:44 kib Exp */ const char *syscallnames[] = { @@ -530,4 +530,11 @@ "#520", /* 520 = pdgetpid */ "#521", /* 521 = pdwait */ "pselect", /* 522 = pselect */ + "getloginclass", /* 523 = getloginclass */ + "setloginclass", /* 524 = setloginclass */ + "rctl_get_usage", /* 525 = rctl_get_usage */ + "rctl_get_rules", /* 526 = rctl_get_rules */ + "rctl_get_limits", /* 527 = rctl_get_limits */ + "rctl_add_rule", /* 528 = rctl_add_rule */ + "rctl_remove_rule", /* 529 = rctl_remove_rule */ }; ==== //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#15 (text+ko) ==== @@ -929,10 +929,10 @@ 523 AUE_NULL STD { int getloginclass(char *namebuf, size_t \ namelen); } 524 AUE_NULL STD { int setloginclass(const char *namebuf); } -525 AUE_NULL STD { int hrl_get_usage(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -526 AUE_NULL STD { int hrl_get_rules(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -527 AUE_NULL STD { int hrl_get_limits(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -528 AUE_NULL STD { int hrl_add_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } -529 AUE_NULL STD { int hrl_remove_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +525 AUE_NULL STD { int rctl_get_usage(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +526 AUE_NULL STD { int rctl_get_rules(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +527 AUE_NULL STD { int rctl_get_limits(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +528 AUE_NULL STD { int rctl_add_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } +529 AUE_NULL STD { int rctl_remove_rule(const void *inbufp, size_t inbuflen, void *outbufp, size_t outbuflen); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/soc2009/trasz_limits/sys/kern/systrace_args.c#12 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/systrace_args.c,v 1.36 2010/08/30 14:26:02 kib Exp $ + * $FreeBSD$ * This file is part of the DTrace syscall provider. */ @@ -3108,6 +3108,71 @@ *n_args = 6; break; } + /* getloginclass */ + case 523: { + struct getloginclass_args *p = params; + uarg[0] = (intptr_t) p->namebuf; /* char * */ + uarg[1] = p->namelen; /* size_t */ + *n_args = 2; + break; + } + /* setloginclass */ + case 524: { + struct setloginclass_args *p = params; + uarg[0] = (intptr_t) p->namebuf; /* const char * */ + *n_args = 1; + break; + } + /* rctl_get_usage */ + case 525: { + struct rctl_get_usage_args *p = params; + uarg[0] = (intptr_t) p->inbufp; /* const void * */ + uarg[1] = p->inbuflen; /* size_t */ + uarg[2] = (intptr_t) p->outbufp; /* void * */ + uarg[3] = p->outbuflen; /* size_t */ + *n_args = 4; + break; + } + /* rctl_get_rules */ + case 526: { + struct rctl_get_rules_args *p = params; + uarg[0] = (intptr_t) p->inbufp; /* const void * */ + uarg[1] = p->inbuflen; /* size_t */ + uarg[2] = (intptr_t) p->outbufp; /* void * */ + uarg[3] = p->outbuflen; /* size_t */ + *n_args = 4; + break; + } + /* rctl_get_limits */ + case 527: { + struct rctl_get_limits_args *p = params; + uarg[0] = (intptr_t) p->inbufp; /* const void * */ + uarg[1] = p->inbuflen; /* size_t */ + uarg[2] = (intptr_t) p->outbufp; /* void * */ + uarg[3] = p->outbuflen; /* size_t */ + *n_args = 4; + break; + } + /* rctl_add_rule */ + case 528: { + struct rctl_add_rule_args *p = params; + uarg[0] = (intptr_t) p->inbufp; /* const void * */ + uarg[1] = p->inbuflen; /* size_t */ + uarg[2] = (intptr_t) p->outbufp; /* void * */ + uarg[3] = p->outbuflen; /* size_t */ + *n_args = 4; + break; + } + /* rctl_remove_rule */ + case 529: { + struct rctl_remove_rule_args *p = params; + uarg[0] = (intptr_t) p->inbufp; /* const void * */ + uarg[1] = p->inbuflen; /* size_t */ + uarg[2] = (intptr_t) p->outbufp; /* void * */ + uarg[3] = p->outbuflen; /* size_t */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -8265,6 +8330,124 @@ break; }; break; + /* getloginclass */ + case 523: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "size_t"; + break; + default: + break; + }; + break; + /* setloginclass */ + case 524: + switch(ndx) { + case 0: + p = "const char *"; + break; + default: + break; + }; + break; + /* rctl_get_usage */ + case 525: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "void *"; + break; + case 3: + p = "size_t"; + break; + default: + break; + }; + break; + /* rctl_get_rules */ + case 526: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "void *"; + break; + case 3: + p = "size_t"; + break; + default: + break; + }; + break; + /* rctl_get_limits */ + case 527: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "void *"; + break; + case 3: + p = "size_t"; + break; + default: + break; + }; + break; + /* rctl_add_rule */ + case 528: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "void *"; + break; + case 3: + p = "size_t"; + break; + default: + break; + }; + break; + /* rctl_remove_rule */ + case 529: + switch(ndx) { + case 0: + p = "const void *"; + break; + case 1: + p = "size_t"; + break; + case 2: + p = "void *"; + break; + case 3: + p = "size_t"; + break; + default: + break; + }; + break; default: break; }; ==== //depot/projects/soc2009/trasz_limits/sys/sys/container.h#20 (text+ko) ==== @@ -37,7 +37,7 @@ #include struct proc; -struct hrl_rule_link; +struct rctl_rule_link; struct ucred; /* @@ -85,13 +85,13 @@ * for other objects are initialized when there is a rule which requires * it. For example, uidinfo will have container assigned only if there * is a rule this uidinfo is subject to, and 'hr_per' for this rule - * is HRL_SUBJECT_TYPE_USER. + * is RCTL_SUBJECT_TYPE_USER. * * This structure must be filled with zeroes initially. */ struct container { int64_t c_resources[RUSAGE_MAX + 1]; - LIST_HEAD(, hrl_rule_link) c_rule_links; + LIST_HEAD(, rctl_rule_link) c_rule_links; }; int rusage_add(struct proc *p, int resource, uint64_t amount); ==== //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#18 (text+ko) ==== @@ -342,7 +342,6 @@ struct sockaddr; struct statfs; struct container; -struct hrl_rule; int jailed(struct ucred *cred); int jailed_without_vnet(struct ucred *); void getcredhostname(struct ucred *, char *, size_t); ==== //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#11 (text+ko) ==== @@ -39,8 +39,6 @@ struct container lc_container; }; -struct hrl_rule; - void loginclass_acquire(struct loginclass *lc); void loginclass_release(struct loginclass *lc); struct loginclass *loginclass_find(const char *name); ==== //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#13 (text+ko) ==== @@ -484,10 +484,10 @@ #define PRIV_AFS_DAEMON 661 /* Can become the AFS daemon. */ /* - * Hierarchical Resource Limits privileges. + * Resource Limits privileges. */ -#define PRIV_HRL_SET 670 -#define PRIV_HRL_GET 671 +#define PRIV_RCTL_SET 670 +#define PRIV_RCTL_GET 671 /* * Track end of privilege list. ==== //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#23 (text+ko) ==== @@ -109,7 +109,6 @@ struct proc; struct rusage_ext; struct thread; -struct hrl_rule; void addupc_intr(struct thread *td, uintfptr_t pc, u_int ticks); void addupc_task(struct thread *td, uintfptr_t pc, u_int ticks); ==== //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.237 2010/08/30 14:26:02 kib Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 211998 2010-08-30 14:24:44Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.265 2010/08/30 14:24:44 kib Exp */ #define SYS_syscall 0 @@ -431,4 +431,11 @@ #define SYS_shmctl 512 #define SYS_lpathconf 513 #define SYS_pselect 522 -#define SYS_MAXSYSCALL 523 +#define SYS_getloginclass 523 +#define SYS_setloginclass 524 +#define SYS_rctl_get_usage 525 +#define SYS_rctl_get_rules 526 +#define SYS_rctl_get_limits 527 +#define SYS_rctl_add_rule 528 +#define SYS_rctl_remove_rule 529 +#define SYS_MAXSYSCALL 530 ==== //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#13 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.192 2010/08/30 14:26:02 kib Exp $ -# created from FreeBSD: head/sys/kern/syscalls.master 211998 2010-08-30 14:24:44Z kib +# $FreeBSD$ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.265 2010/08/30 14:24:44 kib Exp MIASM = \ syscall.o \ exit.o \ @@ -379,4 +379,11 @@ msgctl.o \ shmctl.o \ lpathconf.o \ - pselect.o + pselect.o \ + getloginclass.o \ + setloginclass.o \ + rctl_get_usage.o \ + rctl_get_rules.o \ + rctl_get_limits.o \ + rctl_add_rule.o \ + rctl_remove_rule.o ==== //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.244 2010/08/30 14:26:02 kib Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 211998 2010-08-30 14:24:44Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.265 2010/08/30 14:24:44 kib Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -1665,6 +1665,43 @@ char ts_l_[PADL_(const struct timespec *)]; const struct timespec * ts; char ts_r_[PADR_(const struct timespec *)]; char sm_l_[PADL_(const sigset_t *)]; const sigset_t * sm; char sm_r_[PADR_(const sigset_t *)]; }; +struct getloginclass_args { + char namebuf_l_[PADL_(char *)]; char * namebuf; char namebuf_r_[PADR_(char *)]; + char namelen_l_[PADL_(size_t)]; size_t namelen; char namelen_r_[PADR_(size_t)]; +}; +struct setloginclass_args { + char namebuf_l_[PADL_(const char *)]; const char * namebuf; char namebuf_r_[PADR_(const char *)]; +}; +struct rctl_get_usage_args { + char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)]; + char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)]; + char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)]; + char outbuflen_l_[PADL_(size_t)]; size_t outbuflen; char outbuflen_r_[PADR_(size_t)]; +}; +struct rctl_get_rules_args { + char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)]; + char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)]; + char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)]; + char outbuflen_l_[PADL_(size_t)]; size_t outbuflen; char outbuflen_r_[PADR_(size_t)]; +}; +struct rctl_get_limits_args { + char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)]; + char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)]; + char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)]; + char outbuflen_l_[PADL_(size_t)]; size_t outbuflen; char outbuflen_r_[PADR_(size_t)]; +}; +struct rctl_add_rule_args { + char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)]; + char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)]; + char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)]; + char outbuflen_l_[PADL_(size_t)]; size_t outbuflen; char outbuflen_r_[PADR_(size_t)]; +}; +struct rctl_remove_rule_args { + char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)]; + char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)]; + char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)]; + char outbuflen_l_[PADL_(size_t)]; size_t outbuflen; char outbuflen_r_[PADR_(size_t)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -2026,6 +2063,13 @@ int shmctl(struct thread *, struct shmctl_args *); int lpathconf(struct thread *, struct lpathconf_args *); int pselect(struct thread *, struct pselect_args *); +int getloginclass(struct thread *, struct getloginclass_args *); +int setloginclass(struct thread *, struct setloginclass_args *); +int rctl_get_usage(struct thread *, struct rctl_get_usage_args *); +int rctl_get_rules(struct thread *, struct rctl_get_rules_args *); +int rctl_get_limits(struct thread *, struct rctl_get_limits_args *); +int rctl_add_rule(struct thread *, struct rctl_add_rule_args *); +int rctl_remove_rule(struct thread *, struct rctl_remove_rule_args *); #ifdef COMPAT_43 @@ -2701,6 +2745,13 @@ #define SYS_AUE_shmctl AUE_SHMCTL #define SYS_AUE_lpathconf AUE_LPATHCONF #define SYS_AUE_pselect AUE_SELECT +#define SYS_AUE_getloginclass AUE_NULL +#define SYS_AUE_setloginclass AUE_NULL +#define SYS_AUE_rctl_get_usage AUE_NULL +#define SYS_AUE_rctl_get_rules AUE_NULL +#define SYS_AUE_rctl_get_limits AUE_NULL +#define SYS_AUE_rctl_add_rule AUE_NULL +#define SYS_AUE_rctl_remove_rule AUE_NULL #undef PAD_ #undef PADL_ ==== //depot/projects/soc2009/trasz_limits/usr.bin/Makefile#15 (text+ko) ==== @@ -123,6 +123,7 @@ printenv \ printf \ procstat \ + rctl \ renice \ rev \ revoke \ ==== //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#3 (text+ko) ==== @@ -60,7 +60,7 @@ printf "JID\t%%CPU\tRSS\tVSIZE\tSWAP\n" for jail in $jails; do printf "$jail\t" - hrl $hflag -u j:$jail | format_stats + rctl $hflag -u j:$jail | format_stats done else @@ -68,7 +68,7 @@ printf "USER\t%%CPU\tRSS\tVSIZE\tSWAP\n" for user in $users; do printf "$user\t" - hrl $hflag -u u:$user | format_stats + rctl $hflag -u u:$user | format_stats done fi ==== //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#19 (text+ko) ==== @@ -28,7 +28,6 @@ getfmac \ getpmac \ gstat \ - hrl \ i2c \ ifmcstat \ inetd \ From owner-p4-projects@FreeBSD.ORG Mon Jan 10 21:33:16 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD4DA1065672; Mon, 10 Jan 2011 21:33:15 +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 9D4C7106566C for ; Mon, 10 Jan 2011 21:33:15 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 6F71B8FC12 for ; Mon, 10 Jan 2011 21:33:15 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0ALXF26077423 for ; Mon, 10 Jan 2011 21:33:15 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0ALXFoK077420 for perforce@freebsd.org; Mon, 10 Jan 2011 21:33:15 GMT (envelope-from trasz@freebsd.org) Date: Mon, 10 Jan 2011 21:33:15 GMT Message-Id: <201101102133.p0ALXFoK077420@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jan 2011 21:33:16 -0000 http://p4web.freebsd.org/@@187676?ac=10 Change 187676 by trasz@trasz_victim on 2011/01/10 21:33:08 Fix copyrights. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#2 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#2 edit .. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#2 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#2 (text+ko) ==== @@ -1,7 +1,10 @@ /*- - * Copyright (c) 2009 Edward Tomasz Napierała + * Copyright (c) 2010 The FreeBSD Foundation * All rights reserved. * + * This software was developed by Edward Tomasz Napierala under sponsorship + * from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -22,6 +25,8 @@ * LIABILITY, OR TORT (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$ */ #include ==== //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#2 (text+ko) ==== @@ -1,7 +1,10 @@ /*- - * Copyright (c) 2009 Edward Tomasz Napierała + * Copyright (c) 2010 The FreeBSD Foundation * All rights reserved. * + * This software was developed by Edward Tomasz Napierala under sponsorship + * from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: ==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.c#2 (text+ko) ==== @@ -1,7 +1,10 @@ /*- - * Copyright (c) 2009 Edward Tomasz Napierała + * Copyright (c) 2010 The FreeBSD Foundation * All rights reserved. * + * This software was developed by Edward Tomasz Napierala under sponsorship + * from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -22,6 +25,8 @@ * LIABILITY, OR TORT (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$ */ #include From owner-p4-projects@FreeBSD.ORG Tue Jan 11 18:52:31 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E050A1065675; Tue, 11 Jan 2011 18:52:30 +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 A1FEE1065673 for ; Tue, 11 Jan 2011 18:52:30 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8DCEC8FC14 for ; Tue, 11 Jan 2011 18:52:30 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0BIqUSj045260 for ; Tue, 11 Jan 2011 18:52:30 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0BIqTpK045257 for perforce@freebsd.org; Tue, 11 Jan 2011 18:52:29 GMT (envelope-from jhb@freebsd.org) Date: Tue, 11 Jan 2011 18:52:29 GMT Message-Id: <201101111852.p0BIqTpK045257@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jan 2011 18:52:31 -0000 http://p4web.freebsd.org/@@187700?ac=10 Change 187700 by jhb@jhb_jhbbsd on 2011/01/11 18:51:37 IFC @187699 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#21 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#102 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#32 integrate .. //depot/projects/smpng/sys/amd64/include/_inttypes.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/_limits.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/_stdint.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#18 integrate .. //depot/projects/smpng/sys/arm/econa/ehci_ebus.c#2 integrate .. //depot/projects/smpng/sys/arm/econa/ohci_ec.c#2 integrate .. //depot/projects/smpng/sys/arm/include/_limits.h#8 integrate .. //depot/projects/smpng/sys/arm/include/_stdint.h#4 integrate .. //depot/projects/smpng/sys/arm/include/_types.h#9 integrate .. //depot/projects/smpng/sys/arm/include/vmparam.h#14 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#40 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#73 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#29 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_util.h#6 integrate .. //depot/projects/smpng/sys/conf/Makefile.mips#5 integrate .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-helper-board.c#6 integrate .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-mgmt-port.c#3 integrate .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-mgmt-port.h#3 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#37 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#78 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#15 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#121 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#68 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#22 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.h#14 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixv.h#2 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#41 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#86 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#39 integrate .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/controller/at91dci_atmelarm.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci_atmelarm.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/controller/avr32dci.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_ixp4xx.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_mv.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg_atmelarm.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci_atmelarm.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci_s3c24x0.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci_atmelarm.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/controller/xhci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/xhci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/input/ums.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_ipheth.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umct.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_cdce.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_msc.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_mtp.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_busdma.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_core.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_debug.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_error.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_handle_request.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usb_lookup.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mbuf.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_msctest.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/usb_parse.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_process.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usb_util.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#164 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#17 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#11 integrate .. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#19 integrate .. //depot/projects/smpng/sys/i386/include/_inttypes.h#4 integrate .. //depot/projects/smpng/sys/i386/include/_limits.h#8 integrate .. //depot/projects/smpng/sys/i386/include/_stdint.h#3 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#13 integrate .. //depot/projects/smpng/sys/i386/include/vmparam.h#17 integrate .. //depot/projects/smpng/sys/ia64/acpica/OsdEnvironment.c#13 integrate .. //depot/projects/smpng/sys/ia64/include/_limits.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/_stdint.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/float.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/vmparam.h#20 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#136 integrate .. //depot/projects/smpng/sys/kern/kern_hhook.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#84 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#53 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#112 integrate .. //depot/projects/smpng/sys/kern/subr_clock.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#18 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#19 integrate .. //depot/projects/smpng/sys/kern/vfs_mountroot.c#3 integrate .. //depot/projects/smpng/sys/mips/atheros/ar91xxreg.h#2 integrate .. //depot/projects/smpng/sys/mips/cavium/ciu.c#4 integrate .. //depot/projects/smpng/sys/mips/cavium/cvmx_config.h#2 integrate .. //depot/projects/smpng/sys/mips/cavium/files.octeon1#7 integrate .. //depot/projects/smpng/sys/mips/cavium/if_octm.c#1 branch .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-defines.h#3 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-rx.c#4 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-tx.c#4 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet.c#5 integrate .. //depot/projects/smpng/sys/mips/cavium/octeon_wdog.c#2 integrate .. //depot/projects/smpng/sys/mips/cavium/octopci.c#6 integrate .. //depot/projects/smpng/sys/mips/cavium/usb/octusb.c#3 integrate .. //depot/projects/smpng/sys/mips/cavium/usb/octusb_octeon.c#2 integrate .. //depot/projects/smpng/sys/mips/conf/OCTEON1#7 integrate .. //depot/projects/smpng/sys/mips/include/_inttypes.h#4 integrate .. //depot/projects/smpng/sys/mips/include/_limits.h#3 integrate .. //depot/projects/smpng/sys/mips/include/_stdint.h#3 integrate .. //depot/projects/smpng/sys/mips/include/_types.h#3 integrate .. //depot/projects/smpng/sys/mips/include/vmparam.h#9 integrate .. //depot/projects/smpng/sys/mips/rmi/xls_ehci.c#2 integrate .. //depot/projects/smpng/sys/net/vnet.c#10 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#28 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#15 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#87 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#107 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_dummynet.c#12 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#139 integrate .. //depot/projects/smpng/sys/netinet/tcp_lro.c#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_lro.h#2 integrate .. //depot/projects/smpng/sys/netinet/tcp_reass.c#17 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.h#8 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#54 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#88 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#81 integrate .. //depot/projects/smpng/sys/netinet/udp.h#6 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#19 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.h#5 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#19 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.h#17 integrate .. //depot/projects/smpng/sys/pc98/include/_inttypes.h#2 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#58 integrate .. //depot/projects/smpng/sys/powerpc/include/_inttypes.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/_limits.h#9 integrate .. //depot/projects/smpng/sys/powerpc/include/_stdint.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/_types.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/float.h#10 integrate .. //depot/projects/smpng/sys/powerpc/include/vmparam.h#17 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ehci_ps3.c#2 integrate .. //depot/projects/smpng/sys/rpc/clnt_dg.c#10 integrate .. //depot/projects/smpng/sys/rpc/clnt_vc.c#11 integrate .. //depot/projects/smpng/sys/rpc/svc_vc.c#8 integrate .. //depot/projects/smpng/sys/sparc64/include/_limits.h#7 integrate .. //depot/projects/smpng/sys/sparc64/include/_stdint.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/float.h#7 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#21 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#30 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#30 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#58 integrate .. //depot/projects/smpng/sys/sun4v/include/_limits.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/_stdint.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/float.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/vmparam.h#8 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/db_interface.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/db_trace.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/vm_machdep.c#6 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#46 integrate .. //depot/projects/smpng/sys/sys/imgact.h#22 integrate .. //depot/projects/smpng/sys/sys/link_elf.h#8 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#68 integrate .. //depot/projects/smpng/sys/sys/sysent.h#39 integrate .. //depot/projects/smpng/sys/sys/vmmeter.h#11 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#21 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#57 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#73 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#39 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#118 integrate .. //depot/projects/smpng/sys/x86/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/smpng/sys/x86/include/_inttypes.h#1 branch Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#21 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.34 2010/05/23 18:32:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.35 2011/01/08 16:13:44 kib Exp $"); #include #include @@ -75,11 +75,14 @@ .sv_setregs = exec_setregs, .sv_fixlimit = NULL, .sv_maxssiz = NULL, - .sv_flags = SV_ABI_FREEBSD | SV_LP64, + .sv_flags = SV_ABI_FREEBSD | SV_LP64 | SV_SHP, .sv_set_syscall_retval = cpu_set_syscall_retval, .sv_fetch_syscall_args = cpu_fetch_syscall_args, .sv_syscallnames = syscallnames, + .sv_shared_page_base = SHAREDPAGE, + .sv_shared_page_len = PAGE_SIZE, }; +INIT_SYSENTVEC(elf64_sysvec, &elf64_freebsd_sysvec); static Elf64_Brandinfo freebsd_brand_info = { .brand = ELFOSABI_FREEBSD, @@ -129,7 +132,6 @@ (sysinit_cfunc_t) elf64_insert_brand_entry, &kfreebsd_brand_info); - void elf64_dump_thread(struct thread *td __unused, void *dst __unused, size_t *off __unused) ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#102 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.736 2010/12/22 00:18:42 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.737 2011/01/08 16:13:44 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -386,7 +386,7 @@ } regs->tf_rsp = (long)sfp; - regs->tf_rip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); + regs->tf_rip = p->p_sysent->sv_sigcode_base; regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#32 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.34 2010/12/22 00:18:42 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.35 2011/01/08 16:13:44 kib Exp $"); #include "opt_compat.h" @@ -393,7 +393,8 @@ } regs->tf_rsp = (uintptr_t)sfp; - regs->tf_rip = p->p_sysent->sv_psstrings - sz_freebsd4_ia32_sigcode; + regs->tf_rip = p->p_sysent->sv_sigcode_base + sz_ia32_sigcode - + sz_freebsd4_ia32_sigcode; regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; @@ -514,7 +515,7 @@ } regs->tf_rsp = (uintptr_t)sfp; - regs->tf_rip = p->p_sysent->sv_psstrings - *(p->p_sysent->sv_szsigcode); + regs->tf_rip = p->p_sysent->sv_sigcode_base; regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; ==== //depot/projects/smpng/sys/amd64/include/_inttypes.h#3 (text+ko) ==== @@ -1,213 +1,6 @@ /*- - * Copyright (c) 2001 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Klaus Klein. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $ - * $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.4 2010/03/03 17:55:51 joel Exp $ + * This file is in the public domain. */ +/* $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.5 2011/01/08 18:09:48 tijl Exp $ */ -#ifndef _MACHINE_INTTYPES_H_ -#define _MACHINE_INTTYPES_H_ - -/* - * Macros for format specifiers. - */ - -/* fprintf(3) macros for signed integers. */ - -#define PRId8 "d" /* int8_t */ -#define PRId16 "d" /* int16_t */ -#define PRId32 "d" /* int32_t */ -#define PRId64 "ld" /* int64_t */ -#define PRIdLEAST8 "d" /* int_least8_t */ -#define PRIdLEAST16 "d" /* int_least16_t */ -#define PRIdLEAST32 "d" /* int_least32_t */ -#define PRIdLEAST64 "ld" /* int_least64_t */ -#define PRIdFAST8 "d" /* int_fast8_t */ -#define PRIdFAST16 "d" /* int_fast16_t */ -#define PRIdFAST32 "d" /* int_fast32_t */ -#define PRIdFAST64 "ld" /* int_fast64_t */ -#define PRIdMAX "jd" /* intmax_t */ -#define PRIdPTR "ld" /* intptr_t */ - -#define PRIi8 "i" /* int8_t */ -#define PRIi16 "i" /* int16_t */ -#define PRIi32 "i" /* int32_t */ -#define PRIi64 "li" /* int64_t */ -#define PRIiLEAST8 "i" /* int_least8_t */ -#define PRIiLEAST16 "i" /* int_least16_t */ -#define PRIiLEAST32 "i" /* int_least32_t */ -#define PRIiLEAST64 "li" /* int_least64_t */ -#define PRIiFAST8 "i" /* int_fast8_t */ -#define PRIiFAST16 "i" /* int_fast16_t */ -#define PRIiFAST32 "i" /* int_fast32_t */ -#define PRIiFAST64 "li" /* int_fast64_t */ -#define PRIiMAX "ji" /* intmax_t */ -#define PRIiPTR "li" /* intptr_t */ - -/* fprintf(3) macros for unsigned integers. */ - -#define PRIo8 "o" /* uint8_t */ -#define PRIo16 "o" /* uint16_t */ -#define PRIo32 "o" /* uint32_t */ -#define PRIo64 "lo" /* uint64_t */ -#define PRIoLEAST8 "o" /* uint_least8_t */ -#define PRIoLEAST16 "o" /* uint_least16_t */ -#define PRIoLEAST32 "o" /* uint_least32_t */ -#define PRIoLEAST64 "lo" /* uint_least64_t */ -#define PRIoFAST8 "o" /* uint_fast8_t */ -#define PRIoFAST16 "o" /* uint_fast16_t */ -#define PRIoFAST32 "o" /* uint_fast32_t */ -#define PRIoFAST64 "lo" /* uint_fast64_t */ -#define PRIoMAX "jo" /* uintmax_t */ -#define PRIoPTR "lo" /* uintptr_t */ - -#define PRIu8 "u" /* uint8_t */ -#define PRIu16 "u" /* uint16_t */ -#define PRIu32 "u" /* uint32_t */ -#define PRIu64 "lu" /* uint64_t */ -#define PRIuLEAST8 "u" /* uint_least8_t */ -#define PRIuLEAST16 "u" /* uint_least16_t */ -#define PRIuLEAST32 "u" /* uint_least32_t */ -#define PRIuLEAST64 "lu" /* uint_least64_t */ -#define PRIuFAST8 "u" /* uint_fast8_t */ -#define PRIuFAST16 "u" /* uint_fast16_t */ -#define PRIuFAST32 "u" /* uint_fast32_t */ -#define PRIuFAST64 "lu" /* uint_fast64_t */ -#define PRIuMAX "ju" /* uintmax_t */ -#define PRIuPTR "lu" /* uintptr_t */ - -#define PRIx8 "x" /* uint8_t */ -#define PRIx16 "x" /* uint16_t */ -#define PRIx32 "x" /* uint32_t */ -#define PRIx64 "lx" /* uint64_t */ -#define PRIxLEAST8 "x" /* uint_least8_t */ -#define PRIxLEAST16 "x" /* uint_least16_t */ -#define PRIxLEAST32 "x" /* uint_least32_t */ -#define PRIxLEAST64 "lx" /* uint_least64_t */ -#define PRIxFAST8 "x" /* uint_fast8_t */ -#define PRIxFAST16 "x" /* uint_fast16_t */ -#define PRIxFAST32 "x" /* uint_fast32_t */ -#define PRIxFAST64 "lx" /* uint_fast64_t */ -#define PRIxMAX "jx" /* uintmax_t */ -#define PRIxPTR "lx" /* uintptr_t */ - -#define PRIX8 "X" /* uint8_t */ -#define PRIX16 "X" /* uint16_t */ -#define PRIX32 "X" /* uint32_t */ -#define PRIX64 "lX" /* uint64_t */ -#define PRIXLEAST8 "X" /* uint_least8_t */ -#define PRIXLEAST16 "X" /* uint_least16_t */ -#define PRIXLEAST32 "X" /* uint_least32_t */ -#define PRIXLEAST64 "lX" /* uint_least64_t */ -#define PRIXFAST8 "X" /* uint_fast8_t */ -#define PRIXFAST16 "X" /* uint_fast16_t */ -#define PRIXFAST32 "X" /* uint_fast32_t */ -#define PRIXFAST64 "lX" /* uint_fast64_t */ -#define PRIXMAX "jX" /* uintmax_t */ -#define PRIXPTR "lX" /* uintptr_t */ - -/* fscanf(3) macros for signed integers. */ - -#define SCNd8 "hhd" /* int8_t */ -#define SCNd16 "hd" /* int16_t */ -#define SCNd32 "d" /* int32_t */ -#define SCNd64 "ld" /* int64_t */ -#define SCNdLEAST8 "hhd" /* int_least8_t */ -#define SCNdLEAST16 "hd" /* int_least16_t */ -#define SCNdLEAST32 "d" /* int_least32_t */ -#define SCNdLEAST64 "ld" /* int_least64_t */ -#define SCNdFAST8 "d" /* int_fast8_t */ -#define SCNdFAST16 "d" /* int_fast16_t */ -#define SCNdFAST32 "d" /* int_fast32_t */ -#define SCNdFAST64 "ld" /* int_fast64_t */ -#define SCNdMAX "jd" /* intmax_t */ -#define SCNdPTR "ld" /* intptr_t */ - -#define SCNi8 "hhi" /* int8_t */ -#define SCNi16 "hi" /* int16_t */ -#define SCNi32 "i" /* int32_t */ -#define SCNi64 "li" /* int64_t */ -#define SCNiLEAST8 "hhi" /* int_least8_t */ -#define SCNiLEAST16 "hi" /* int_least16_t */ -#define SCNiLEAST32 "i" /* int_least32_t */ -#define SCNiLEAST64 "li" /* int_least64_t */ -#define SCNiFAST8 "i" /* int_fast8_t */ -#define SCNiFAST16 "i" /* int_fast16_t */ -#define SCNiFAST32 "i" /* int_fast32_t */ -#define SCNiFAST64 "li" /* int_fast64_t */ -#define SCNiMAX "ji" /* intmax_t */ -#define SCNiPTR "li" /* intptr_t */ - -/* fscanf(3) macros for unsigned integers. */ - -#define SCNo8 "hho" /* uint8_t */ -#define SCNo16 "ho" /* uint16_t */ -#define SCNo32 "o" /* uint32_t */ -#define SCNo64 "lo" /* uint64_t */ -#define SCNoLEAST8 "hho" /* uint_least8_t */ -#define SCNoLEAST16 "ho" /* uint_least16_t */ -#define SCNoLEAST32 "o" /* uint_least32_t */ -#define SCNoLEAST64 "lo" /* uint_least64_t */ -#define SCNoFAST8 "o" /* uint_fast8_t */ -#define SCNoFAST16 "o" /* uint_fast16_t */ -#define SCNoFAST32 "o" /* uint_fast32_t */ -#define SCNoFAST64 "lo" /* uint_fast64_t */ -#define SCNoMAX "jo" /* uintmax_t */ -#define SCNoPTR "lo" /* uintptr_t */ - -#define SCNu8 "hhu" /* uint8_t */ -#define SCNu16 "hu" /* uint16_t */ -#define SCNu32 "u" /* uint32_t */ -#define SCNu64 "lu" /* uint64_t */ -#define SCNuLEAST8 "hhu" /* uint_least8_t */ -#define SCNuLEAST16 "hu" /* uint_least16_t */ -#define SCNuLEAST32 "u" /* uint_least32_t */ -#define SCNuLEAST64 "lu" /* uint_least64_t */ -#define SCNuFAST8 "u" /* uint_fast8_t */ -#define SCNuFAST16 "u" /* uint_fast16_t */ -#define SCNuFAST32 "u" /* uint_fast32_t */ -#define SCNuFAST64 "lu" /* uint_fast64_t */ -#define SCNuMAX "ju" /* uintmax_t */ -#define SCNuPTR "lu" /* uintptr_t */ - -#define SCNx8 "hhx" /* uint8_t */ -#define SCNx16 "hx" /* uint16_t */ -#define SCNx32 "x" /* uint32_t */ -#define SCNx64 "lx" /* uint64_t */ -#define SCNxLEAST8 "hhx" /* uint_least8_t */ -#define SCNxLEAST16 "hx" /* uint_least16_t */ -#define SCNxLEAST32 "x" /* uint_least32_t */ -#define SCNxLEAST64 "lx" /* uint_least64_t */ -#define SCNxFAST8 "x" /* uint_fast8_t */ -#define SCNxFAST16 "x" /* uint_fast16_t */ -#define SCNxFAST32 "x" /* uint_fast32_t */ -#define SCNxFAST64 "lx" /* uint_fast64_t */ -#define SCNxMAX "jx" /* uintmax_t */ -#define SCNxPTR "lx" /* uintptr_t */ - -#endif /* !_MACHINE_INTTYPES_H_ */ +#include ==== //depot/projects/smpng/sys/amd64/include/_limits.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.11 2005/08/20 16:44:40 stefanf Exp $ + * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.12 2011/01/08 11:13:34 tijl Exp $ */ #ifndef _MACHINE__LIMITS_H_ @@ -40,8 +40,6 @@ * type converted according to the integral promotions. The subtraction for * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2). - * These numbers are for the default configuration of gcc. They work for - * some other compilers as well, but this should not be depended on. */ #define __CHAR_BIT 8 /* number of bits in a char */ @@ -49,19 +47,19 @@ #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ -#define __UCHAR_MAX 0xffU /* max value for an unsigned char */ +#define __UCHAR_MAX 0xff /* max value for an unsigned char */ -#define __USHRT_MAX 0xffffU /* max value for an unsigned short */ +#define __USHRT_MAX 0xffff /* max value for an unsigned short */ #define __SHRT_MAX 0x7fff /* max value for a short */ #define __SHRT_MIN (-0x7fff - 1) /* min value for a short */ -#define __UINT_MAX 0xffffffffU /* max value for an unsigned int */ +#define __UINT_MAX 0xffffffff /* max value for an unsigned int */ #define __INT_MAX 0x7fffffff /* max value for an int */ #define __INT_MIN (-0x7fffffff - 1) /* min value for an int */ -#define __ULONG_MAX 0xffffffffffffffffUL /* max for an unsigned long */ -#define __LONG_MAX 0x7fffffffffffffffL /* max for a long */ -#define __LONG_MIN (-0x7fffffffffffffffL - 1) /* min for a long */ +#define __ULONG_MAX 0xffffffffffffffff /* max for an unsigned long */ +#define __LONG_MAX 0x7fffffffffffffff /* max for a long */ +#define __LONG_MIN (-0x7fffffffffffffff - 1) /* min for a long */ /* max value for an unsigned long long */ #define __ULLONG_MAX 0xffffffffffffffffULL @@ -83,10 +81,7 @@ #define __LONG_BIT 64 #define __WORD_BIT 32 -/* - * Minimum signal stack size. The current signal frame - * for i386 is 408 bytes large. - */ +/* Minimum signal stack size. */ #define __MINSIGSTKSZ (512 * 4) #endif /* !_MACHINE__LIMITS_H_ */ ==== //depot/projects/smpng/sys/amd64/include/_stdint.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/_stdint.h,v 1.3 2004/05/18 16:04:56 stefanf Exp $ + * $FreeBSD: src/sys/amd64/include/_stdint.h,v 1.4 2011/01/08 12:43:05 tijl Exp $ */ #ifndef _MACHINE__STDINT_H_ @@ -52,8 +52,8 @@ #define UINT32_C(c) (c ## U) #define UINT64_C(c) (c ## UL) -#define INTMAX_C(c) (c ## L) -#define UINTMAX_C(c) (c ## UL) +#define INTMAX_C(c) INT64_C(c) +#define UINTMAX_C(c) UINT64_C(c) #endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ ==== //depot/projects/smpng/sys/amd64/include/vmparam.h#18 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.63 2010/11/26 19:36:26 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.65 2011/01/09 12:50:44 kib Exp $ */ @@ -70,17 +70,6 @@ #endif /* - * The time for a process to be blocked before being very swappable. - * This is a number of seconds which the system takes as being a non-trivial - * amount of real time. You probably shouldn't change this; - * it is used in subtle ways (fractions and multiples of it are, that is, like - * half of a ``long time'', almost a long time, etc.) - * It is related to human patience and other factors which don't really - * change over time. - */ -#define MAXSLP 20 - -/* * We provide a machine specific single page allocator through the use * of the direct mapped segment. This uses 2MB pages for reduced * TLB pressure. @@ -186,7 +175,8 @@ #define VM_MAXUSER_ADDRESS UVADDR(NUPML4E, 0, 0, 0) -#define USRSTACK VM_MAXUSER_ADDRESS +#define SHAREDPAGE (VM_MAXUSER_ADDRESS - PAGE_SIZE) +#define USRSTACK SHAREDPAGE #define VM_MAX_ADDRESS UPT_MAX_ADDRESS #define VM_MIN_ADDRESS (0) ==== //depot/projects/smpng/sys/arm/econa/ehci_ebus.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/econa/ehci_ebus.c,v 1.1 2010/01/04 03:35:45 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/econa/ehci_ebus.c,v 1.2 2011/01/11 13:59:06 jhb Exp $"); #include "opt_bus.h" @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/arm/econa/ohci_ec.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/econa/ohci_ec.c,v 1.1 2010/01/04 03:35:45 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/econa/ohci_ec.c,v 1.2 2011/01/11 13:59:06 jhb Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/arm/include/_limits.h#8 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/_limits.h,v 1.9 2005/08/20 16:44:40 stefanf Exp $ + * $FreeBSD: src/sys/arm/include/_limits.h,v 1.11 2011/01/08 11:13:34 tijl Exp $ */ #ifndef _MACHINE__LIMITS_H_ @@ -40,8 +40,6 @@ * type converted according to the integral promotions. The subtraction for * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2). - * These numbers are for the default configuration of gcc. They work for - * some other compilers as well, but this should not be depended on. */ #define __CHAR_BIT 8 /* number of bits in a char */ @@ -55,20 +53,13 @@ #define __SHRT_MAX 0x7fff /* max value for a short */ #define __SHRT_MIN (-0x7fff - 1) /* min value for a short */ -#define __UINT_MAX 0xffffffffU /* max value for an unsigned int */ +#define __UINT_MAX 0xffffffff /* max value for an unsigned int */ #define __INT_MAX 0x7fffffff /* max value for an int */ #define __INT_MIN (-0x7fffffff - 1) /* min value for an int */ -/* Bad hack for gcc configured to give 64-bit longs. */ -#ifdef _LARGE_LONG -#define __ULONG_MAX 0xffffffffffffffffUL -#define __LONG_MAX 0x7fffffffffffffffL -#define __LONG_MIN (-0x7fffffffffffffffL - 1) -#else #define __ULONG_MAX 0xffffffffUL /* max value for an unsigned long */ #define __LONG_MAX 0x7fffffffL /* max value for a long */ #define __LONG_MIN (-0x7fffffffL - 1) /* min value for a long */ -#endif /* max value for an unsigned long long */ #define __ULLONG_MAX 0xffffffffffffffffULL @@ -87,11 +78,7 @@ #define __QUAD_MAX __LLONG_MAX /* max value for a quad_t */ #define __QUAD_MIN __LLONG_MIN /* min value for a quad_t */ -#ifdef _LARGE_LONG -#define __LONG_BIT 64 -#else #define __LONG_BIT 32 -#endif #define __WORD_BIT 32 /* Minimum signal stack size. */ ==== //depot/projects/smpng/sys/arm/include/_stdint.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/_stdint.h,v 1.3 2010/02/16 21:59:17 imp Exp $ + * $FreeBSD: src/sys/arm/include/_stdint.h,v 1.4 2011/01/08 12:43:05 tijl Exp $ */ #ifndef _MACHINE__STDINT_H_ @@ -45,8 +45,8 @@ #define UINT32_C(c) (c ## U) #define UINT64_C(c) (c ## ULL) -#define INTMAX_C(c) (c ## LL) -#define UINTMAX_C(c) (c ## ULL) +#define INTMAX_C(c) INT64_C(c) +#define UINTMAX_C(c) UINT64_C(c) #endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ ==== //depot/projects/smpng/sys/arm/include/_types.h#9 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.9 2006/05/15 00:17:27 cognet Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.10 2011/01/08 11:47:55 tijl Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -52,16 +52,16 @@ typedef unsigned short __uint16_t; typedef int __int32_t; typedef unsigned int __uint32_t; - -#ifdef __GNUCLIKE_ATTRIBUTE_MODE_DI -typedef int __attribute__((__mode__(__DI__))) __int64_t; -typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t; -#else +#ifndef lint +__extension__ +#endif /* LONGLONG */ typedef long long __int64_t; +#ifndef lint +__extension__ +#endif /* LONGLONG */ typedef unsigned long long __uint64_t; -#endif /* * Standard type definitions. ==== //depot/projects/smpng/sys/arm/include/vmparam.h#14 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.15 2010/07/27 20:33:50 jhb Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.16 2011/01/09 12:50:44 kib Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -146,7 +146,6 @@ #define DFLSSIZ (2*1024*1024) #define MAXSSIZ (8*1024*1024) #define SGROWSIZ (128*1024) -#define MAXSLP 20 #ifdef ARM_USE_SMALL_ALLOC #define UMA_MD_SMALL_ALLOC ==== //depot/projects/smpng/sys/cam/cam_periph.c#40 (text+ko) ==== @@ -28,14 +28,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.92 2010/12/10 21:38:51 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.93 2011/01/11 13:59:06 jhb Exp $"); #include #include #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#73 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.116 2010/11/23 13:49:15 pluknet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.117 2011/01/08 16:13:44 kib Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -2546,7 +2546,10 @@ execpath_len = 0; arginfo = (struct freebsd32_ps_strings *)curproc->p_sysent-> sv_psstrings; - szsigcode = *(imgp->proc->p_sysent->sv_szsigcode); + if (imgp->proc->p_sysent->sv_sigcode_base == 0) + szsigcode = *(imgp->proc->p_sysent->sv_szsigcode); + else + szsigcode = 0; destp = (caddr_t)arginfo - szsigcode - SPARE_USRSPACE - roundup(execpath_len, sizeof(char *)) - roundup(sizeof(canary), sizeof(char *)) - @@ -2556,7 +2559,7 @@ /* * install sigcode */ - if (szsigcode) + if (szsigcode != 0) copyout(imgp->proc->p_sysent->sv_sigcode, ((caddr_t)arginfo - szsigcode), szsigcode); ==== //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#29 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.38 2010/05/23 18:32:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.39 2011/01/08 16:13:44 kib Exp $"); #include "opt_compat.h" @@ -129,7 +129,7 @@ .sv_minsigstksz = MINSIGSTKSZ, .sv_pagesize = IA32_PAGE_SIZE, .sv_minuser = 0, - .sv_maxuser = FREEBSD32_USRSTACK, + .sv_maxuser = FREEBSD32_MAXUSER, .sv_usrstack = FREEBSD32_USRSTACK, .sv_psstrings = FREEBSD32_PS_STRINGS, .sv_stackprot = VM_PROT_ALL, @@ -137,13 +137,21 @@ .sv_setregs = ia32_setregs, .sv_fixlimit = ia32_fixlimit, .sv_maxssiz = &ia32_maxssiz, - .sv_flags = SV_ABI_FREEBSD | SV_IA32 | SV_ILP32, + .sv_flags = SV_ABI_FREEBSD | SV_IA32 | SV_ILP32 | +#ifdef __amd64__ + SV_SHP +#else + 0 +#endif + , .sv_set_syscall_retval = ia32_set_syscall_retval, .sv_fetch_syscall_args = ia32_fetch_syscall_args, .sv_syscallnames = freebsd32_syscallnames, + .sv_shared_page_base = FREEBSD32_SHAREDPAGE, + .sv_shared_page_len = PAGE_SIZE, }; +INIT_SYSENTVEC(elf_ia32_sysvec, &ia32_freebsd_sysvec); - static Elf32_Brandinfo ia32_brand_info = { .brand = ELFOSABI_FREEBSD, .machine = EM_386, @@ -191,7 +199,6 @@ (sysinit_cfunc_t) elf32_insert_brand_entry, &kia32_brand_info); - void elf32_dump_thread(struct thread *td __unused, void *dst __unused, size_t *off __unused) ==== //depot/projects/smpng/sys/compat/ia32/ia32_util.h#6 (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/compat/ia32/ia32_util.h,v 1.11 2010/11/23 12:47:15 kib Exp $ + * $FreeBSD: src/sys/compat/ia32/ia32_util.h,v 1.12 2011/01/08 16:13:44 kib Exp $ */ #ifndef _COMPAT_IA32_IA32_UTIL_H @@ -41,9 +41,13 @@ #include #ifdef __ia64__ -#define FREEBSD32_USRSTACK ((1ul << 32) - IA32_PAGE_SIZE * 2) +#define FREEBSD32_MAXUSER ((1ul << 32) - IA32_PAGE_SIZE * 2) +#define FREEBSD32_SHAREDPAGE 0 +#define FREEBSD32_USRSTACK FREEBSD32_MAXUSER #else -#define FREEBSD32_USRSTACK ((1ul << 32) - IA32_PAGE_SIZE) +#define FREEBSD32_MAXUSER ((1ul << 32) - IA32_PAGE_SIZE) +#define FREEBSD32_SHAREDPAGE (FREEBSD32_MAXUSER - IA32_PAGE_SIZE) +#define FREEBSD32_USRSTACK FREEBSD32_SHAREDPAGE #endif #define IA32_PAGE_SIZE 4096 ==== //depot/projects/smpng/sys/conf/Makefile.mips#5 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile.mips -# $FreeBSD: src/sys/conf/Makefile.mips,v 1.6 2010/12/17 09:14:25 jchandra Exp $ +# $FreeBSD: src/sys/conf/Makefile.mips,v 1.7 2011/01/10 05:13:06 jchandra Exp $ # # Makefile for FreeBSD # @@ -86,7 +86,7 @@ ${KERNEL_KO}.tramp.noheader ${KERNEL_KO}.tramp.bin ${LDSCRIPT_NAME}: $S/conf/${LDSCRIPT_NAME} - cat $S/conf/${LDSCRIPT_NAME}|sed s/KERNLOADADDR/${KERNLOADADDR}/g \ + sed s/KERNLOADADDR/${KERNLOADADDR}/g $S/conf/${LDSCRIPT_NAME} \ > ${LDSCRIPT_NAME} %RULES ==== //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-helper-board.c#6 (text+ko) ==== @@ -272,6 +272,8 @@ return ipd_port - 16; return -1; case CVMX_BOARD_TYPE_CUST_LANNER_MR730: + if ((ipd_port >= CVMX_HELPER_BOARD_MGMT_IPD_PORT) && (ipd_port < (CVMX_HELPER_BOARD_MGMT_IPD_PORT + 2))) + return (ipd_port - CVMX_HELPER_BOARD_MGMT_IPD_PORT) + 0x81; if ((ipd_port >= 0) && (ipd_port < 4)) return ipd_port; return -1; ==== //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-mgmt-port.c#3 (text+ko) ==== @@ -112,7 +112,7 @@ * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 11 22:17:49 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F2351065675; Tue, 11 Jan 2011 22:17:49 +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 3150B1065673 for ; Tue, 11 Jan 2011 22:17:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1CDC38FC18 for ; Tue, 11 Jan 2011 22:17:49 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0BMHmKE088175 for ; Tue, 11 Jan 2011 22:17:48 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0BMHmOf088172 for perforce@freebsd.org; Tue, 11 Jan 2011 22:17:48 GMT (envelope-from jhb@freebsd.org) Date: Tue, 11 Jan 2011 22:17:48 GMT Message-Id: <201101112217.p0BMHmOf088172@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jan 2011 22:17:49 -0000 http://p4web.freebsd.org/@@187714?ac=10 Change 187714 by jhb@jhb_jhbbsd on 2011/01/11 22:17:04 IFC @187713 Affected files ... .. //depot/projects/smpng/sys/arm/include/metadata.h#7 integrate .. //depot/projects/smpng/sys/conf/files#269 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#130 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#107 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#113 integrate .. //depot/projects/smpng/sys/powerpc/powermac/fcu.c#2 integrate .. //depot/projects/smpng/sys/sys/priority.h#6 integrate Differences ... ==== //depot/projects/smpng/sys/arm/include/metadata.h#7 (text+ko) ==== @@ -23,12 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/metadata.h,v 1.7 2010/07/11 21:11:23 raj Exp $ + * $FreeBSD: src/sys/arm/include/metadata.h,v 1.8 2011/01/11 22:07:39 marcel Exp $ */ #ifndef _MACHINE_METADATA_H_ #define _MACHINE_METADATA_H_ -#define MODINFOMD_DTBP 0x1001 +#define MODINFOMD_BOOTINFO 0x1001 +#define MODINFOMD_DTBP 0x1002 #endif /* !_MACHINE_METADATA_H_ */ ==== //depot/projects/smpng/sys/conf/files#269 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1552 2011/01/03 20:37:31 rmacklem Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1553 2011/01/11 21:46:29 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1812,6 +1812,20 @@ # dev/usb/wlan/if_rum.c optional rum dev/usb/wlan/if_run.c optional run +runfw.c optional runfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "runfw.c" +runfw.fwo optional runfw \ + dependency "runfw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} runfw" \ + no-implicit-rule \ + clean "runfw.fwo" +runfw optional runfw \ + dependency "$S/contrib/dev/run/rt2870.fw.uu" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/run/rt2870.fw.uu" \ + no-obj no-implicit-rule \ + clean "runfw" dev/usb/wlan/if_uath.c optional uath dev/usb/wlan/if_upgt.c optional upgt dev/usb/wlan/if_ural.c optional ural ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.26 2011/01/10 21:09:38 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.27 2011/01/11 19:20:01 jkim Exp $"); #include #include @@ -91,6 +91,18 @@ return (FILTER_STRAY); } +static void +acpi_intr_destroy(device_t dev, struct acpi_intr *ai) +{ + + if (ai->ai_handle != NULL) + bus_teardown_intr(dev, ai->ai_irq, ai->ai_handle); + if (ai->ai_irq != NULL) + bus_release_resource(dev, SYS_RES_IRQ, ai->ai_rid, ai->ai_irq); + bus_delete_resource(dev, SYS_RES_IRQ, ai->ai_rid); + free(ai, M_ACPIINTR); +} + ACPI_STATUS AcpiOsInstallInterruptHandler(UINT32 InterruptNumber, ACPI_OSD_HANDLER ServiceRoutine, void *Context) @@ -123,6 +135,8 @@ ai->ai_number = InterruptNumber; ai->ai_handler = ServiceRoutine; ai->ai_context = Context; + SLIST_INSERT_HEAD(&acpi_intr_list, ai, ai_link); + mtx_unlock(&acpi_intr_lock); /* * If the MADT contained an interrupt override directive for the SCI, @@ -151,19 +165,13 @@ device_printf(sc->acpi_dev, "could not set up interrupt\n"); goto error; } - SLIST_INSERT_HEAD(&acpi_intr_list, ai, ai_link); - mtx_unlock(&acpi_intr_lock); return_ACPI_STATUS (AE_OK); error: + mtx_lock(&acpi_intr_lock); + SLIST_REMOVE(&acpi_intr_list, ai, acpi_intr, ai_link); mtx_unlock(&acpi_intr_lock); - if (ai->ai_handle != NULL) - bus_teardown_intr(sc->acpi_dev, ai->ai_irq, ai->ai_handle); - if (ai->ai_irq != NULL) - bus_release_resource(sc->acpi_dev, SYS_RES_IRQ, ai->ai_rid, - ai->ai_irq); - bus_delete_resource(sc->acpi_dev, SYS_RES_IRQ, ai->ai_rid); - free(ai, M_ACPIINTR); + acpi_intr_destroy(sc->acpi_dev, ai); return_ACPI_STATUS (AE_ALREADY_EXISTS); } @@ -195,10 +203,7 @@ mtx_unlock(&acpi_intr_lock); if (ai == NULL) return_ACPI_STATUS (AE_NOT_EXIST); - bus_teardown_intr(sc->acpi_dev, ai->ai_irq, ai->ai_handle); - bus_release_resource(sc->acpi_dev, SYS_RES_IRQ, ai->ai_rid, ai->ai_irq); - bus_delete_resource(sc->acpi_dev, SYS_RES_IRQ, ai->ai_rid); - free(ai, M_ACPIINTR); + acpi_intr_destroy(sc->acpi_dev, ai); return_ACPI_STATUS (AE_OK); } ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#130 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.297 2010/12/23 18:50:14 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.298 2011/01/11 19:26:39 jkim Exp $"); #include "opt_acpi.h" #include @@ -3044,6 +3044,20 @@ /* * ACPICA Event Handlers (FixedEvent, also called from button notify handler) */ +static void +acpi_invoke_sleep_eventhandler(void *context) +{ + + EVENTHANDLER_INVOKE(acpi_sleep_event, *(int *)context); +} + +static void +acpi_invoke_wake_eventhandler(void *context) +{ + + EVENTHANDLER_INVOKE(acpi_wakeup_event, *(int *)context); +} + UINT32 acpi_event_power_button_sleep(void *context) { @@ -3051,8 +3065,9 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - EVENTHANDLER_INVOKE(acpi_sleep_event, sc->acpi_power_button_sx); - + if (ACPI_FAILURE(AcpiOsExecute(OSL_NOTIFY_HANDLER, + acpi_invoke_sleep_eventhandler, &sc->acpi_power_button_sx))) + return_VALUE (ACPI_INTERRUPT_NOT_HANDLED); return_VALUE (ACPI_INTERRUPT_HANDLED); } @@ -3063,8 +3078,9 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - EVENTHANDLER_INVOKE(acpi_wakeup_event, sc->acpi_power_button_sx); - + if (ACPI_FAILURE(AcpiOsExecute(OSL_NOTIFY_HANDLER, + acpi_invoke_wake_eventhandler, &sc->acpi_power_button_sx))) + return_VALUE (ACPI_INTERRUPT_NOT_HANDLED); return_VALUE (ACPI_INTERRUPT_HANDLED); } @@ -3075,8 +3091,9 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - EVENTHANDLER_INVOKE(acpi_sleep_event, sc->acpi_sleep_button_sx); - + if (ACPI_FAILURE(AcpiOsExecute(OSL_NOTIFY_HANDLER, + acpi_invoke_sleep_eventhandler, &sc->acpi_sleep_button_sx))) + return_VALUE (ACPI_INTERRUPT_NOT_HANDLED); return_VALUE (ACPI_INTERRUPT_HANDLED); } @@ -3087,8 +3104,9 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - EVENTHANDLER_INVOKE(acpi_wakeup_event, sc->acpi_sleep_button_sx); - + if (ACPI_FAILURE(AcpiOsExecute(OSL_NOTIFY_HANDLER, + acpi_invoke_wake_eventhandler, &sc->acpi_sleep_button_sx))) + return_VALUE (ACPI_INTERRUPT_NOT_HANDLED); return_VALUE (ACPI_INTERRUPT_HANDLED); } ==== //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#20 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: uplcom.c,v 1.21 2001/11/13 06:24:56 lukem Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/serial/uplcom.c,v 1.28 2011/01/11 13:59:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/serial/uplcom.c,v 1.29 2011/01/11 19:05:55 gavin Exp $"); /*- * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . @@ -254,12 +254,12 @@ UPLCOM_DEV(ALCOR, AU9720), /* Alcor AU9720 USB 2.0-RS232 */ UPLCOM_DEV(ANCHOR, SERIAL), /* Anchor Serial adapter */ UPLCOM_DEV(ATEN, UC232A), /* PLANEX USB-RS232 URS-03 */ - UPLCOM_DEV(BELKIN, F5U257), /* Belkin F5U257 */ + UPLCOM_DEV(BELKIN, F5U257), /* Belkin F5U257 USB to Serial */ UPLCOM_DEV(COREGA, CGUSBRS232R), /* Corega CG-USBRS232R */ UPLCOM_DEV(EPSON, CRESSI_EDY), /* Cressi Edy diving computer */ UPLCOM_DEV(EPSON, N2ITION3), /* Zeagle N2iTion3 diving computer */ - UPLCOM_DEV(ELECOM, UCSGT), /* ELECOM UC-SGT */ - UPLCOM_DEV(ELECOM, UCSGT0), /* ELECOM UC-SGT */ + UPLCOM_DEV(ELECOM, UCSGT), /* ELECOM UC-SGT Serial Adapter */ + UPLCOM_DEV(ELECOM, UCSGT0), /* ELECOM UC-SGT Serial Adapter */ UPLCOM_DEV(HAL, IMR001), /* HAL Corporation Crossam2+USB */ UPLCOM_DEV(HP, LD220), /* HP LD220 POS Display */ UPLCOM_DEV(IODATA, USBRSAQ), /* I/O DATA USB-RSAQ */ @@ -285,17 +285,17 @@ UPLCOM_DEV(PROLIFIC, RSAQ3), /* I/O DATA USB-RSAQ3 */ UPLCOM_DEV(PROLIFIC, UIC_MSR206), /* UIC MSR206 Card Reader */ UPLCOM_DEV(PROLIFIC2, PL2303), /* Prolific adapter */ - UPLCOM_DEV(RADIOSHACK, USBCABLE), + UPLCOM_DEV(RADIOSHACK, USBCABLE), /* Radio Shack USB Adapter */ UPLCOM_DEV(RATOC, REXUSB60), /* RATOC REX-USB60 */ UPLCOM_DEV(SAGEM, USBSERIAL), /* Sagem USB-Serial Controller */ UPLCOM_DEV(SAMSUNG, I330), /* Samsung I330 phone cradle */ UPLCOM_DEV(SANWA, KB_USB2), /* Sanwa KB-USB2 Multimeter cable */ - UPLCOM_DEV(SIEMENS3, EF81), /* Seimens EF81 */ - UPLCOM_DEV(SIEMENS3, SX1), /* Seimens SX1 */ - UPLCOM_DEV(SIEMENS3, X65), /* Seimens X65 */ - UPLCOM_DEV(SIEMENS3, X75), /* Seimens X75 */ + UPLCOM_DEV(SIEMENS3, EF81), /* Siemens EF81 */ + UPLCOM_DEV(SIEMENS3, SX1), /* Siemens SX1 */ + UPLCOM_DEV(SIEMENS3, X65), /* Siemens X65 */ + UPLCOM_DEV(SIEMENS3, X75), /* Siemens X75 */ UPLCOM_DEV(SITECOM, SERIAL), /* Sitecom USB to Serial */ - UPLCOM_DEV(SMART, PL2303), /* SMART Technologies */ + UPLCOM_DEV(SMART, PL2303), /* SMART Technologies USB to Serial */ UPLCOM_DEV(SONY, QN3), /* Sony QN3 phone cable */ UPLCOM_DEV(SONYERICSSON, DATAPILOT), /* Sony Ericsson Datapilot */ UPLCOM_DEV(SONYERICSSON, DCU10), /* Sony Ericsson DCU-10 Cable */ @@ -305,7 +305,7 @@ UPLCOM_DEV(SYNTECH, CPT8001C), /* Syntech CPT-8001C Barcode scanner */ UPLCOM_DEV(TDK, UHA6400), /* TDK USB-PHS Adapter UHA6400 */ UPLCOM_DEV(TDK, UPA9664), /* TDK USB-PHS Adapter UPA9664 */ - UPLCOM_DEV(TRIPPLITE, U209), /* Tripp-Lite U209-000-R */ + UPLCOM_DEV(TRIPPLITE, U209), /* Tripp-Lite U209-000-R USB to Serial */ UPLCOM_DEV(YCCABLE, PL2303), /* YC Cable USB-Serial */ }; #undef UPLCOM_DEV ==== //depot/projects/smpng/sys/kern/kern_intr.c#107 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.177 2010/06/10 16:14:05 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.178 2011/01/11 22:15:30 jhb Exp $"); #include "opt_ddb.h" @@ -130,22 +130,18 @@ INTR_TYPE_CAM | INTR_TYPE_MISC | INTR_TYPE_CLK | INTR_TYPE_AV); switch (flags) { case INTR_TYPE_TTY: - pri = PI_TTYLOW; + pri = PI_TTY; break; case INTR_TYPE_BIO: - /* - * XXX We need to refine this. BSD/OS distinguishes - * between tape and disk priorities. - */ pri = PI_DISK; break; case INTR_TYPE_NET: pri = PI_NET; break; case INTR_TYPE_CAM: - pri = PI_DISK; /* XXX or PI_CAM? */ + pri = PI_DISK; break; - case INTR_TYPE_AV: /* Audio/video */ + case INTR_TYPE_AV: pri = PI_AV; break; case INTR_TYPE_CLK: @@ -1082,7 +1078,7 @@ *eventp = ie; } error = intr_event_add_handler(ie, name, NULL, handler, arg, - (pri * RQ_PPQ) + PI_SOFT, flags, cookiep); + PI_SWI(pri), flags, cookiep); if (error) return (error); if (pri == SWI_CLOCK) { @@ -1656,18 +1652,13 @@ case PI_AV: db_printf("AV "); break; - case PI_TTYHIGH: - case PI_TTYLOW: + case PI_TTY: db_printf("TTY "); break; - case PI_TAPE: - db_printf("TAPE"); - break; case PI_NET: db_printf("NET "); break; case PI_DISK: - case PI_DISKLOW: db_printf("DISK"); break; case PI_DULL: ==== //depot/projects/smpng/sys/kern/sched_ule.c#113 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.287 2011/01/10 20:48:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.288 2011/01/11 22:13:19 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -1388,7 +1388,7 @@ int score; int pri; - if (td->td_pri_class != PRI_TIMESHARE) + if (PRI_BASE(td->td_pri_class) != PRI_TIMESHARE) return; /* * If the score is interactive we place the thread in the realtime @@ -2124,7 +2124,7 @@ ts = td->td_sched; if (td->td_pri_class & PRI_FIFO_BIT) return; - if (td->td_pri_class == PRI_TIMESHARE) { + if (PRI_BASE(td->td_pri_class) == PRI_TIMESHARE) { /* * We used a tick; charge it to the thread so * that we can compute our interactivity. ==== //depot/projects/smpng/sys/powerpc/powermac/fcu.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powermac/fcu.c,v 1.1 2010/10/15 20:08:16 andreast Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powermac/fcu.c,v 1.2 2011/01/11 21:18:29 andreast Exp $"); #include #include @@ -62,19 +62,20 @@ #define FCU_PWM_FAIL 0x2b #define FCU_PWM_AVAILABLE 0x2c #define FCU_PWM_ACTIVE 0x2d -#define FCU_PWM_READ(x) 0x31 + (x) * 2 -#define FCU_PWM_SET(x) 0x30 + (x) * 2 +#define FCU_PWM_RPM(x) 0x31 + (x) * 2 /* Get RPM. */ +#define FCU_PWM_SGET(x) 0x30 + (x) * 2 /* Set or get PWM. */ struct fcu_fan { int id; - cell_t min_rpm; - cell_t max_rpm; + cell_t min; + cell_t max; char location[32]; enum { FCU_FAN_RPM, FCU_FAN_PWM } type; int setpoint; + int rpm; }; struct fcu_softc { @@ -85,6 +86,14 @@ int sc_nfans; }; +/* We can read the PWM and the RPM from a PWM controlled fan. + * Offer both values via sysctl. + */ +enum { + FCU_PWM_SYSCTL_PWM = 1 << 8, + FCU_PWM_SYSCTL_RPM = 2 << 8 +}; + static int fcu_rpm_shift; /* Regular bus attachment functions */ @@ -96,6 +105,9 @@ static int fcu_fill_fan_prop(device_t dev); static int fcu_fan_set_rpm(device_t dev, struct fcu_fan *fan, int rpm); static int fcu_fan_get_rpm(device_t dev, struct fcu_fan *fan, int *rpm); +static int fcu_fan_set_pwm(device_t dev, struct fcu_fan *fan, int pwm); +static int fcu_fan_get_pwm(device_t dev, struct fcu_fan *fan, int *pwm, + int *rpm); static int fcu_fanrpm_sysctl(SYSCTL_HANDLER_ARGS); static void fcu_start(void *xdev); static int fcu_write(device_t dev, uint32_t addr, uint8_t reg, uint8_t *buf, @@ -246,34 +258,21 @@ sc = device_get_softc(dev); /* Clamp to allowed range */ - rpm = max(fan->min_rpm, rpm); - rpm = min(fan->max_rpm, rpm); + rpm = max(fan->min, rpm); + rpm = min(fan->max, rpm); if (fan->type == FCU_FAN_RPM) { reg = FCU_RPM_SET(fan->id); fan->setpoint = rpm; - } else if (fan->type == FCU_FAN_PWM) { - reg = FCU_PWM_SET(fan->id); - if (rpm > 3500) - rpm = 3500; - if (rpm < 500) - rpm = 500; - fan->setpoint = rpm; - /* PWM 30: 550 rpm, PWM 255: 3400 rpm. */ - rpm = (rpm * 255) / 3500; } else { device_printf(dev, "Unknown fan type: %d\n", fan->type); return (EIO); } - if (fan->type == FCU_FAN_RPM) { - buf[0] = rpm >> (8 - fcu_rpm_shift); - buf[1] = rpm << fcu_rpm_shift; - fcu_write(sc->sc_dev, sc->sc_addr, reg, buf, 2); - } else { - buf[0] = rpm; - fcu_write(sc->sc_dev, sc->sc_addr, reg, buf, 1); - } + buf[0] = rpm >> (8 - fcu_rpm_shift); + buf[1] = rpm << fcu_rpm_shift; + + fcu_write(sc->sc_dev, sc->sc_addr, reg, buf, 2); return (0); } @@ -313,7 +312,63 @@ return (ENXIO); } reg = FCU_RPM_READ(fan->id); - } else if (fan->type == FCU_FAN_PWM) { + + } else { + device_printf(dev, "Unknown fan type: %d\n", fan->type); + return (EIO); + } + + /* It seems that we can read the fans rpm. */ + fcu_read_1(sc->sc_dev, sc->sc_addr, reg, buff); + + *rpm = (buff[0] << (8 - fcu_rpm_shift)) | buff[1] >> fcu_rpm_shift; + + return (0); +} + +static int +fcu_fan_set_pwm(device_t dev, struct fcu_fan *fan, int pwm) +{ + uint8_t reg; + struct fcu_softc *sc; + uint8_t buf[2]; + + sc = device_get_softc(dev); + + /* Clamp to allowed range */ + pwm = max(fan->min, pwm); + pwm = min(fan->max, pwm); + + if (fan->type == FCU_FAN_PWM) { + reg = FCU_PWM_SGET(fan->id); + if (pwm > 100) + pwm = 100; + if (pwm < 30) + pwm = 30; + fan->setpoint = pwm; + } else { + device_printf(dev, "Unknown fan type: %d\n", fan->type); + return (EIO); + } + + buf[0] = (pwm * 2550) / 1000; + + fcu_write(sc->sc_dev, sc->sc_addr, reg, buf, 1); + + return (0); +} + +static int +fcu_fan_get_pwm(device_t dev, struct fcu_fan *fan, int *pwm, int *rpm) +{ + uint8_t reg; + struct fcu_softc *sc; + uint8_t buf[2]; + uint8_t active = 0, avail = 0, fail = 0; + + sc = device_get_softc(dev); + + if (fan->type == FCU_FAN_PWM) { /* Check if the fan is available. */ reg = FCU_PWM_AVAILABLE; fcu_read_1(sc->sc_dev, sc->sc_addr, reg, &avail); @@ -337,16 +392,21 @@ fan->id); return (ENXIO); } - reg = FCU_PWM_READ(fan->id); + reg = FCU_PWM_SGET(fan->id); } else { device_printf(dev, "Unknown fan type: %d\n", fan->type); return (EIO); } - /* It seems that we can read the fans rpm. */ - fcu_read_1(sc->sc_dev, sc->sc_addr, reg, buff); + /* It seems that we can read the fans pwm. */ + fcu_read_1(sc->sc_dev, sc->sc_addr, reg, buf); + + *pwm = (buf[0] * 1000) / 2550; - *rpm = (buff[0] << (8 - fcu_rpm_shift)) | buff[1] >> fcu_rpm_shift; + /* Now read the rpm. */ + reg = FCU_PWM_RPM(fan->id); + fcu_read_1(sc->sc_dev, sc->sc_addr, reg, buf); + *rpm = (buf[0] << (8 - fcu_rpm_shift)) | buf[1] >> fcu_rpm_shift; return (0); } @@ -412,18 +472,41 @@ device_t fcu; struct fcu_softc *sc; struct fcu_fan *fan; - int rpm = 0, error; + int rpm = 0, pwm = 0, error; fcu = arg1; sc = device_get_softc(fcu); - fan = &sc->sc_fans[arg2]; - fcu_fan_get_rpm(fcu, fan, &rpm); - error = sysctl_handle_int(oidp, &rpm, 0, req); + fan = &sc->sc_fans[arg2 & 0x00ff]; + if (fan->type == FCU_FAN_RPM) { + fcu_fan_get_rpm(fcu, fan, &rpm); + error = sysctl_handle_int(oidp, &rpm, 0, req); + } else { + fcu_fan_get_pwm(fcu, fan, &pwm, &rpm); + + switch (arg2 & 0xff00) { + case FCU_PWM_SYSCTL_PWM: + error = sysctl_handle_int(oidp, &pwm, 0, req); + break; + case FCU_PWM_SYSCTL_RPM: + error = sysctl_handle_int(oidp, &rpm, 0, req); + break; + default: + /* This should never happen */ + error = -1; + }; + } + + /* We can only read the RPM from a PWM controlled fan, so return. */ + if ((arg2 & 0xff00) == FCU_PWM_SYSCTL_RPM) + return (0); if (error || !req->newptr) return (error); - return (fcu_fan_set_rpm(fcu, fan, rpm)); + if (fan->type == FCU_FAN_RPM) + return (fcu_fan_set_rpm(fcu, fan, rpm)); + else + return (fcu_fan_set_pwm(fcu, fan, pwm)); } static void @@ -432,7 +515,6 @@ struct fcu_softc *sc; struct sysctl_oid *oid, *fanroot_oid; struct sysctl_ctx_list *ctx; - phandle_t child; char sysctl_name[32]; int i, j; @@ -440,8 +522,6 @@ sc->sc_nfans = 0; - child = ofw_bus_get_node(dev); - /* Count the actual number of fans. */ sc->sc_nfans = fcu_fill_fan_prop(dev); @@ -472,35 +552,69 @@ } sysctl_name[j] = 0; - sc->sc_fans[i].min_rpm = 2400 >> fcu_rpm_shift; - sc->sc_fans[i].max_rpm = 56000 >> fcu_rpm_shift; - fcu_fan_get_rpm(dev, &sc->sc_fans[i], &sc->sc_fans[i].setpoint); + if (sc->sc_fans[i].type == FCU_FAN_RPM) { + sc->sc_fans[i].min = 2400 >> fcu_rpm_shift; + sc->sc_fans[i].max = 56000 >> fcu_rpm_shift; + fcu_fan_get_rpm(dev, &sc->sc_fans[i], + &sc->sc_fans[i].setpoint); + + oid = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(fanroot_oid), + OID_AUTO, sysctl_name, + CTLFLAG_RD, 0, "Fan Information"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "minrpm", CTLTYPE_INT | CTLFLAG_RD, + &(sc->sc_fans[i].min), sizeof(cell_t), + "Minimum allowed RPM"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "maxrpm", CTLTYPE_INT | CTLFLAG_RD, + &(sc->sc_fans[i].max), sizeof(cell_t), + "Maximum allowed RPM"); + /* I use i to pass the fan id. */ + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "rpm", CTLTYPE_INT | CTLFLAG_RW, dev, i, + fcu_fanrpm_sysctl, "I", "Fan RPM"); + } else { + sc->sc_fans[i].min = 30; + sc->sc_fans[i].max = 100; + fcu_fan_get_pwm(dev, &sc->sc_fans[i], + &sc->sc_fans[i].setpoint, + &sc->sc_fans[i].rpm); - oid = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(fanroot_oid), - OID_AUTO, sysctl_name, CTLFLAG_RD, 0, - "Fan Information"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "minrpm", - CTLTYPE_INT | CTLFLAG_RD, - &(sc->sc_fans[i].min_rpm), sizeof(cell_t), - "Minimum allowed RPM"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "maxrpm", - CTLTYPE_INT | CTLFLAG_RD, - &(sc->sc_fans[i].max_rpm), sizeof(cell_t), - "Maximum allowed RPM"); - /* I use i to pass the fan id. */ - SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "rpm", - CTLTYPE_INT | CTLFLAG_RW, dev, i, - fcu_fanrpm_sysctl, "I", "Fan RPM"); + oid = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(fanroot_oid), + OID_AUTO, sysctl_name, + CTLFLAG_RD, 0, "Fan Information"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "minpwm", CTLTYPE_INT | CTLFLAG_RD, + &(sc->sc_fans[i].min), sizeof(cell_t), + "Minimum allowed PWM in %"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "maxpwm", CTLTYPE_INT | CTLFLAG_RD, + &(sc->sc_fans[i].max), sizeof(cell_t), + "Maximum allowed PWM in %"); + /* I use i to pass the fan id or'ed with the type + * of info I want to display/modify. + */ + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "pwm", CTLTYPE_INT | CTLFLAG_RW, dev, + FCU_PWM_SYSCTL_PWM | i, + fcu_fanrpm_sysctl, "I", "Fan PWM in %"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "rpm", CTLTYPE_INT | CTLFLAG_RD, dev, + FCU_PWM_SYSCTL_RPM | i, + fcu_fanrpm_sysctl, "I", "Fan RPM"); + } } /* Dump fan location, type & RPM. */ if (bootverbose) { device_printf(dev, "Fans\n"); for (i = 0; i < sc->sc_nfans; i++) { - device_printf(dev, "Location: %s type: %d ID: %d RPM: %d\n", - sc->sc_fans[i].location, + device_printf(dev, "Location: %s type: %d ID: %d " + "RPM: %d\n", sc->sc_fans[i].location, sc->sc_fans[i].type, sc->sc_fans[i].id, - sc->sc_fans[i].setpoint); + (sc->sc_fans[i].type == FCU_FAN_RPM) ? + sc->sc_fans[i].setpoint : + sc->sc_fans[i].rpm ); } } } ==== //depot/projects/smpng/sys/sys/priority.h#6 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/priority.h,v 1.5 2011/01/06 22:09:37 jhb Exp $ + * $FreeBSD: src/sys/sys/priority.h,v 1.6 2011/01/11 22:15:30 jhb Exp $ */ #ifndef _SYS_PRIORITY_H_ @@ -85,14 +85,12 @@ #define PI_REALTIME (PRI_MIN_ITHD + 0) #define PI_AV (PRI_MIN_ITHD + 4) -#define PI_TTYHIGH (PRI_MIN_ITHD + 8) -#define PI_TAPE (PRI_MIN_ITHD + 12) -#define PI_NET (PRI_MIN_ITHD + 16) -#define PI_DISK (PRI_MIN_ITHD + 20) -#define PI_TTYLOW (PRI_MIN_ITHD + 24) -#define PI_DISKLOW (PRI_MIN_ITHD + 28) -#define PI_DULL (PRI_MIN_ITHD + 32) -#define PI_SOFT (PRI_MIN_ITHD + 36) +#define PI_NET (PRI_MIN_ITHD + 8) +#define PI_DISK (PRI_MIN_ITHD + 12) +#define PI_TTY (PRI_MIN_ITHD + 16) +#define PI_DULL (PRI_MIN_ITHD + 20) +#define PI_SOFT (PRI_MIN_ITHD + 24) +#define PI_SWI(x) (PI_SOFT + (x) * RQ_PPQ) #define PRI_MIN_KERN (64) #define PRI_MAX_KERN (PRI_MIN_REALTIME - 1) From owner-p4-projects@FreeBSD.ORG Wed Jan 12 20:12:10 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E36A810656A4; Wed, 12 Jan 2011 20:12:09 +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 A536A1065696 for ; Wed, 12 Jan 2011 20:12:09 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 77FA88FC12 for ; Wed, 12 Jan 2011 20:12:09 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0CKC98E096158 for ; Wed, 12 Jan 2011 20:12:09 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0CKC99x096155 for perforce@freebsd.org; Wed, 12 Jan 2011 20:12:09 GMT (envelope-from jhb@freebsd.org) Date: Wed, 12 Jan 2011 20:12:09 GMT Message-Id: <201101122012.p0CKC99x096155@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187740 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2011 20:12:10 -0000 http://p4web.freebsd.org/@@187740?ac=10 Change 187740 by jhb@jhb_jhbbsd on 2011/01/12 20:11:36 Grump. Affected files ... .. //depot/projects/smpng/sys/kern/kern_timeout.c#54 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_timeout.c#54 (text+ko) ==== @@ -1018,4 +1018,5 @@ sticks++; } while (callouts > 0); } +#endif #endif /* DDB */ From owner-p4-projects@FreeBSD.ORG Thu Jan 13 17:19:05 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBA691065674; Thu, 13 Jan 2011 17:19:04 +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 8D9021065673 for ; Thu, 13 Jan 2011 17:19:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 78D828FC12 for ; Thu, 13 Jan 2011 17:19:04 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0DHJ4Pt077158 for ; Thu, 13 Jan 2011 17:19:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0DHJ3EQ077154 for perforce@freebsd.org; Thu, 13 Jan 2011 17:19:03 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Jan 2011 17:19:03 GMT Message-Id: <201101131719.p0DHJ3EQ077154@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187767 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jan 2011 17:19:05 -0000 http://p4web.freebsd.org/@@187767?ac=10 Change 187767 by jhb@jhb_jhbbsd on 2011/01/13 17:17:59 IFC @187766 Affected files ... .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#18 integrate .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#22 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#17 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_capture.c#4 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#18 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#12 integrate .. //depot/projects/smpng/sys/dev/age/if_age.c#15 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#13 integrate .. //depot/projects/smpng/sys/dev/ale/if_ale.c#10 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#91 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#41 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#122 integrate .. //depot/projects/smpng/sys/dev/bwi/if_bwi.c#11 integrate .. //depot/projects/smpng/sys/dev/bwn/if_bwn.c#11 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#36 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#30 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#6 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#24 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#29 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#8 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#49 integrate .. //depot/projects/smpng/sys/dev/iscsi/initiator/iscsi.c#8 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#37 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#23 integrate .. //depot/projects/smpng/sys/dev/jme/if_jme.c#12 integrate .. //depot/projects/smpng/sys/dev/jme/if_jmevar.h#4 integrate .. //depot/projects/smpng/sys/dev/mps/mps.c#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#31 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#20 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#23 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#74 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#87 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#45 integrate .. //depot/projects/smpng/sys/dev/ste/if_ste.c#9 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#42 integrate .. //depot/projects/smpng/sys/dev/usb/input/atp.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_process.h#8 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdcache.c#4 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#18 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdstate.c#14 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#12 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#43 integrate .. //depot/projects/smpng/sys/geom/sched/g_sched.c#3 integrate .. //depot/projects/smpng/sys/geom/sched/gs_rr.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#29 integrate .. //depot/projects/smpng/sys/kern/kern_clocksource.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_et.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#65 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#114 integrate .. //depot/projects/smpng/sys/kern/subr_kobj.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#65 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#185 integrate .. //depot/projects/smpng/sys/mips/include/_types.h#4 integrate .. //depot/projects/smpng/sys/mips/include/cpufunc.h#8 integrate .. //depot/projects/smpng/sys/mips/include/md_var.h#7 integrate .. //depot/projects/smpng/sys/mips/include/param.h#12 integrate .. //depot/projects/smpng/sys/mips/include/pmap.h#20 integrate .. //depot/projects/smpng/sys/mips/include/proc.h#4 integrate .. //depot/projects/smpng/sys/mips/include/pte.h#8 integrate .. //depot/projects/smpng/sys/mips/mips/dump_machdep.c#4 integrate .. //depot/projects/smpng/sys/mips/mips/exception.S#9 integrate .. //depot/projects/smpng/sys/mips/mips/machdep.c#21 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#28 integrate .. //depot/projects/smpng/sys/mips/mips/swtch.S#7 integrate .. //depot/projects/smpng/sys/mips/mips/trap.c#12 integrate .. //depot/projects/smpng/sys/mips/rmi/xlr_machdep.c#9 integrate .. //depot/projects/smpng/sys/net/if.c#140 integrate .. //depot/projects/smpng/sys/net/netisr.c#24 integrate .. //depot/projects/smpng/sys/net/route.c#58 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_amrr.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#27 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/common/ng_bluetooth.c#9 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#23 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#23 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#21 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#21 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#52 integrate .. //depot/projects/smpng/sys/netinet/cc/cc_htcp.c#2 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#88 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_dn_io.c#5 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_dummynet.c#13 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_dynamic.c#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#27 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#128 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#81 integrate .. //depot/projects/smpng/sys/nlm/nlm_prot_impl.c#12 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea64.c#16 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap.c#15 integrate .. //depot/projects/smpng/sys/powerpc/include/spr.h#22 integrate .. //depot/projects/smpng/sys/rpc/svc.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#10 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#18 integrate .. //depot/projects/smpng/sys/sys/param.h#168 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#69 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#85 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#45 integrate .. //depot/projects/smpng/sys/x86/x86/busdma_machdep.c#2 integrate .. //depot/projects/smpng/sys/x86/x86/local_apic.c#11 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.27 2010/11/10 18:50:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.28 2011/01/12 19:54:19 mdf Exp $"); #include #include @@ -68,7 +68,7 @@ if (intr_model != ACPI_INTR_PIC) acpi_SetIntrModel(intr_model); - SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx, + SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "reset_video", CTLFLAG_RW, &acpi_reset_video, 0, "Call the VESA reset BIOS vector on the resume path"); ==== //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#22 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.118 2010/11/01 18:18:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.119 2011/01/13 17:00:22 jhb Exp $ */ /* @@ -58,17 +58,15 @@ FAKE_MCOUNT(TF_RIP(%rsp)) ; \ movq lapic, %rdx ; /* pointer to local APIC */ \ movl LA_ISR + 16 * (index)(%rdx), %eax ; /* load ISR */ \ - bsrl %eax, %eax ; /* index of highset set bit in ISR */ \ - jz 2f ; \ + bsrl %eax, %eax ; /* index of highest set bit in ISR */ \ + jz 1f ; \ addl $(32 * index),%eax ; \ -1: ; \ movq %rsp, %rsi ; \ movl %eax, %edi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ +1: ; \ MEXITCOUNT ; \ - jmp doreti ; \ -2: movl $-1, %eax ; /* send a vector of -1 */ \ - jmp 1b + jmp doreti /* * Handle "spurious INTerrupts". ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#17 (text+ko) ==== ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#8 (text+ko) ==== ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#5 (text+ko) ==== ==== //depot/projects/smpng/sys/ddb/db_capture.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.6 2008/04/25 13:23:36 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.7 2011/01/12 19:54:19 mdf Exp $"); #include "opt_ddb.h" @@ -90,7 +90,7 @@ &db_capture_maxbufsize, 0, "Maximum value for debug.ddb.capture.bufsize"); -SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD, +SYSCTL_INT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD, &db_capture_inprogress, 0, "DDB output capture in progress"); /* ==== //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#18 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.24 2010/06/11 19:53:42 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.25 2011/01/12 19:53:56 mdf Exp $"); /* * Driver for extra ACPI-controlled gadgets found on IBM ThinkPad laptops. @@ -367,7 +367,7 @@ IBM_NAME_EVENTS_MASK_GET, &sc->events_initialmask)); if (sc->events_mask_supported) { - SYSCTL_ADD_INT(sc->sysctl_ctx, + SYSCTL_ADD_UINT(sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "initialmask", CTLFLAG_RD, &sc->events_initialmask, 0, "Initial eventmask"); @@ -377,7 +377,7 @@ IBM_NAME_EVENTS_AVAILMASK, &sc->events_availmask))) sc->events_availmask = 0xffffffff; - SYSCTL_ADD_INT(sc->sysctl_ctx, + SYSCTL_ADD_UINT(sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "availmask", CTLFLAG_RD, &sc->events_availmask, 0, "Mask of supported events"); ==== //depot/projects/smpng/sys/dev/ae/if_ae.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.13 2011/01/03 18:28:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.14 2011/01/12 19:53:56 mdf Exp $"); #include #include @@ -207,43 +207,6 @@ #define AE_TXD_VLAN(vtag) \ (((vtag) << 4) | (((vtag) >> 13) & 0x07) | (((vtag) >> 9) & 0x08)) -/* - * ae statistics. - */ -#define STATS_ENTRY(node, desc, field) \ - { node, desc, offsetof(struct ae_stats, field) } -struct { - const char *node; - const char *desc; - intptr_t offset; -} ae_stats_tx[] = { - STATS_ENTRY("bcast", "broadcast frames", tx_bcast), - STATS_ENTRY("mcast", "multicast frames", tx_mcast), - STATS_ENTRY("pause", "PAUSE frames", tx_pause), - STATS_ENTRY("control", "control frames", tx_ctrl), - STATS_ENTRY("defers", "deferrals occuried", tx_defer), - STATS_ENTRY("exc_defers", "excessive deferrals occuried", tx_excdefer), - STATS_ENTRY("singlecols", "single collisions occuried", tx_singlecol), - STATS_ENTRY("multicols", "multiple collisions occuried", tx_multicol), - STATS_ENTRY("latecols", "late collisions occuried", tx_latecol), - STATS_ENTRY("aborts", "transmit aborts due collisions", tx_abortcol), - STATS_ENTRY("underruns", "Tx FIFO underruns", tx_underrun) -}, ae_stats_rx[] = { - STATS_ENTRY("bcast", "broadcast frames", rx_bcast), - STATS_ENTRY("mcast", "multicast frames", rx_mcast), - STATS_ENTRY("pause", "PAUSE frames", rx_pause), - STATS_ENTRY("control", "control frames", rx_ctrl), - STATS_ENTRY("crc_errors", "frames with CRC errors", rx_crcerr), - STATS_ENTRY("code_errors", "frames with invalid opcode", rx_codeerr), - STATS_ENTRY("runt", "runt frames", rx_runt), - STATS_ENTRY("frag", "fragmented frames", rx_frag), - STATS_ENTRY("align_errors", "frames with alignment errors", rx_align), - STATS_ENTRY("truncated", "frames truncated due to Rx FIFO inderrun", - rx_trunc) -}; -#define AE_STATS_RX_LEN (sizeof(ae_stats_rx) / sizeof(*ae_stats_rx)) -#define AE_STATS_TX_LEN (sizeof(ae_stats_tx) / sizeof(*ae_stats_tx)) - static int ae_probe(device_t dev) { @@ -433,13 +396,15 @@ return (error); } +#define AE_SYSCTL(stx, parent, name, desc, ptr) \ + SYSCTL_ADD_UINT(ctx, parent, OID_AUTO, name, CTLFLAG_RD, ptr, 0, desc) + static void ae_init_tunables(ae_softc_t *sc) { struct sysctl_ctx_list *ctx; struct sysctl_oid *root, *stats, *stats_rx, *stats_tx; struct ae_stats *ae_stats; - unsigned int i; KASSERT(sc != NULL, ("[ae, %d]: sc is NULL", __LINE__)); ae_stats = &sc->stats; @@ -454,20 +419,54 @@ */ stats_rx = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(stats), OID_AUTO, "rx", CTLFLAG_RD, NULL, "Rx MAC statistics"); - for (i = 0; i < AE_STATS_RX_LEN; i++) - SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(stats_rx), OID_AUTO, - ae_stats_rx[i].node, CTLFLAG_RD, (char *)ae_stats + - ae_stats_rx[i].offset, 0, ae_stats_rx[i].desc); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "bcast", + "broadcast frames", &ae_stats->rx_bcast); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "mcast", + "multicast frames", &ae_stats->rx_mcast); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "pause", + "PAUSE frames", &ae_stats->rx_pause); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "control", + "control frames", &ae_stats->rx_ctrl); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "crc_errors", + "frames with CRC errors", &ae_stats->rx_crcerr); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "code_errors", + "frames with invalid opcode", &ae_stats->rx_codeerr); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "runt", + "runt frames", &ae_stats->rx_runt); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "frag", + "fragmented frames", &ae_stats->rx_frag); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "align_errors", + "frames with alignment errors", &ae_stats->rx_align); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_rx), "truncated", + "frames truncated due to Rx FIFO inderrun", &ae_stats->rx_trunc); /* * Receiver statistcics. */ stats_tx = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(stats), OID_AUTO, "tx", CTLFLAG_RD, NULL, "Tx MAC statistics"); - for (i = 0; i < AE_STATS_TX_LEN; i++) - SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(stats_tx), OID_AUTO, - ae_stats_tx[i].node, CTLFLAG_RD, (char *)ae_stats + - ae_stats_tx[i].offset, 0, ae_stats_tx[i].desc); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "bcast", + "broadcast frames", &ae_stats->tx_bcast); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "mcast", + "multicast frames", &ae_stats->tx_mcast); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "pause", + "PAUSE frames", &ae_stats->tx_pause); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "control", + "control frames", &ae_stats->tx_ctrl); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "defers", + "deferrals occuried", &ae_stats->tx_defer); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "exc_defers", + "excessive deferrals occuried", &ae_stats->tx_excdefer); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "singlecols", + "single collisions occuried", &ae_stats->tx_singlecol); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "multicols", + "multiple collisions occuried", &ae_stats->tx_multicol); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "latecols", + "late collisions occuried", &ae_stats->tx_latecol); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "aborts", + "transmit aborts due collisions", &ae_stats->tx_abortcol); + AE_SYSCTL(ctx, SYSCTL_CHILDREN(stats_tx), "underruns", + "Tx FIFO underruns", &ae_stats->tx_underrun); } static void ==== //depot/projects/smpng/sys/dev/age/if_age.c#15 (text+ko) ==== @@ -28,7 +28,7 @@ /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */ #include -__FBSDID("$FreeBSD: src/sys/dev/age/if_age.c,v 1.17 2011/01/03 18:28:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/age/if_age.c,v 1.18 2011/01/13 13:04:49 jhb Exp $"); #include #include @@ -1760,8 +1760,6 @@ /* Set a timeout in case the chip goes out to lunch. */ sc->age_watchdog_timer = AGE_TX_TIMEOUT; } - - AGE_UNLOCK(sc); } static void ==== //depot/projects/smpng/sys/dev/alc/if_alc.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ /* Driver for Atheros AR813x/AR815x PCIe Ethernet. */ #include -__FBSDID("$FreeBSD: src/sys/dev/alc/if_alc.c,v 1.24 2011/01/03 18:28:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/alc/if_alc.c,v 1.26 2011/01/12 22:24:07 yongari Exp $"); #include #include @@ -1106,7 +1106,7 @@ #define ALC_SYSCTL_STAT_ADD32(c, h, n, p, d) \ SYSCTL_ADD_UINT(c, h, OID_AUTO, n, CTLFLAG_RD, p, 0, d) #define ALC_SYSCTL_STAT_ADD64(c, h, n, p, d) \ - SYSCTL_ADD_QUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d) + SYSCTL_ADD_UQUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d) static void alc_sysctl_node(struct alc_softc *sc) @@ -2706,7 +2706,7 @@ } if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0 && !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - alc_start_locked(ifp); + alc_start(ifp); } if (more == EAGAIN || ==== //depot/projects/smpng/sys/dev/ale/if_ale.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ /* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */ #include -__FBSDID("$FreeBSD: src/sys/dev/ale/if_ale.c,v 1.14 2011/01/03 18:28:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ale/if_ale.c,v 1.15 2011/01/12 19:53:56 mdf Exp $"); #include #include @@ -729,7 +729,10 @@ #define ALE_SYSCTL_STAT_ADD32(c, h, n, p, d) \ SYSCTL_ADD_UINT(c, h, OID_AUTO, n, CTLFLAG_RD, p, 0, d) -#if __FreeBSD_version > 800000 +#if __FreeBSD_version >= 900030 +#define ALE_SYSCTL_STAT_ADD64(c, h, n, p, d) \ + SYSCTL_ADD_UQUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d) +#elif __FreeBSD_version > 800000 #define ALE_SYSCTL_STAT_ADD64(c, h, n, p, d) \ SYSCTL_ADD_QUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d) #else ==== //depot/projects/smpng/sys/dev/ath/if_ath.c#91 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.278 2010/08/14 14:18:02 adrian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.279 2011/01/12 19:53:56 mdf Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -6565,10 +6565,10 @@ struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev); struct ath_hal *ah = sc->sc_ah; - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "countrycode", CTLFLAG_RD, &sc->sc_eecc, 0, "EEPROM country code"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "regdomain", CTLFLAG_RD, &sc->sc_eerd, 0, "EEPROM regdomain code"); #ifdef ATH_DEBUG @@ -6591,10 +6591,10 @@ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "ledpin", CTLTYPE_INT | CTLFLAG_RW, sc, 0, ath_sysctl_ledpin, "I", "GPIO pin connected to LED"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "ledon", CTLFLAG_RW, &sc->sc_ledon, 0, "setting to turn LED on"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "ledidle", CTLFLAG_RW, &sc->sc_ledidle, 0, "idle time for inactivity LED (ticks)"); SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, @@ -6608,7 +6608,7 @@ "diversity", CTLTYPE_INT | CTLFLAG_RW, sc, 0, ath_sysctl_diversity, "I", "antenna diversity"); sc->sc_txintrperiod = ATH_TXINTR_PERIOD; - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "txintrperiod", CTLFLAG_RW, &sc->sc_txintrperiod, 0, "tx descriptor batching"); SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, @@ -6642,7 +6642,7 @@ ath_sysctl_intmit, "I", "interference mitigation"); } sc->sc_monpass = HAL_RXERR_DECRYPT | HAL_RXERR_MIC; - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "monpass", CTLFLAG_RW, &sc->sc_monpass, 0, "mask of error frames to pass when monitoring"); #ifdef IEEE80211_SUPPORT_TDMA ==== //depot/projects/smpng/sys/dev/bce/if_bce.c#41 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.84 2010/11/14 13:26:10 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.85 2011/01/12 19:53:56 mdf Exp $"); /* * The following controllers are supported by this driver: @@ -507,14 +507,14 @@ /* Allowable values are TRUE or FALSE */ static int bce_tso_enable = TRUE; TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); -SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, +SYSCTL_INT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, "TSO Enable/Disable"); /* Allowable values are 0 (IRQ), 1 (MSI/IRQ), and 2 (MSI-X/MSI/IRQ) */ /* ToDo: Add MSI-X support. */ static int bce_msi_enable = 1; TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable); -SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, +SYSCTL_INT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, "MSI-X|MSI|INTx selector"); /* ToDo: Add tunable to enable/disable strict MTU handling. */ @@ -8487,7 +8487,7 @@ 0, "Number of simulated l2_fhdr errors"); #endif - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "l2fhdr_error_count", CTLFLAG_RD, &sc->l2fhdr_error_count, 0, "Number of l2_fhdr errors"); @@ -8498,18 +8498,18 @@ CTLFLAG_RW, &mbuf_alloc_failed_sim_control, 0, "Debug control to force mbuf allocation failures"); - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "mbuf_alloc_failed_sim_count", CTLFLAG_RD, &sc->mbuf_alloc_failed_sim_count, 0, "Number of simulated mbuf cluster allocation failures"); #endif - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "mbuf_alloc_failed_count", CTLFLAG_RD, &sc->mbuf_alloc_failed_count, 0, "Number of mbuf allocation failures"); - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "mbuf_frag_count", CTLFLAG_RD, &sc->mbuf_frag_count, 0, "Number of fragmented mbufs"); @@ -8521,19 +8521,19 @@ 0, "Debug control to force DMA mapping failures"); /* ToDo: Figure out how to update this value in bce_dma_map_addr(). */ - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "dma_map_addr_failed_sim_count", CTLFLAG_RD, &sc->dma_map_addr_failed_sim_count, 0, "Number of simulated DMA mapping failures"); #endif - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "dma_map_addr_rx_failed_count", CTLFLAG_RD, &sc->dma_map_addr_rx_failed_count, 0, "Number of RX DMA mapping failures"); - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "dma_map_addr_tx_failed_count", CTLFLAG_RD, &sc->dma_map_addr_tx_failed_count, 0, "Number of TX DMA mapping failures"); @@ -8544,13 +8544,13 @@ CTLFLAG_RW, &unexpected_attention_sim_control, 0, "Debug control to simulate unexpected attentions"); - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "unexpected_attention_sim_count", CTLFLAG_RW, &sc->unexpected_attention_sim_count, 0, "Number of simulated unexpected attentions"); #endif - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "unexpected_attention_count", CTLFLAG_RW, &sc->unexpected_attention_count, 0, "Number of unexpected attentions"); ==== //depot/projects/smpng/sys/dev/bge/if_bge.c#122 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.339 2011/01/10 17:45:09 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.340 2011/01/12 19:53:56 mdf Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -5546,7 +5546,7 @@ #undef BGE_SYSCTL_STAT #define BGE_SYSCTL_STAT_ADD64(c, h, n, p, d) \ - SYSCTL_ADD_QUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d) + SYSCTL_ADD_UQUAD(c, h, OID_AUTO, n, CTLFLAG_RD, p, d) static void bge_add_sysctl_stats_regs(struct bge_softc *sc, struct sysctl_ctx_list *ctx, ==== //depot/projects/smpng/sys/dev/bwi/if_bwi.c#11 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bwi/if_bwi.c,v 1.16 2010/11/06 18:17:20 bschmidt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bwi/if_bwi.c,v 1.17 2011/01/12 19:53:56 mdf Exp $"); #include "opt_inet.h" #include "opt_bwi.h" @@ -537,11 +537,11 @@ /* * Add sysctl nodes */ - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "fw_version", CTLFLAG_RD, &sc->sc_fw_version, 0, "Firmware version"); - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "led_idle", CTLFLAG_RW, &sc->sc_led_idle, 0, "# ticks before LED enters idle state"); ==== //depot/projects/smpng/sys/dev/bwn/if_bwn.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bwn/if_bwn.c,v 1.24 2010/12/06 10:24:06 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bwn/if_bwn.c,v 1.25 2011/01/12 19:53:56 mdf Exp $"); /* * The Broadcom Wireless LAN controller driver. @@ -14211,13 +14211,13 @@ return; stats = &mac->mac_stats; - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "linknoise", CTLFLAG_RW, &stats->rts, 0, "Noise level"); - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rts", CTLFLAG_RW, &stats->rts, 0, "RTS"); - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rtsfail", CTLFLAG_RW, &stats->rtsfail, 0, "RTS failed to send"); ==== //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#36 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.118 2010/08/15 20:34:51 np Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.119 2011/01/12 19:53:44 mdf Exp $"); #include #include @@ -195,7 +195,7 @@ TUNABLE_INT("hw.cxgb.msi_allowed", &msi_allowed); SYSCTL_NODE(_hw, OID_AUTO, cxgb, CTLFLAG_RD, 0, "CXGB driver parameters"); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, msi_allowed, CTLFLAG_RDTUN, &msi_allowed, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, msi_allowed, CTLFLAG_RDTUN, &msi_allowed, 0, "MSI-X, MSI, INTx selector"); /* @@ -204,7 +204,7 @@ */ static int ofld_disable = 0; TUNABLE_INT("hw.cxgb.ofld_disable", &ofld_disable); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, ofld_disable, CTLFLAG_RDTUN, &ofld_disable, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, ofld_disable, CTLFLAG_RDTUN, &ofld_disable, 0, "disable ULP offload"); /* @@ -213,7 +213,7 @@ */ static int multiq = 1; TUNABLE_INT("hw.cxgb.multiq", &multiq); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, multiq, CTLFLAG_RDTUN, &multiq, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, multiq, CTLFLAG_RDTUN, &multiq, 0, "use min(ncpus/ports, 8) queue-sets per port"); /* @@ -223,7 +223,7 @@ */ static int force_fw_update = 0; TUNABLE_INT("hw.cxgb.force_fw_update", &force_fw_update); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, force_fw_update, CTLFLAG_RDTUN, &force_fw_update, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, force_fw_update, CTLFLAG_RDTUN, &force_fw_update, 0, "update firmware even if up to date"); int cxgb_use_16k_clusters = -1; @@ -236,7 +236,7 @@ */ int cxgb_snd_queue_len = IFQ_MAXLEN; TUNABLE_INT("hw.cxgb.snd_queue_len", &cxgb_snd_queue_len); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, snd_queue_len, CTLFLAG_RDTUN, +SYSCTL_INT(_hw_cxgb, OID_AUTO, snd_queue_len, CTLFLAG_RDTUN, &cxgb_snd_queue_len, 0, "send queue size "); static int nfilters = -1; ==== //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#30 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.95 2010/09/16 16:13:12 mdf Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.96 2011/01/12 19:53:44 mdf Exp $"); #include "opt_inet.h" @@ -79,12 +79,12 @@ extern struct sysctl_oid_list sysctl__hw_cxgb_children; int cxgb_txq_buf_ring_size = TX_ETH_Q_SIZE; TUNABLE_INT("hw.cxgb.txq_mr_size", &cxgb_txq_buf_ring_size); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, txq_mr_size, CTLFLAG_RDTUN, &cxgb_txq_buf_ring_size, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, txq_mr_size, CTLFLAG_RDTUN, &cxgb_txq_buf_ring_size, 0, "size of per-queue mbuf ring"); static int cxgb_tx_coalesce_force = 0; TUNABLE_INT("hw.cxgb.tx_coalesce_force", &cxgb_tx_coalesce_force); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, tx_coalesce_force, CTLFLAG_RW, +SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_force, CTLFLAG_RW, &cxgb_tx_coalesce_force, 0, "coalesce small packets into a single work request regardless of ring state"); @@ -100,17 +100,17 @@ static int cxgb_tx_coalesce_enable_start = COALESCE_START_DEFAULT; TUNABLE_INT("hw.cxgb.tx_coalesce_enable_start", &cxgb_tx_coalesce_enable_start); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_start, CTLFLAG_RW, +SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_start, CTLFLAG_RW, &cxgb_tx_coalesce_enable_start, 0, "coalesce enable threshold"); static int cxgb_tx_coalesce_enable_stop = COALESCE_STOP_DEFAULT; TUNABLE_INT("hw.cxgb.tx_coalesce_enable_stop", &cxgb_tx_coalesce_enable_stop); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_stop, CTLFLAG_RW, +SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_stop, CTLFLAG_RW, &cxgb_tx_coalesce_enable_stop, 0, "coalesce disable threshold"); static int cxgb_tx_reclaim_threshold = TX_RECLAIM_DEFAULT; TUNABLE_INT("hw.cxgb.tx_reclaim_threshold", &cxgb_tx_reclaim_threshold); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, tx_reclaim_threshold, CTLFLAG_RW, +SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_reclaim_threshold, CTLFLAG_RW, &cxgb_tx_reclaim_threshold, 0, "tx cleaning minimum threshold"); @@ -3493,7 +3493,7 @@ "firmware_version", CTLFLAG_RD, &sc->fw_version, 0, "firmware version"); - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "hw_revision", CTLFLAG_RD, &sc->params.rev, 0, "chip model"); @@ -3505,14 +3505,14 @@ "enable_debug", CTLFLAG_RW, &cxgb_debug, 0, "enable verbose debugging output"); - SYSCTL_ADD_QUAD(ctx, children, OID_AUTO, "tunq_coalesce", + SYSCTL_ADD_UQUAD(ctx, children, OID_AUTO, "tunq_coalesce", CTLFLAG_RD, &sc->tunq_coalesce, "#tunneled packets freed"); SYSCTL_ADD_INT(ctx, children, OID_AUTO, "txq_overrun", CTLFLAG_RD, &txq_fills, 0, "#times txq overrun"); - SYSCTL_ADD_INT(ctx, children, OID_AUTO, + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "core_clock", CTLFLAG_RD, &sc->params.vpd.cclk, 0, "core clock frequency (in KHz)"); @@ -3576,7 +3576,7 @@ poid = SYSCTL_ADD_NODE(ctx, children, OID_AUTO, pi->namebuf, CTLFLAG_RD, NULL, "port statistics"); poidlist = SYSCTL_CHILDREN(poid); - SYSCTL_ADD_INT(ctx, poidlist, OID_AUTO, + SYSCTL_ADD_UINT(ctx, poidlist, OID_AUTO, "nqsets", CTLFLAG_RD, &pi->nqsets, 0, "#queue sets"); @@ -3643,10 +3643,10 @@ CTLTYPE_STRING | CTLFLAG_RD, &qs->rspq, 0, t3_dump_rspq, "A", "dump of the response queue"); - SYSCTL_ADD_QUAD(ctx, txqpoidlist, OID_AUTO, "dropped", + SYSCTL_ADD_UQUAD(ctx, txqpoidlist, OID_AUTO, "dropped", CTLFLAG_RD, &qs->txq[TXQ_ETH].txq_mr->br_drops, "#tunneled packets dropped"); - SYSCTL_ADD_INT(ctx, txqpoidlist, OID_AUTO, "sendqlen", + SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "sendqlen", CTLFLAG_RD, &qs->txq[TXQ_ETH].sendq.qlen, 0, "#tunneled packets waiting to be sent"); #if 0 @@ -3657,7 +3657,7 @@ CTLFLAG_RD, (uint32_t *)(uintptr_t)&qs->txq[TXQ_ETH].txq_mr.br_cons, 0, "#tunneled packets queue consumer index"); #endif - SYSCTL_ADD_INT(ctx, txqpoidlist, OID_AUTO, "processed", + SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "processed", CTLFLAG_RD, &qs->txq[TXQ_ETH].processed, 0, "#tunneled packets processed by the card"); SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "cleaned", @@ -3672,7 +3672,7 @@ SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "skipped", CTLFLAG_RD, &txq->txq_skipped, 0, "#tunneled packet descriptors skipped"); - SYSCTL_ADD_QUAD(ctx, txqpoidlist, OID_AUTO, "coalesced", + SYSCTL_ADD_UQUAD(ctx, txqpoidlist, OID_AUTO, "coalesced", CTLFLAG_RD, &txq->txq_coalesced, "#tunneled packets coalesced"); SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "enqueued", ==== //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.5 2009/12/22 15:47:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.6 2011/01/12 19:53:44 mdf Exp $"); #include #include @@ -101,32 +101,32 @@ static int ep_timeout_secs = 10; TUNABLE_INT("hw.iw_cxgb.ep_timeout_secs", &ep_timeout_secs); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, ep_timeout_secs, CTLFLAG_RDTUN, &ep_timeout_secs, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, ep_timeout_secs, CTLFLAG_RDTUN, &ep_timeout_secs, 0, "CM Endpoint operation timeout in seconds (default=10)"); static int mpa_rev = 1; TUNABLE_INT("hw.iw_cxgb.mpa_rev", &mpa_rev); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, mpa_rev, CTLFLAG_RDTUN, &mpa_rev, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, mpa_rev, CTLFLAG_RDTUN, &mpa_rev, 0, "MPA Revision, 0 supports amso1100, 1 is spec compliant. (default=1)"); static int markers_enabled = 0; TUNABLE_INT("hw.iw_cxgb.markers_enabled", &markers_enabled); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, markers_enabled, CTLFLAG_RDTUN, &markers_enabled, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, markers_enabled, CTLFLAG_RDTUN, &markers_enabled, 0, "Enable MPA MARKERS (default(0)=disabled)"); static int crc_enabled = 1; TUNABLE_INT("hw.iw_cxgb.crc_enabled", &crc_enabled); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, crc_enabled, CTLFLAG_RDTUN, &crc_enabled, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, crc_enabled, CTLFLAG_RDTUN, &crc_enabled, 0, "Enable MPA CRC (default(1)=enabled)"); static int rcv_win = 256 * 1024; TUNABLE_INT("hw.iw_cxgb.rcv_win", &rcv_win); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, rcv_win, CTLFLAG_RDTUN, &rcv_win, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, rcv_win, CTLFLAG_RDTUN, &rcv_win, 0, "TCP receive window in bytes (default=256KB)"); static int snd_win = 32 * 1024; TUNABLE_INT("hw.iw_cxgb.snd_win", &snd_win); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, snd_win, CTLFLAG_RDTUN, &snd_win, 0, +SYSCTL_INT(_hw_cxgb, OID_AUTO, snd_win, CTLFLAG_RDTUN, &snd_win, 0, "TCP send window in bytes (default=32KB)"); static unsigned int nocong = 0; ==== //depot/projects/smpng/sys/dev/e1000/if_em.c#24 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.64 2010/12/04 06:38:21 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.66 2011/01/12 19:53:23 mdf Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -93,7 +93,7 @@ /********************************************************************* * Driver version: *********************************************************************/ -char em_driver_version[] = "7.1.8"; +char em_driver_version[] = "7.1.9"; /********************************************************************* * PCI Device ID Table @@ -1909,14 +1909,23 @@ error = bus_dmamap_load_mbuf_sg(txr->txtag, map, *m_headp, segs, &nsegs, BUS_DMA_NOWAIT); - if (error) { + if (error == ENOMEM) { + adapter->no_tx_dma_setup++; + return (error); + } else if (error != 0) { adapter->no_tx_dma_setup++; m_freem(*m_headp); *m_headp = NULL; return (error); } + + } else if (error == ENOMEM) { + adapter->no_tx_dma_setup++; + return (error); } else if (error != 0) { adapter->no_tx_dma_setup++; + m_freem(*m_headp); + *m_headp = NULL; return (error); } @@ -2206,7 +2215,6 @@ txr->me, txr->tx_avail, txr->next_to_clean); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; adapter->watchdog_events++; - EM_TX_UNLOCK(txr); em_init_locked(adapter); } @@ -5051,8 +5059,8 @@ char namebuf[QUEUE_NAME_LEN]; /* Driver Statistics */ - SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "link_irq", - CTLFLAG_RD, &adapter->link_irq, 0, + SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "link_irq", + CTLFLAG_RD, &adapter->link_irq, "Link MSIX IRQ Handled"); SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "mbuf_alloc_fail", CTLFLAG_RD, &adapter->mbuf_alloc_failed, @@ -5128,147 +5136,147 @@ CTLFLAG_RD, NULL, "Statistics"); stat_list = SYSCTL_CHILDREN(stat_node); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "excess_coll", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "excess_coll", CTLFLAG_RD, &stats->ecol, "Excessive collisions"); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "single_coll", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "single_coll", CTLFLAG_RD, &stats->scc, "Single collisions"); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "multiple_coll", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "multiple_coll", CTLFLAG_RD, &stats->mcc, "Multiple collisions"); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "late_coll", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "late_coll", CTLFLAG_RD, &stats->latecol, "Late collisions"); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "collision_count", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "collision_count", CTLFLAG_RD, &stats->colc, "Collision Count"); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "symbol_errors", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "symbol_errors", CTLFLAG_RD, &adapter->stats.symerrs, "Symbol Errors"); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "sequence_errors", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "sequence_errors", CTLFLAG_RD, &adapter->stats.sec, "Sequence Errors"); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "defer_count", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "defer_count", CTLFLAG_RD, &adapter->stats.dc, "Defer Count"); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "missed_packets", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "missed_packets", CTLFLAG_RD, &adapter->stats.mpc, "Missed Packets"); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "recv_no_buff", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_no_buff", CTLFLAG_RD, &adapter->stats.rnbc, "Receive No Buffers"); - SYSCTL_ADD_QUAD(ctx, stat_list, OID_AUTO, "recv_undersize", + SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_undersize", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 13 21:11:59 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5905106566C; Thu, 13 Jan 2011 21:11:58 +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 A8332106564A for ; Thu, 13 Jan 2011 21:11:58 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 953CE8FC17 for ; Thu, 13 Jan 2011 21:11:58 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0DLBwNH026083 for ; Thu, 13 Jan 2011 21:11:58 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0DLBwNc026080 for perforce@freebsd.org; Thu, 13 Jan 2011 21:11:58 GMT (envelope-from trasz@freebsd.org) Date: Thu, 13 Jan 2011 21:11:58 GMT Message-Id: <201101132111.p0DLBwNc026080@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jan 2011 21:11:59 -0000 http://p4web.freebsd.org/@@187777?ac=10 Change 187777 by trasz@trasz_victim on 2011/01/13 21:11:37 The "log" action needs to be rate-limited. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#3 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#3 (text+ko) ==== @@ -186,6 +186,11 @@ rctl_deferred_psignal(struct proc *p, int signum) { int need_lock; + static int curtime = 0; + static struct timeval lasttime; + + if (!ppsratecheck(&lasttime, &curtime, 10)) + return; /* * XXX: This is ugly. Either turn it into a real taskqueue, From owner-p4-projects@FreeBSD.ORG Thu Jan 13 21:27:20 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D09811065787; Thu, 13 Jan 2011 21:27:19 +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 948A51065781 for ; Thu, 13 Jan 2011 21:27:19 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 81D398FC17 for ; Thu, 13 Jan 2011 21:27:19 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0DLRJ3f028965 for ; Thu, 13 Jan 2011 21:27:19 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0DLRJw0028962 for perforce@freebsd.org; Thu, 13 Jan 2011 21:27:19 GMT (envelope-from trasz@freebsd.org) Date: Thu, 13 Jan 2011 21:27:19 GMT Message-Id: <201101132127.p0DLRJw0028962@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jan 2011 21:27:20 -0000 http://p4web.freebsd.org/@@187778?ac=10 Change 187778 by trasz@trasz_victim on 2011/01/13 21:27:17 Rename forgotten rc script. Affected files ... .. //depot/projects/soc2009/trasz_limits/etc/rc.d/Makefile#14 edit .. //depot/projects/soc2009/trasz_limits/etc/rc.d/hrl#2 delete .. //depot/projects/soc2009/trasz_limits/etc/rc.d/rctl#1 add Differences ... ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/Makefile#14 (text+ko) ==== @@ -13,7 +13,7 @@ faith fsck ftp-proxy ftpd \ gbde geli geli2 gptboot gssd \ hastd hcsecd \ - hostapd hostid hostid_save hostname hrl \ + hostapd hostid hostid_save hostname \ inetd initrandom \ ip6addrctl ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted \ @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv rfcomm_pppd_server root \ + random rarpd rctl resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rtsold rwho \ savecore sdpd securelevel sendmail \ serial sppp statd static_arp stf swap1 \ From owner-p4-projects@FreeBSD.ORG Thu Jan 13 22:24:20 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97E4A106566B; Thu, 13 Jan 2011 22:24:20 +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 5A4E61065672 for ; Thu, 13 Jan 2011 22:24:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4794A8FC19 for ; Thu, 13 Jan 2011 22:24:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0DMOK1s041396 for ; Thu, 13 Jan 2011 22:24:20 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0DMOKlm041393 for perforce@freebsd.org; Thu, 13 Jan 2011 22:24:20 GMT (envelope-from trasz@freebsd.org) Date: Thu, 13 Jan 2011 22:24:20 GMT Message-Id: <201101132224.p0DMOKlm041393@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jan 2011 22:24:20 -0000 http://p4web.freebsd.org/@@187782?ac=10 Change 187782 by trasz@trasz_victim on 2011/01/13 22:23:52 Fix rather obvious thinko in rule matching. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#4 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#4 (text+ko) ==== @@ -396,22 +396,26 @@ switch (filter->hr_subject_type) { case RCTL_SUBJECT_TYPE_PROCESS: - if (filter->hr_subject.hs_proc != + if (filter->hr_subject.hs_proc != NULL && + rule->hr_subject.hs_proc != filter->hr_subject.hs_proc) return (0); break; case RCTL_SUBJECT_TYPE_USER: - if (filter->hr_subject.hs_uip != + if (filter->hr_subject.hs_uip != NULL && + rule->hr_subject.hs_uip != filter->hr_subject.hs_uip) return (0); break; case RCTL_SUBJECT_TYPE_LOGINCLASS: - if (filter->hr_subject.hs_loginclass != + if (filter->hr_subject.hs_loginclass != NULL && + rule->hr_subject.hs_loginclass != filter->hr_subject.hs_loginclass) return (0); break; case RCTL_SUBJECT_TYPE_JAIL: - if (filter->hr_subject.hs_prison != + if (filter->hr_subject.hs_prison != NULL && + rule->hr_subject.hs_prison != filter->hr_subject.hs_prison) return (0); break; From owner-p4-projects@FreeBSD.ORG Thu Jan 13 22:34:08 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C25DC1065675; Thu, 13 Jan 2011 22:34:08 +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 850821065673 for ; Thu, 13 Jan 2011 22:34:08 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 57FE98FC16 for ; Thu, 13 Jan 2011 22:34:08 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0DMY80B043383 for ; Thu, 13 Jan 2011 22:34:08 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0DMY8hu043380 for perforce@freebsd.org; Thu, 13 Jan 2011 22:34:08 GMT (envelope-from trasz@freebsd.org) Date: Thu, 13 Jan 2011 22:34:08 GMT Message-Id: <201101132234.p0DMY8hu043380@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187783 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jan 2011 22:34:09 -0000 http://p4web.freebsd.org/@@187783?ac=10 Change 187783 by trasz@trasz_victim on 2011/01/13 22:33:09 u Affected files ... .. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#4 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#4 (text+ko) ==== @@ -29,10 +29,6 @@ # # $FreeBSD$ -format_stats() { - awk -F= '/^pctcpu/ { pctcpu=$2 } /^rss/ { rss=$2 } /^vmem/ { vmem=$2 } /^swap/ { swap=$2 } END { printf "%s\t%s\t%s\t%s\n", pctcpu, rss, vmem, swap }' -} - usage() { echo "usage: `basename $0` [-h] [wait [count]]" exit 1 @@ -57,18 +53,32 @@ while :; do if [ "`basename $0`" = "jailstat" ]; then jails="`ps ax -o jid= | sort -u | sed 1d`" - printf "JID\t%%CPU\tRSS\tVSIZE\tSWAP\n" + printf "JID\t%%CPU\tLIMIT\tRSS\tLIMIT\tVMEM\tLIMIT\tSWAP\tLIMIT\n" for jail in $jails; do - printf "$jail\t" - rctl $hflag -u j:$jail | format_stats + # Put resource=value pairs into environment variables. + eval `rctl $hflag -u j:$jail` + + pctcpulimit=`rctl j:$jail:pctcpu:deny=/jail | sed 's/.*=//'` + rsslimit=`rctl j:$jail:rss:deny=/jail | sed 's/.*=//'` + vmemlimit=`rctl j:$jail:vmem:deny=/jail | sed 's/.*=//'` + swaplimit=`rctl j:$jail:swap:deny=/jail | sed 's/.*=//'` + + printf "%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\n" "$jail" "$pctcpu" "$pctcpulimit" "$rss" "$rsslimit" "$vmem" "$vmemlimit" "$swap" "$swaplimit" done else users="`ps ax -o user= | sort -u`" - printf "USER\t%%CPU\tRSS\tVSIZE\tSWAP\n" + printf "USER\t%%CPU\tLIMIT\tRSS\tLIMIT\tVMEM\tLIMIT\tSWAP\tLIMIT\n" for user in $users; do - printf "$user\t" - rctl $hflag -u u:$user | format_stats + # Put resource=value pairs into environment variables. + eval `rctl $hflag -u u:$user` + + pctcpulimit=`rctl u:$user:pctcpu:deny=/user | sed 's/.*=//'` + rsslimit=`rctl u:$user:rss:deny=/user | sed 's/.*=//'` + vmemlimit=`rctl u:$user:vmem:deny=/user | sed 's/.*=//'` + swaplimit=`rctl u:$user:swap:deny=/user | sed 's/.*=//'` + + printf "%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\n" "$user" "$pctcpu" "$pctcpulimit" "$rss" "$rsslimit" "$vmem" "$vmemlimit" "$swap" "$swaplimit" done fi From owner-p4-projects@FreeBSD.ORG Thu Jan 13 22:36:20 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B6F61065696; Thu, 13 Jan 2011 22:36:20 +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 4E59E1065694 for ; Thu, 13 Jan 2011 22:36:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2164C8FC20 for ; Thu, 13 Jan 2011 22:36:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0DMaKi3043417 for ; Thu, 13 Jan 2011 22:36:20 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0DMaKKZ043414 for perforce@freebsd.org; Thu, 13 Jan 2011 22:36:20 GMT (envelope-from trasz@freebsd.org) Date: Thu, 13 Jan 2011 22:36:20 GMT Message-Id: <201101132236.p0DMaKKZ043414@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jan 2011 22:36:20 -0000 http://p4web.freebsd.org/@@187784?ac=10 Change 187784 by trasz@trasz_victim on 2011/01/13 22:35:23 Forced commit to explain that the previous one added displaying resource limits to userstat(1) and jailstat(1) and got rid of using awk(1). Affected files ... .. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#5 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jan 14 18:03:59 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A45231065672; Fri, 14 Jan 2011 18:03:59 +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 6570D106564A for ; Fri, 14 Jan 2011 18:03:59 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5077C8FC13 for ; Fri, 14 Jan 2011 18:03:59 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0EI3xZf083788 for ; Fri, 14 Jan 2011 18:03:59 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0EI3wYZ083785 for perforce@freebsd.org; Fri, 14 Jan 2011 18:03:58 GMT (envelope-from jhb@freebsd.org) Date: Fri, 14 Jan 2011 18:03:58 GMT Message-Id: <201101141803.p0EI3wYZ083785@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187802 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jan 2011 18:04:00 -0000 http://p4web.freebsd.org/@@187802?ac=10 Change 187802 by jhb@jhb_jhbbsd on 2011/01/14 18:03:53 IFC @187801 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#75 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#72 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#96 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#18 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adfile.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adwalk.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmextern.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmrestag.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtable.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbdump.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbinfo.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asldefine.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllength.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmessages.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloperands.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslpredef.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1i.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2d.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2e.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2q.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2w.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstartup.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asluuid.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtcompile.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtcompiler.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtfield.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtio.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtsubtable.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dttable.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dttemplate.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dttemplate.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtutils.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbcmds.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbdisply.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbexec.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbfileio.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbhistry.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbinput.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbstats.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbutils.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbxface.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmbuffer.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmnames.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmobject.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmopcode.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmresrc.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmresrcl.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmresrcs.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmutils.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmwalk.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsfield.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsinit.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsmethod.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsobject.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsopcode.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsutils.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dswexec.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dswload.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dswscope.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dswstate.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evevent.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpe.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeblk.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeinit.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeutil.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evmisc.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evregion.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evrgnini.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evsci.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evxface.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evxfevnt.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evxfgpe.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evxfregn.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exconfig.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exconvrt.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/excreate.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exdebug.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exdump.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exfield.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exfldio.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exmisc.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exmutex.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exnames.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exoparg1.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exoparg2.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exoparg3.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exoparg6.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exprep.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exregion.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exresnte.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exresolv.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exresop.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exstore.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exstoren.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exstorob.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exsystem.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exutils.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwacpi.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwgpe.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwpci.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwregs.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwsleep.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwtimer.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwvalid.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwxface.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acapps.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/accommon.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acconfig.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdebug.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdisasm.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdispat.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acevents.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acexcep.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acglobal.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/achware.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acinterp.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/aclocal.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acmacros.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acnames.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acnamesp.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acobject.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acopcode.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acoutput.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acparser.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpi.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpiosxf.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpixf.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpredef.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acresrc.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acrestyp.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acstruct.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actables.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl1.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl2.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actypes.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acutils.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/amlcode.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/amlresrc.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/platform/acenv.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/platform/acfreebsd.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/platform/acgcc.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsaccess.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsalloc.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsdump.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsdumpdv.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nseval.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsinit.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsload.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsnames.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsobject.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsparse.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nspredef.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsrepair.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsrepair2.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nssearch.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsutils.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nswalk.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsxfeval.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsxfname.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsxfobj.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psargs.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psloop.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psopcode.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psparse.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psscope.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/pstree.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psutils.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/pswalk.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psxface.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsaddr.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rscalc.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rscreate.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsdump.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsinfo.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsio.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsirq.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rslist.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsmemory.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsmisc.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsutils.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsxface.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbfadt.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbfind.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbinstal.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbutils.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbxface.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbxfroot.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utalloc.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utcache.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utcopy.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utdebug.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utdelete.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/uteval.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utglobal.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utids.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utinit.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utlock.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmath.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmisc.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmutex.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utobject.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utosi.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utresrc.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utstate.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/uttrack.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utxface.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utxferror.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_osfp.c#6 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#14 integrate .. //depot/projects/smpng/sys/dev/alc/if_alcvar.h#4 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#92 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#88 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/controller/xhci.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/controller/xhci.h#2 integrate .. //depot/projects/smpng/sys/kern/kern_ntptime.c#26 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#100 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#115 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#52 integrate .. //depot/projects/smpng/sys/powerpc/include/vmparam.h#18 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf32_machdep.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf64_machdep.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/exec_machdep.c#4 integrate .. //depot/projects/smpng/sys/sys/priority.h#7 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#70 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#75 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.338 2010/11/23 16:12:35 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.339 2011/01/13 18:20:27 mdf Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1045,23 +1045,23 @@ u_int ipi_page; u_int ipi_range; u_int ipi_range_size; -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_global, CTLFLAG_RW, &ipi_global, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_page, CTLFLAG_RW, &ipi_page, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_range, CTLFLAG_RW, &ipi_range, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_range_size, CTLFLAG_RW, &ipi_range_size, - 0, ""); +SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_global, CTLFLAG_RW, &ipi_global, 0, ""); +SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_page, CTLFLAG_RW, &ipi_page, 0, ""); +SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_range, CTLFLAG_RW, &ipi_range, 0, ""); +SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_range_size, CTLFLAG_RW, + &ipi_range_size, 0, ""); u_int ipi_masked_global; u_int ipi_masked_page; u_int ipi_masked_range; u_int ipi_masked_range_size; -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_global, CTLFLAG_RW, +SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_global, CTLFLAG_RW, &ipi_masked_global, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_page, CTLFLAG_RW, +SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_page, CTLFLAG_RW, &ipi_masked_page, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_range, CTLFLAG_RW, +SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_range, CTLFLAG_RW, &ipi_masked_range, 0, ""); -SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_range_size, CTLFLAG_RW, +SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_range_size, CTLFLAG_RW, &ipi_masked_range_size, 0, ""); #endif /* COUNT_XINVLTLB_HITS */ ==== //depot/projects/smpng/sys/cam/cam_xpt.c#72 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.255 2010/11/30 22:39:46 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.256 2011/01/13 18:20:27 mdf Exp $"); #include #include @@ -197,11 +197,11 @@ u_int32_t cam_dflags = CAM_DEBUG_NONE; #endif TUNABLE_INT("kern.cam.dflags", &cam_dflags); -SYSCTL_INT(_kern_cam, OID_AUTO, dflags, CTLFLAG_RW, +SYSCTL_UINT(_kern_cam, OID_AUTO, dflags, CTLFLAG_RW, &cam_dflags, 0, "Cam Debug Flags"); u_int32_t cam_debug_delay; TUNABLE_INT("kern.cam.debug_delay", &cam_debug_delay); -SYSCTL_INT(_kern_cam, OID_AUTO, debug_delay, CTLFLAG_RW, +SYSCTL_UINT(_kern_cam, OID_AUTO, debug_delay, CTLFLAG_RW, &cam_debug_delay, 0, "Cam Debug Flags"); #endif ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#96 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.253 2010/10/24 18:53:16 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.254 2011/01/13 18:20:33 mdf Exp $"); #include @@ -1127,9 +1127,9 @@ struct ccb_trans_settings_fc *fc = &cts.xport_specific.fc; if (fc->valid & CTS_FC_VALID_WWPN) { softc->wwpn = fc->wwpn; - SYSCTL_ADD_XLONG(&softc->sysctl_ctx, + SYSCTL_ADD_X64(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "wwpn", CTLTYPE_QUAD | CTLFLAG_RD, + OID_AUTO, "wwpn", CTLFLAG_RD, &softc->wwpn, "World Wide Port Name"); } } ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#18 (text+ko) ==== @@ -188,9 +188,9 @@ TUNABLE_QUAD("vfs.zfs.arc_meta_limit", &zfs_arc_meta_limit); TUNABLE_INT("vfs.zfs.mdcomp_disable", &zfs_mdcomp_disable); SYSCTL_DECL(_vfs_zfs); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, arc_max, CTLFLAG_RDTUN, &zfs_arc_max, 0, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_max, CTLFLAG_RDTUN, &zfs_arc_max, 0, "Maximum ARC size"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RDTUN, &zfs_arc_min, 0, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RDTUN, &zfs_arc_min, 0, "Minimum ARC size"); SYSCTL_INT(_vfs_zfs, OID_AUTO, mdcomp_disable, CTLFLAG_RDTUN, &zfs_mdcomp_disable, 0, "Disable metadata compression"); @@ -466,9 +466,9 @@ static uint64_t arc_meta_used; static uint64_t arc_meta_limit; static uint64_t arc_meta_max = 0; -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, arc_meta_used, CTLFLAG_RDTUN, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_meta_used, CTLFLAG_RDTUN, &arc_meta_used, 0, "ARC metadata used"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, arc_meta_limit, CTLFLAG_RDTUN, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_meta_limit, CTLFLAG_RDTUN, &arc_meta_limit, 0, "ARC metadata limit"); typedef struct l2arc_buf_hdr l2arc_buf_hdr_t; @@ -638,15 +638,15 @@ boolean_t l2arc_feed_again = B_TRUE; /* turbo warmup */ boolean_t l2arc_norw = B_TRUE; /* no reads during writes */ -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_write_max, CTLFLAG_RW, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2arc_write_max, CTLFLAG_RW, &l2arc_write_max, 0, "max write size"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_write_boost, CTLFLAG_RW, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2arc_write_boost, CTLFLAG_RW, &l2arc_write_boost, 0, "extra write during warmup"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_headroom, CTLFLAG_RW, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2arc_headroom, CTLFLAG_RW, &l2arc_headroom, 0, "number of dev writes"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_feed_secs, CTLFLAG_RW, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2arc_feed_secs, CTLFLAG_RW, &l2arc_feed_secs, 0, "interval seconds"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_feed_min_ms, CTLFLAG_RW, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2arc_feed_min_ms, CTLFLAG_RW, &l2arc_feed_min_ms, 0, "min interval milliseconds"); SYSCTL_INT(_vfs_zfs, OID_AUTO, l2arc_noprefetch, CTLFLAG_RW, @@ -656,46 +656,46 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, l2arc_norw, CTLFLAG_RW, &l2arc_norw, 0, "no reads during writes"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, anon_size, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, anon_size, CTLFLAG_RD, &ARC_anon.arcs_size, 0, "size of anonymous state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, anon_metadata_lsize, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, anon_metadata_lsize, CTLFLAG_RD, &ARC_anon.arcs_lsize[ARC_BUFC_METADATA], 0, "size of anonymous state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, anon_data_lsize, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, anon_data_lsize, CTLFLAG_RD, &ARC_anon.arcs_lsize[ARC_BUFC_DATA], 0, "size of anonymous state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_size, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_size, CTLFLAG_RD, &ARC_mru.arcs_size, 0, "size of mru state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_metadata_lsize, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_metadata_lsize, CTLFLAG_RD, &ARC_mru.arcs_lsize[ARC_BUFC_METADATA], 0, "size of metadata in mru state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_data_lsize, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_data_lsize, CTLFLAG_RD, &ARC_mru.arcs_lsize[ARC_BUFC_DATA], 0, "size of data in mru state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_ghost_size, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_ghost_size, CTLFLAG_RD, &ARC_mru_ghost.arcs_size, 0, "size of mru ghost state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_ghost_metadata_lsize, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_ghost_metadata_lsize, CTLFLAG_RD, &ARC_mru_ghost.arcs_lsize[ARC_BUFC_METADATA], 0, "size of metadata in mru ghost state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_ghost_data_lsize, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_ghost_data_lsize, CTLFLAG_RD, &ARC_mru_ghost.arcs_lsize[ARC_BUFC_DATA], 0, "size of data in mru ghost state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_size, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_size, CTLFLAG_RD, &ARC_mfu.arcs_size, 0, "size of mfu state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_metadata_lsize, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_metadata_lsize, CTLFLAG_RD, &ARC_mfu.arcs_lsize[ARC_BUFC_METADATA], 0, "size of metadata in mfu state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_data_lsize, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_data_lsize, CTLFLAG_RD, &ARC_mfu.arcs_lsize[ARC_BUFC_DATA], 0, "size of data in mfu state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_ghost_size, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_ghost_size, CTLFLAG_RD, &ARC_mfu_ghost.arcs_size, 0, "size of mfu ghost state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_ghost_metadata_lsize, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_ghost_metadata_lsize, CTLFLAG_RD, &ARC_mfu_ghost.arcs_lsize[ARC_BUFC_METADATA], 0, "size of metadata in mfu ghost state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_ghost_data_lsize, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_ghost_data_lsize, CTLFLAG_RD, &ARC_mfu_ghost.arcs_lsize[ARC_BUFC_DATA], 0, "size of data in mfu ghost state"); -SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2c_only_size, CTLFLAG_RD, +SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2c_only_size, CTLFLAG_RD, &ARC_l2c_only.arcs_size, 0, "size of mru state"); /* ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#9 (text+ko) ==== @@ -61,7 +61,7 @@ SYSCTL_UINT(_vfs_zfs_zfetch, OID_AUTO, block_cap, CTLFLAG_RDTUN, &zfetch_block_cap, 0, "Max number of blocks to fetch at a time"); TUNABLE_QUAD("vfs.zfs.zfetch.array_rd_sz", &zfetch_array_rd_sz); -SYSCTL_QUAD(_vfs_zfs_zfetch, OID_AUTO, array_rd_sz, CTLFLAG_RDTUN, +SYSCTL_UQUAD(_vfs_zfs_zfetch, OID_AUTO, array_rd_sz, CTLFLAG_RDTUN, &zfetch_array_rd_sz, 0, "Number of bytes in a array_read at which we stop prefetching"); ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#6 (text+ko) ==== @@ -50,7 +50,7 @@ SYSCTL_INT(_vfs_zfs_txg, OID_AUTO, synctime, CTLFLAG_RDTUN, &zfs_txg_synctime, 0, "Target seconds to sync a txg"); TUNABLE_QUAD("vfs.zfs.txg.write_limit_override", &zfs_write_limit_override); -SYSCTL_QUAD(_vfs_zfs_txg, OID_AUTO, write_limit_override, CTLFLAG_RW, +SYSCTL_UQUAD(_vfs_zfs_txg, OID_AUTO, write_limit_override, CTLFLAG_RW, &zfs_write_limit_override, 0, "Override maximum size of a txg to this size in bytes, " "value of 0 means don't override"); ==== //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#16 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.15 2010/10/13 21:37:02 jkim Exp $ +# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.16 2011/01/13 17:32:32 jkim Exp $ # # Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout # @@ -19,7 +19,8 @@ tools utilities" # files to remove -stripdirs="acpisrc acpixtract examples generate os_specific tests" +stripdirs="acpinames acpisrc acpixtract examples generate os_specific \ + tests" stripfiles="Makefile README acintel.h aclinux.h acmsvc.h acnetbsd.h \ acos2.h accygwin.h acefi.h acwin.h acwin64.h aeexec.c \ aehandlers.c aemain.c aetables.c aetables.h osunixdir.c \ ==== //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#12 (text+ko) ==== @@ -1,8 +1,77 @@ ---------------------------------------- +12 January 2011. Summary of changes for version 20110112: + +1) ACPI CA Core Subsystem: + +Fixed a race condition between method execution and namespace walks that can +possibly cause a fault. The problem was apparently introduced in version +20100528 as a result of a performance optimization that reduces the number of +namespace walks upon method exit by using the delete_namespace_subtree +function instead of the delete_namespace_by_owner function used previously. +Bug is a missing namespace lock in the delete_namespace_subtree function. +dana.myers@oracle.com + +Fixed several issues and a possible fault with the automatic "serialized" +method support. History: This support changes a method to "serialized" on the +fly if the method generates an AE_ALREADY_EXISTS error, indicating the +possibility that it cannot handle reentrancy. This fix repairs a couple of +issues seen in the field, especially on machines with many cores: + + 1) Delete method children only upon the exit of the last thread, + so as to not delete objects out from under other running threads + (and possibly causing a fault.) + 2) Set the "serialized" bit for the method only upon the exit of the + Last thread, so as to not cause deadlock when running threads + attempt to exit. + 3) Cleanup the use of the AML "MethodFlags" and internal method flags + so that there is no longer any confusion between the two. + + Lin Ming, Bob Moore. Reported by dana.myers@oracle.com. + +Debugger: Now lock the namespace for duration of a namespace dump. Prevents +issues if the namespace is changing dynamically underneath the debugger. +Especially affects temporary namespace nodes, since the debugger displays +these also. + +Updated the ordering of include files. The ACPICA headers should appear +before any compiler-specific headers (stdio.h, etc.) so that acenv.h can set +any necessary compiler-specific defines, etc. Affects the ACPI-related tools +and utilities. + +Updated all ACPICA copyrights and signons to 2011. Added the 2011 copyright +to all module headers and signons, including the Linux header. This affects +virtually every file in the ACPICA core subsystem, iASL compiler, and all +utilities. + +Added project files for MS Visual Studio 2008 (VC++ 9.0). The original +project files for VC++ 6.0 are now obsolete. New project files can be found +under acpica/generate/msvc9. See acpica/generate/msvc9/readme.txt for +details. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and has a +much larger code and data size. + + Previous Release (VC 6.0): + Non-Debug Version: 89.8K Code, 18.9K Data, 108.7K Total + Debug Version: 166.6K Code, 52.1K Data, 218.7K Total + Current Release (VC 9.0): + Non-Debug Version: 89.7K Code, 23.7K Data, 113.4K Total + Debug Version: 163.9K Code, 67.5K Data, 231.4K Total + +2) iASL Compiler/Disassembler and Tools: + +iASL: Added generic data types to the Data Table compiler. Add "generic" data +types such as UINT32, String, Unicode, etc., to simplify the generation of +platform-defined tables such as UEFI. Lin Ming. + +iASL: Added listing support for the Data Table Compiler. Adds listing support +(-l) to display actual binary output for each line of input code. + +---------------------------------------- 09 December 2010. Summary of changes for version 20101209: -This release is available at www.acpica.org/downloads - 1) ACPI CA Core Subsystem: Completed the major overhaul of the GPE support code that was begun in July @@ -73,8 +142,6 @@ ---------------------------------------- 13 October 2010. Summary of changes for version 20101013: -This release is available at www.acpica.org/downloads - 1) ACPI CA Core Subsystem: Added support to clear the PCIEXP_WAKE event. When clearing ACPI events, now @@ -133,8 +200,6 @@ ---------------------------------------- 15 September 2010. Summary of changes for version 20100915: -This release is available at www.acpica.org/downloads - 1) ACPI CA Core Subsystem: Removed the AcpiOsDerivePciId OSL interface. The various host implementations ==== //depot/projects/smpng/sys/contrib/dev/acpica/common/adfile.c#6 (text+ko) ==== @@ -4,114 +4,42 @@ * *****************************************************************************/ -/****************************************************************************** - * - * 1. Copyright Notice - * - * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. +/* + * Copyright (C) 2000 - 2011, Intel Corp. * All rights reserved. * - * 2. License + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 2.1. This is your license from Intel Corp. under its intellectual property - * rights. You may have additional license terms from the party that provided - * you this software, covering your right to use that party's intellectual - * property rights. + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. * - * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a - * copy of the source code appearing in this file ("Covered Code") an - * irrevocable, perpetual, worldwide license under Intel's copyrights in the - * base code distributed originally by Intel ("Original Intel Code") to copy, - * make derivatives, distribute, use and display any portion of the Covered - * Code in any form, with the right to sublicense such rights; and - * - * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent - * license (with the right to sublicense), under only those claims of Intel - * patents that are infringed by the Original Intel Code, to make, use, sell, - * offer to sell, and import the Covered Code and derivative works thereof - * solely to the minimum extent necessary to exercise the above copyright - * license, and in no event shall the patent license extend to any additions - * to or modifications of the Original Intel Code. No other license or right - * is granted directly or by implication, estoppel or otherwise; - * - * The above copyright and patent license is granted only if the following - * conditions are met: - * - * 3. Conditions - * - * 3.1. Redistribution of Source with Rights to Further Distribute Source. - * Redistribution of source code of any substantial portion of the Covered - * Code or modification with rights to further distribute source must include - * the above Copyright Notice, the above License, this list of Conditions, - * and the following Disclaimer and Export Compliance provision. In addition, - * Licensee must cause all Covered Code to which Licensee contributes to - * contain a file documenting the changes Licensee made to create that Covered - * Code and the date of any change. Licensee must include in that file the - * documentation of any changes made by any predecessor Licensee. Licensee - * must include a prominent statement that the modification is derived, - * directly or indirectly, from Original Intel Code. - * - * 3.2. Redistribution of Source with no Rights to Further Distribute Source. - * Redistribution of source code of any substantial portion of the Covered - * Code or modification without rights to further distribute source must - * include the following Disclaimer and Export Compliance provision in the - * documentation and/or other materials provided with distribution. In - * addition, Licensee may not authorize further sublicense of source of any - * portion of the Covered Code, and must include terms to the effect that the - * license from Licensee to its licensee is limited to the intellectual - * property embodied in the software Licensee provides to its licensee, and - * not to intellectual property embodied in modifications its licensee may - * make. - * - * 3.3. Redistribution of Executable. Redistribution in executable form of any - * substantial portion of the Covered Code or modification must reproduce the - * above Copyright Notice, and the following Disclaimer and Export Compliance - * provision in the documentation and/or other materials provided with the - * distribution. - * - * 3.4. Intel retains all right, title, and interest in and to the Original - * Intel Code. - * - * 3.5. Neither the name Intel nor any other trademark owned or controlled by - * Intel shall be used in advertising or otherwise to promote the sale, use or - * other dealings in products derived from or relating to the Covered Code - * without prior written authorization from Intel. - * - * 4. Disclaimer and Export Compliance - * - * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED - * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE - * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, - * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY - * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY - * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A - * PARTICULAR PURPOSE. - * - * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES - * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR - * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, - * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY - * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL - * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS - * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY - * LIMITED REMEDY. - * - * 4.3. Licensee shall not export, either directly or indirectly, any of this - * software or system incorporating such software without first obtaining any - * required license or other approval from the U. S. Department of Commerce or - * any other agency or department of the United States Government. In the - * event Licensee exports any such software from the United States or - * re-exports any such software from a foreign destination, Licensee shall - * ensure that the distribution and export/re-export of the software is in - * compliance with all laws, regulations, orders, or other restrictions of the - * U.S. Export Administration Regulations. Licensee agrees that neither it nor - * any of its subsidiaries will export/re-export any technical data, process, - * software, or service, directly or indirectly, to any country for which the - * United States government or any agency thereof requires an export license, - * other governmental approval, or letter of assurance, without first obtaining - * such license, approval or letter. - * - *****************************************************************************/ + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + */ #include ==== //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#17 (text+ko) ==== @@ -4,114 +4,42 @@ * *****************************************************************************/ -/****************************************************************************** - * - * 1. Copyright Notice - * - * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. +/* + * Copyright (C) 2000 - 2011, Intel Corp. * All rights reserved. * - * 2. License + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 2.1. This is your license from Intel Corp. under its intellectual property - * rights. You may have additional license terms from the party that provided - * you this software, covering your right to use that party's intellectual - * property rights. + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. * - * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a - * copy of the source code appearing in this file ("Covered Code") an - * irrevocable, perpetual, worldwide license under Intel's copyrights in the - * base code distributed originally by Intel ("Original Intel Code") to copy, - * make derivatives, distribute, use and display any portion of the Covered - * Code in any form, with the right to sublicense such rights; and - * - * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent - * license (with the right to sublicense), under only those claims of Intel - * patents that are infringed by the Original Intel Code, to make, use, sell, - * offer to sell, and import the Covered Code and derivative works thereof - * solely to the minimum extent necessary to exercise the above copyright - * license, and in no event shall the patent license extend to any additions - * to or modifications of the Original Intel Code. No other license or right - * is granted directly or by implication, estoppel or otherwise; - * - * The above copyright and patent license is granted only if the following - * conditions are met: - * - * 3. Conditions - * - * 3.1. Redistribution of Source with Rights to Further Distribute Source. - * Redistribution of source code of any substantial portion of the Covered - * Code or modification with rights to further distribute source must include - * the above Copyright Notice, the above License, this list of Conditions, - * and the following Disclaimer and Export Compliance provision. In addition, - * Licensee must cause all Covered Code to which Licensee contributes to - * contain a file documenting the changes Licensee made to create that Covered - * Code and the date of any change. Licensee must include in that file the - * documentation of any changes made by any predecessor Licensee. Licensee - * must include a prominent statement that the modification is derived, - * directly or indirectly, from Original Intel Code. - * - * 3.2. Redistribution of Source with no Rights to Further Distribute Source. - * Redistribution of source code of any substantial portion of the Covered - * Code or modification without rights to further distribute source must - * include the following Disclaimer and Export Compliance provision in the - * documentation and/or other materials provided with distribution. In - * addition, Licensee may not authorize further sublicense of source of any - * portion of the Covered Code, and must include terms to the effect that the - * license from Licensee to its licensee is limited to the intellectual - * property embodied in the software Licensee provides to its licensee, and - * not to intellectual property embodied in modifications its licensee may - * make. - * - * 3.3. Redistribution of Executable. Redistribution in executable form of any - * substantial portion of the Covered Code or modification must reproduce the - * above Copyright Notice, and the following Disclaimer and Export Compliance - * provision in the documentation and/or other materials provided with the - * distribution. - * - * 3.4. Intel retains all right, title, and interest in and to the Original - * Intel Code. - * - * 3.5. Neither the name Intel nor any other trademark owned or controlled by - * Intel shall be used in advertising or otherwise to promote the sale, use or - * other dealings in products derived from or relating to the Covered Code - * without prior written authorization from Intel. - * - * 4. Disclaimer and Export Compliance - * - * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED - * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE - * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, - * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY - * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY - * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A - * PARTICULAR PURPOSE. - * - * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES - * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR - * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, - * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY - * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL - * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS - * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY - * LIMITED REMEDY. - * - * 4.3. Licensee shall not export, either directly or indirectly, any of this - * software or system incorporating such software without first obtaining any - * required license or other approval from the U. S. Department of Commerce or - * any other agency or department of the United States Government. In the - * event Licensee exports any such software from the United States or - * re-exports any such software from a foreign destination, Licensee shall - * ensure that the distribution and export/re-export of the software is in - * compliance with all laws, regulations, orders, or other restrictions of the - * U.S. Export Administration Regulations. Licensee agrees that neither it nor - * any of its subsidiaries will export/re-export any technical data, process, - * software, or service, directly or indirectly, to any country for which the - * United States government or any agency thereof requires an export license, - * other governmental approval, or letter of assurance, without first obtaining - * such license, approval or letter. - * - *****************************************************************************/ + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + */ #include @@ -667,7 +595,7 @@ if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT)) { - AcpiOsPrintf (" **** ACPI 1.0, no 64-bit math support"); + AcpiOsPrintf (" **** 32-bit table (V1), no 64-bit math support"); } break; ==== //depot/projects/smpng/sys/contrib/dev/acpica/common/adwalk.c#7 (text+ko) ==== @@ -4,114 +4,42 @@ * *****************************************************************************/ -/****************************************************************************** - * - * 1. Copyright Notice - * - * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. +/* + * Copyright (C) 2000 - 2011, Intel Corp. * All rights reserved. * - * 2. License + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * 2.1. This is your license from Intel Corp. under its intellectual property - * rights. You may have additional license terms from the party that provided - * you this software, covering your right to use that party's intellectual - * property rights. + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. * - * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a - * copy of the source code appearing in this file ("Covered Code") an - * irrevocable, perpetual, worldwide license under Intel's copyrights in the - * base code distributed originally by Intel ("Original Intel Code") to copy, - * make derivatives, distribute, use and display any portion of the Covered - * Code in any form, with the right to sublicense such rights; and - * - * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent - * license (with the right to sublicense), under only those claims of Intel - * patents that are infringed by the Original Intel Code, to make, use, sell, - * offer to sell, and import the Covered Code and derivative works thereof - * solely to the minimum extent necessary to exercise the above copyright - * license, and in no event shall the patent license extend to any additions - * to or modifications of the Original Intel Code. No other license or right - * is granted directly or by implication, estoppel or otherwise; - * - * The above copyright and patent license is granted only if the following - * conditions are met: - * - * 3. Conditions - * - * 3.1. Redistribution of Source with Rights to Further Distribute Source. - * Redistribution of source code of any substantial portion of the Covered - * Code or modification with rights to further distribute source must include - * the above Copyright Notice, the above License, this list of Conditions, - * and the following Disclaimer and Export Compliance provision. In addition, - * Licensee must cause all Covered Code to which Licensee contributes to - * contain a file documenting the changes Licensee made to create that Covered - * Code and the date of any change. Licensee must include in that file the - * documentation of any changes made by any predecessor Licensee. Licensee - * must include a prominent statement that the modification is derived, - * directly or indirectly, from Original Intel Code. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 14 20:16:50 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF7871065674; Fri, 14 Jan 2011 20:16:50 +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 72533106564A for ; Fri, 14 Jan 2011 20:16:50 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5F36F8FC16 for ; Fri, 14 Jan 2011 20:16:50 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0EKGo2T012189 for ; Fri, 14 Jan 2011 20:16:50 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0EKGoBV012186 for perforce@freebsd.org; Fri, 14 Jan 2011 20:16:50 GMT (envelope-from trasz@freebsd.org) Date: Fri, 14 Jan 2011 20:16:50 GMT Message-Id: <201101142016.p0EKGoBV012186@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187810 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jan 2011 20:16:51 -0000 http://p4web.freebsd.org/@@187810?ac=10 Change 187810 by trasz@trasz_victim on 2011/01/14 20:15:53 It's log action that needs to be ratelimited, not signal. D'oh. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#5 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#5 (text+ko) ==== @@ -186,11 +186,6 @@ rctl_deferred_psignal(struct proc *p, int signum) { int need_lock; - static int curtime = 0; - static struct timeval lasttime; - - if (!ppsratecheck(&lasttime, &curtime, 10)) - return; /* * XXX: This is ugly. Either turn it into a real taskqueue, @@ -288,6 +283,8 @@ struct sbuf sb; int should_deny = 0; char *buf; + static int curtime = 0; + static struct timeval lasttime; mtx_lock(&rctl_lock); @@ -307,6 +304,9 @@ should_deny = 1; break; case RCTL_ACTION_LOG: + if (!ppsratecheck(&lasttime, &curtime, 10)) + break; + buf = malloc(RCTL_LOG_BUFSIZE, M_RCTL, M_NOWAIT); if (buf == NULL) { printf("rctl_enforce_proc: out of memory\n"); From owner-p4-projects@FreeBSD.ORG Fri Jan 14 20:16:51 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2A4B1065770; Fri, 14 Jan 2011 20:16:50 +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 AED8A1065672 for ; Fri, 14 Jan 2011 20:16:50 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 814378FC17 for ; Fri, 14 Jan 2011 20:16:50 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0EKGoTv012195 for ; Fri, 14 Jan 2011 20:16:50 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0EKGoFR012192 for perforce@freebsd.org; Fri, 14 Jan 2011 20:16:50 GMT (envelope-from trasz@freebsd.org) Date: Fri, 14 Jan 2011 20:16:50 GMT Message-Id: <201101142016.p0EKGoFR012192@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187811 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jan 2011 20:16:51 -0000 http://p4web.freebsd.org/@@187811?ac=10 Change 187811 by trasz@trasz_victim on 2011/01/14 20:16:33 Improve. Affected files ... .. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#6 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#6 (text+ko) ==== @@ -58,10 +58,14 @@ # Put resource=value pairs into environment variables. eval `rctl $hflag -u j:$jail` - pctcpulimit=`rctl j:$jail:pctcpu:deny=/jail | sed 's/.*=//'` - rsslimit=`rctl j:$jail:rss:deny=/jail | sed 's/.*=//'` - vmemlimit=`rctl j:$jail:vmem:deny=/jail | sed 's/.*=//'` - swaplimit=`rctl j:$jail:swap:deny=/jail | sed 's/.*=//'` + pctcpulimit=`rctl $hflag j:$jail:pctcpu:deny=/jail | sed 's/.*=//'` + : ${pctcpulimit:="-"} + rsslimit=`rctl $hflag j:$jail:rss:deny=/jail | sed 's/.*=//'` + : ${rsslimit:="-"} + vmemlimit=`rctl $hflag j:$jail:vmem:deny=/jail | sed 's/.*=//'` + : ${vmemlimit:="-"} + swaplimit=`rctl $hflag j:$jail:swap:deny=/jail | sed 's/.*=//'` + : ${swaplimit:="-"} printf "%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\n" "$jail" "$pctcpu" "$pctcpulimit" "$rss" "$rsslimit" "$vmem" "$vmemlimit" "$swap" "$swaplimit" done @@ -73,10 +77,14 @@ # Put resource=value pairs into environment variables. eval `rctl $hflag -u u:$user` - pctcpulimit=`rctl u:$user:pctcpu:deny=/user | sed 's/.*=//'` - rsslimit=`rctl u:$user:rss:deny=/user | sed 's/.*=//'` - vmemlimit=`rctl u:$user:vmem:deny=/user | sed 's/.*=//'` - swaplimit=`rctl u:$user:swap:deny=/user | sed 's/.*=//'` + pctcpulimit=`rctl $hflag u:$user:pctcpu:deny=/user | sed 's/.*=//'` + : ${pctcpulimit:="-"} + rsslimit=`rctl $hflag u:$user:rss:deny=/user | sed 's/.*=//'` + : ${rsslimit:="-"} + vmemlimit=`rctl $hflag u:$user:vmem:deny=/user | sed 's/.*=//'` + : ${vmemlimit:="-"} + swaplimit=`rctl $hflag u:$user:swap:deny=/user | sed 's/.*=//'` + : ${swaplimit:="-"} printf "%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\t\%s\n" "$user" "$pctcpu" "$pctcpulimit" "$rss" "$rsslimit" "$vmem" "$vmemlimit" "$swap" "$swaplimit" done From owner-p4-projects@FreeBSD.ORG Fri Jan 14 20:20:01 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8A4C1065693; Fri, 14 Jan 2011 20:20:01 +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 7AE351065670 for ; Fri, 14 Jan 2011 20:20:01 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 45D0D8FC0C for ; Fri, 14 Jan 2011 20:20:01 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0EKK1Tw012229 for ; Fri, 14 Jan 2011 20:20:01 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0EKK1V1012226 for perforce@freebsd.org; Fri, 14 Jan 2011 20:20:01 GMT (envelope-from trasz@freebsd.org) Date: Fri, 14 Jan 2011 20:20:01 GMT Message-Id: <201101142020.p0EKK1V1012226@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187812 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jan 2011 20:20:02 -0000 http://p4web.freebsd.org/@@187812?ac=10 Change 187812 by trasz@trasz_victim on 2011/01/14 20:19:22 Make the code less confusing. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#6 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#6 (text+ko) ==== @@ -77,7 +77,7 @@ */ struct rctl_rule_link { LIST_ENTRY(rctl_rule_link) rctl_next; - struct rctl_rule *rctl_rule; + struct rctl_rule *rctl_rule; }; struct dict { @@ -141,7 +141,7 @@ static int rctl_rule_fully_specified(const struct rctl_rule *rule); static void rctl_rule_to_sbuf(struct sbuf *sb, const struct rctl_rule *rule); -MALLOC_DEFINE(M_RCTL, "rctl", "Hierarchical Resource Limits"); +MALLOC_DEFINE(M_RCTL, "rctl", "Resource Limits"); static const char * rctl_subject_type_name(int subject) @@ -302,10 +302,10 @@ switch (rule->hr_action) { case RCTL_ACTION_DENY: should_deny = 1; - break; + continue; case RCTL_ACTION_LOG: if (!ppsratecheck(&lasttime, &curtime, 10)) - break; + continue; buf = malloc(RCTL_LOG_BUFSIZE, M_RCTL, M_NOWAIT); if (buf == NULL) { @@ -320,25 +320,25 @@ p->p_comm, p->p_ucred->cr_uid); sbuf_delete(&sb); free(buf, M_RCTL); - break; + continue; case RCTL_ACTION_SIGHUP: rctl_deferred_psignal(p, SIGHUP); - break; + continue; case RCTL_ACTION_SIGINT: rctl_deferred_psignal(p, SIGINT); - break; + continue; case RCTL_ACTION_SIGKILL: rctl_deferred_psignal(p, SIGKILL); - break; + continue; case RCTL_ACTION_SIGSEGV: rctl_deferred_psignal(p, SIGSEGV); - break; + continue; case RCTL_ACTION_SIGXCPU: rctl_deferred_psignal(p, SIGXCPU); - break; + continue; case RCTL_ACTION_SIGXFSZ: rctl_deferred_psignal(p, SIGXFSZ); - break; + continue; default: panic("rctl_enforce_proc: unknown action %d", rule->hr_action); From owner-p4-projects@FreeBSD.ORG Sat Jan 15 09:05:10 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3231B1065674; Sat, 15 Jan 2011 09:05:10 +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 E26841065672 for ; Sat, 15 Jan 2011 09:05:09 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CF48A8FC12 for ; Sat, 15 Jan 2011 09:05:09 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0F959GP074550 for ; Sat, 15 Jan 2011 09:05:09 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0F959kQ074547 for perforce@freebsd.org; Sat, 15 Jan 2011 09:05:09 GMT (envelope-from trasz@freebsd.org) Date: Sat, 15 Jan 2011 09:05:09 GMT Message-Id: <201101150905.p0F959kQ074547@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jan 2011 09:05:10 -0000 http://p4web.freebsd.org/@@187828?ac=10 Change 187828 by trasz@trasz_victim on 2011/01/15 09:04:04 Protect rctl structures with rwlock; they rarely change (on fork/setwhateverid/exit and when rules get added or removed). Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#7 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#7 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -135,8 +136,8 @@ static uma_zone_t rctl_rule_link_zone; static uma_zone_t rctl_rule_zone; -static struct mtx rctl_lock; -MTX_SYSINIT(rctl_lock, &rctl_lock, "RCTL lock", MTX_DEF); +static struct rwlock rctl_lock; +RW_SYSINIT(rctl_lock, &rctl_lock, "RCTL lock"); static int rctl_rule_fully_specified(const struct rctl_rule *rule); static void rctl_rule_to_sbuf(struct sbuf *sb, const struct rctl_rule *rule); @@ -211,7 +212,7 @@ int64_t available = INT64_MAX; struct ucred *cred = p->p_ucred; - mtx_assert(&rctl_lock, MA_OWNED); + rw_assert(&rctl_lock, RA_LOCKED); resource = rule->hr_resource; switch (rule->hr_per) { @@ -249,7 +250,7 @@ { int64_t available; - mtx_assert(&rctl_lock, MA_OWNED); + rw_assert(&rctl_lock, RA_LOCKED); available = rctl_available_resource(p, rule); if (available >= amount) @@ -286,7 +287,7 @@ static int curtime = 0; static struct timeval lasttime; - mtx_lock(&rctl_lock); + rw_rlock(&rctl_lock); /* * There may be more than one matching rule; go through all of them. @@ -345,7 +346,7 @@ } } - mtx_unlock(&rctl_lock); + rw_runlock(&rctl_lock); if (should_deny) { /* @@ -365,7 +366,7 @@ struct rctl_rule_link *link; uint64_t amount = UINT64_MAX; - mtx_lock(&rctl_lock); + rw_rlock(&rctl_lock); /* * There may be more than one matching rule; go through all of them. @@ -381,7 +382,7 @@ amount = rule->hr_amount; } - mtx_unlock(&rctl_lock); + rw_runlock(&rctl_lock); return (amount); } @@ -510,9 +511,9 @@ link = uma_zalloc(rctl_rule_link_zone, M_WAITOK); link->rctl_rule = rule; - mtx_lock(&rctl_lock); + rw_wlock(&rctl_lock); LIST_INSERT_HEAD(&container->c_rule_links, link, rctl_next); - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); } static int @@ -521,7 +522,7 @@ struct rctl_rule_link *link; KASSERT(rctl_rule_fully_specified(rule), ("rule not fully specified")); - mtx_assert(&rctl_lock, MA_OWNED); + rw_assert(&rctl_lock, RA_WLOCKED); link = uma_zalloc(rctl_rule_link_zone, M_NOWAIT); if (link == NULL) @@ -545,7 +546,7 @@ int removed = 0; struct rctl_rule_link *link, *linktmp; - mtx_assert(&rctl_lock, MA_OWNED); + rw_assert(&rctl_lock, RA_WLOCKED); LIST_FOREACH_SAFE(link, &container->c_rule_links, rctl_next, linktmp) { if (!rctl_rule_matches(link->rctl_rule, filter)) @@ -941,9 +942,9 @@ struct rctl_rule *filter = (struct rctl_rule *)arg2; int found = 0; - mtx_lock(&rctl_lock); + rw_wlock(&rctl_lock); found += rctl_container_remove_rules(container, filter); - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); *((int *)arg3) += found; @@ -962,9 +963,9 @@ if (filter->hr_subject_type == RCTL_SUBJECT_TYPE_PROCESS && filter->hr_subject.hs_proc != NULL) { p = filter->hr_subject.hs_proc; - mtx_lock(&rctl_lock); + rw_wlock(&rctl_lock); found = rctl_container_remove_rules(&p->p_container, filter); - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); if (found) return (0); return (ESRCH); @@ -981,11 +982,11 @@ KASSERT(error == 0, ("prison_container_foreach failed")); sx_assert(&allproc_lock, SA_LOCKED); - mtx_lock(&rctl_lock); + rw_wlock(&rctl_lock); FOREACH_PROC_IN_SYSTEM(p) { found += rctl_container_remove_rules(&p->p_container, filter); } - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); if (found) return (0); @@ -1179,14 +1180,14 @@ struct rctl_rule_link *link; struct sbuf *sb = (struct sbuf *)arg3; - mtx_lock(&rctl_lock); + rw_rlock(&rctl_lock); LIST_FOREACH(link, &container->c_rule_links, rctl_next) { if (!rctl_rule_matches(link->rctl_rule, filter)) continue; rctl_rule_to_sbuf(sb, link->rctl_rule); sbuf_printf(sb, ","); } - mtx_unlock(&rctl_lock); + rw_runlock(&rctl_lock); return (0); } @@ -1221,7 +1222,7 @@ sx_assert(&allproc_lock, SA_LOCKED); FOREACH_PROC_IN_SYSTEM(p) { - mtx_lock(&rctl_lock); + rw_rlock(&rctl_lock); LIST_FOREACH(link, &p->p_container.c_rule_links, rctl_next) { /* * Non-process rules will be added to the buffer later. @@ -1234,7 +1235,7 @@ rctl_rule_to_sbuf(sb, link->rctl_rule); sbuf_printf(sb, ","); } - mtx_unlock(&rctl_lock); + rw_runlock(&rctl_lock); } loginclass_container_foreach(rctl_get_rules_callback, filter, sb); @@ -1304,12 +1305,12 @@ sb = sbuf_new(NULL, buf, bufsize, SBUF_FIXEDLEN); KASSERT(sb != NULL, ("sbuf_new failed")); - mtx_lock(&rctl_lock); + rw_rlock(&rctl_lock); LIST_FOREACH(link, &filter->hr_subject.hs_proc->p_container.c_rule_links, rctl_next) { rctl_rule_to_sbuf(sb, link->rctl_rule); sbuf_printf(sb, ","); } - mtx_unlock(&rctl_lock); + rw_runlock(&rctl_lock); if (sbuf_error(sb) == ENOMEM) { sbuf_delete(sb); free(buf, M_RCTL); @@ -1432,7 +1433,7 @@ /* * Remove rules that are no longer applicable with the new ucred. */ - mtx_lock(&rctl_lock); + rw_wlock(&rctl_lock); LIST_FOREACH(link, &p->p_container.c_rule_links, rctl_next) { switch (link->rctl_rule->hr_subject_type) { case RCTL_SUBJECT_TYPE_PROCESS: @@ -1458,34 +1459,34 @@ rctl_rule_release(link->rctl_rule); uma_zfree(rctl_rule_link_zone, link); } - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); /* * Add rules for the new ucred and move between containers where applicable. */ if (newuip != olduip) { - mtx_lock(&rctl_lock); + rw_wlock(&rctl_lock); LIST_FOREACH(link, &newuip->ui_container.c_rule_links, rctl_next) { error = rctl_container_add_rule_locked(&p->p_container, link->rctl_rule); KASSERT(error == 0, ("XXX: better error handling needed")); } - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); } if (newlc != oldlc) { - mtx_lock(&rctl_lock); + rw_wlock(&rctl_lock); LIST_FOREACH(link, &newlc->lc_container.c_rule_links, rctl_next) { error = rctl_container_add_rule_locked(&p->p_container, link->rctl_rule); KASSERT(error == 0, ("XXX: better error handling needed")); } - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); } if (newpr != oldpr) { - mtx_lock(&rctl_lock); + rw_wlock(&rctl_lock); LIST_FOREACH(link, &newpr->pr_container.c_rule_links, rctl_next) { error = rctl_container_add_rule_locked(&p->p_container, link->rctl_rule); KASSERT(error == 0, ("XXX: better error handling needed")); } - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); } } @@ -1505,7 +1506,7 @@ if (child->p_flag & P_SYSTEM) return (0); - mtx_lock(&rctl_lock); + rw_wlock(&rctl_lock); /* * Go through limits applicable to the parent and assign them to the child. @@ -1531,7 +1532,7 @@ } } - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); return (0); fail: @@ -1541,7 +1542,7 @@ rctl_rule_release(link->rctl_rule); uma_zfree(rctl_rule_link_zone, link); } - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); return (EAGAIN); } @@ -1553,14 +1554,14 @@ { struct rctl_rule_link *link; - mtx_lock(&rctl_lock); + rw_wlock(&rctl_lock); while (!LIST_EMPTY(&p->p_container.c_rule_links)) { link = LIST_FIRST(&p->p_container.c_rule_links); LIST_REMOVE(link, rctl_next); rctl_rule_release(link->rctl_rule); uma_zfree(rctl_rule_link_zone, link); } - mtx_unlock(&rctl_lock); + rw_wunlock(&rctl_lock); } static void From owner-p4-projects@FreeBSD.ORG Sat Jan 15 09:53:21 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A2791065673; Sat, 15 Jan 2011 09:53:21 +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 5C370106564A for ; Sat, 15 Jan 2011 09:53:21 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4867D8FC14 for ; Sat, 15 Jan 2011 09:53:21 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0F9rLAI084986 for ; Sat, 15 Jan 2011 09:53:21 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0F9rKDx084983 for perforce@freebsd.org; Sat, 15 Jan 2011 09:53:20 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 15 Jan 2011 09:53:20 GMT Message-Id: <201101150953.p0F9rKDx084983@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jan 2011 09:53:21 -0000 http://p4web.freebsd.org/@@187832?ac=10 Change 187832 by rene@rene_acer on 2011/01/15 09:53:19 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#83 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#36 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#98 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#19 integrate .. //depot/projects/docproj_nl/www/en/administration.sgml#17 integrate .. //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#7 integrate .. //depot/projects/docproj_nl/www/en/cgi/mailindex.cgi#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#21 integrate .. //depot/projects/docproj_nl/www/en/cgi/mid.cgi#4 integrate .. //depot/projects/docproj_nl/www/en/cgi/mirror.cgi#3 integrate .. //depot/projects/docproj_nl/www/en/cgi/missing_handler.cgi#3 integrate .. //depot/projects/docproj_nl/www/en/cgi/pds.cgi#3 integrate .. //depot/projects/docproj_nl/www/en/cgi/ports.cgi#6 integrate .. //depot/projects/docproj_nl/www/en/cgi/url.cgi#3 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#38 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/gnome1_porting.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/index.xsl#7 integrate .. //depot/projects/docproj_nl/www/en/releases/index.sgml#12 integrate .. //depot/projects/docproj_nl/www/en/security/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/security/mkindex.xsl#2 integrate .. //depot/projects/docproj_nl/www/en/security/notices.sgml#1 branch .. //depot/projects/docproj_nl/www/en/security/security.sgml#16 integrate .. //depot/projects/docproj_nl/www/nl/where.sgml#25 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#21 integrate .. //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#9 integrate .. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#9 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#83 (text+ko) ==== @@ -1,4 +1,4 @@ - + 2008 2009 2010 + 2011 The FreeBSD Documentation Project ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -93,11 +93,7 @@ The minimal configuration to install &os; varies with the &os; version and the hardware architecture. - Information about the minimal configuration is - available in the Installation Notes on the Release - Information page of the &os; web site. A summary of - this information is given in the following sections. + A summary of this information is given in the following sections. Depending on the method you choose to install &os;, you may also need a floppy drive, a supported CDROM drive, and in some case a network adapter. This will be covered by the @@ -2426,6 +2426,15 @@ + RELENG_8_2 + + + The release branch for &os;-8.2, used only for + security advisories and other critical fixes. + + + + RELENG_8_1 @@ -2453,6 +2462,15 @@ + RELENG_7_4 + + + The release branch for &os;-7.4, used only for + security advisories and other critical fixes. + + + + RELENG_7_3 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#98 (text+ko) ==== @@ -1,7 +1,7 @@ Conflict handling - There are tree different variables to register a conflict + There are three different variables to register a conflict between packages and ports: CONFLICTS, CONFLICTS_INSTALL and CONFLICTS_BUILD. ==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#19 (text+ko) ==== @@ -1,7 +1,7 @@ - <refadm@> - -

The Reference Systems Administrators are responsible for administrating, - upgrading and maintaining the reference systems in the FreeBSD cluster. - These systems are available to all FreeBSD committers.

- - -

Webmaster Team <webmaster@FreeBSD.org>

==== //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.41 2010/12/29 13:08:41 wosch Exp $ +# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.42 2011/01/08 14:58:27 wosch Exp $ # # Perl routines to encapsulate various elements of HTML page style. @@ -236,7 +236,7 @@ return qq` ==== //depot/projects/docproj_nl/www/en/cgi/mailindex.cgi#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/usr/bin/perl -T # -# Copyright (c) Jan 1999 Wolfram Schneider +# Copyright (c) Jan 1999-2011 Wolfram Schneider # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: www/en/cgi/mailindex.cgi,v 1.10 2006/12/01 21:58:22 wosch Exp $ +# $FreeBSD: www/en/cgi/mailindex.cgi,v 1.11 2011/01/08 14:58:27 wosch Exp $ use CGI; ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#21 (text+ko) ==== @@ -1,6 +1,6 @@ #!/usr/bin/perl -T # -# Copyright (c) 1996-2010 Wolfram Schneider +# Copyright (c) 1996-2011 Wolfram Schneider # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -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.258 2010/12/29 15:20:51 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.259 2011/01/08 14:58:27 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -1491,10 +1491,10 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.258 2010/12/29 15:20:51 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.259 2011/01/08 14:58:27 wosch Exp $'; return qq{\ 
-Copyright (c) 1996-2010 Wolfram Schneider
+Copyright (c) 1996-2011 Wolfram Schneider
 Copyright (c) 1993-1995 Berkeley Software Design, Inc.
 
 This data is part of a licensed program from BERKELEY SOFTWARE

==== //depot/projects/docproj_nl/www/en/cgi/mid.cgi#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -T
 #
-# Copyright (c) March 1998-2010 Wolfram Schneider . Berlin.
+# Copyright (c) March 1998-2011 Wolfram Schneider . Berlin.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 #
 # Search a mail by Message-ID, References or In-Reply-To field
 #
-# $FreeBSD: www/en/cgi/mid.cgi,v 1.18 2009/12/31 16:37:18 wosch Exp $
+# $FreeBSD: www/en/cgi/mid.cgi,v 1.19 2011/01/08 14:58:27 wosch Exp $
 
 require "./cgi-lib.pl";
 require "./cgi-style.pl";

==== //depot/projects/docproj_nl/www/en/cgi/mirror.cgi#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# (c) 1996-2010 Wolfram Schneider. Public domain.
+# (c) 1996-2011 Wolfram Schneider. Public domain.
 #
 # FreeBSD WWW mirror redirect
 #

==== //depot/projects/docproj_nl/www/en/cgi/missing_handler.cgi#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# Copyright (c) July 1997-2010. Wolfram Schneider 
+# Copyright (c) July 1997-2011. Wolfram Schneider 
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@
 #
 #     _________________________________________________________________
 #
-# $FreeBSD: www/en/cgi/missing_handler.cgi,v 1.20 2009/12/31 16:37:18 wosch Exp $
+# $FreeBSD: www/en/cgi/missing_handler.cgi,v 1.21 2011/01/08 14:58:27 wosch Exp $
 # ----------------------------------------------------------------------
 
 sub escape($) { $_ = $_[0]; s/&/&/g; s//>/g; $_; }

==== //depot/projects/docproj_nl/www/en/cgi/pds.cgi#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# Copyright (c) 1997-2010 Wolfram Schneider , Berlin.
+# Copyright (c) 1997-2011 Wolfram Schneider , Berlin.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 # pds.cgi - FreeBSD Ports download sources cgi script
 #	    print a list of source files for a port
 #
-# $FreeBSD: www/en/cgi/pds.cgi,v 1.13 2009/12/31 16:37:18 wosch Exp $
+# $FreeBSD: www/en/cgi/pds.cgi,v 1.14 2011/01/08 14:58:27 wosch Exp $
 
 sub escape($) { $_ = $_[0]; s/&/&/g; s//>/g; $_; }
 

==== //depot/projects/docproj_nl/www/en/cgi/ports.cgi#6 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -T
 #
-# Copyright (c) 1996-2010 Wolfram Schneider 
+# Copyright (c) 1996-2011 Wolfram Schneider 
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/ports.cgi,v 1.100 2010/12/29 12:48:29 wosch Exp $
+# $FreeBSD: www/en/cgi/ports.cgi,v 1.101 2011/01/08 14:58:27 wosch Exp $
 #
 # ports.cgi - search engine for FreeBSD ports
 #             	o search for a port by name or description
@@ -515,10 +515,10 @@
 
     print qq{
 Powered by FreeBSD
-© 1996-2010 by Wolfram Schneider. All rights reserved.

+© 1996-2011 by Wolfram Schneider. All rights reserved.

 };
 
-#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.100 2010/12/29 12:48:29 wosch Exp $} . "
\n";
+#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.101 2011/01/08 14:58:27 wosch Exp $} . "
\n";
     print qq{Please direct questions about this service to
 $mailto
\n};
     print qq{General questions about FreeBSD ports should be sent to }

==== //depot/projects/docproj_nl/www/en/cgi/url.cgi#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -T
 #
-# Copyright (c) Oct 1997-1999 Wolfram Schneider . Berlin.
+# Copyright (c) Oct 1997-2011 Wolfram Schneider . Berlin.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 #
 # url.cgi - make plain text URLs clickable
 #
-# $FreeBSD: www/en/cgi/url.cgi,v 1.37 2010/08/28 19:15:22 wosch Exp $
+# $FreeBSD: www/en/cgi/url.cgi,v 1.38 2011/01/08 14:58:27 wosch Exp $
 
 use strict;
 

==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#38 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
  %developers;
@@ -2823,6 +2823,18 @@
      fjoe 
      received 
   
+
+  
+     Anton Shterenlikht 
+     1x Asus WL-107g (Ralink RT2560 + RT2525, ral(4))

+         1x MSI CB54G2 (Ralink RT2560 + RT2525, ral(4))

+         1x Sitecom WL-112 (Ralink RT2560 + RT2525, ral(4))

+         1x Zonet ZEW1500 (PRISM GT/ISL3890, no driver)

+         1x Linksys WPC11v4 (Realtek RTL8180L, no driver)
+     bschmidt 
+     received 
+  
+
 
 
 &footer;

==== //depot/projects/docproj_nl/www/en/gnome/docs/gnome1_porting.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -52,12 +52,6 @@
 			
 
 			
-			  glibwww
-			  www/glibwww
-			  gnomelibs
-			
-
-			
 			  gnomecanvas
 			  graphics/gnomecanvas
 			  gnomelibs gdkpixbuf
@@ -94,24 +88,12 @@
 			
 
 			
-			  gtkhtml
-			  www/gtkhtml
-			  glibwww gal libghttp libcapplet
-			
-
-			
 			  imlib
 			  graphics/imlib
 			  gtk12
 			
 
 			
-			  libcapplet
-			  x11/libcapplet
-			  gnomelibs
-			
-
-			
 			  libgda
 			  databases/libgda
 			  gconf bonobo
@@ -148,12 +130,6 @@
 			
 
 			
-			  pygnome
-			  x11-toolkits/py-gnome
-			  gtkhtml pygtk
-			
-
-			
 			  pygtk
 			  x11-toolkits/py-gtk
 			  gnomelibs gdkpixbuf libglade

==== //depot/projects/docproj_nl/www/en/index.xsl#7 (text+ko) ====

@@ -4,7 +4,7 @@
 
 ]>
 
-
+
 
 
   
@@ -334,7 +334,7 @@
 			  

 			    	
    
 				  
  • 
-				    More
+				    More
 				  
    • 
 				  
  • 
 				    Errata Notices RSS Feed

==== //depot/projects/docproj_nl/www/en/releases/index.sgml#12 (text+ko) ====

@@ -1,10 +1,10 @@
 
-
+
 
 
 ]>
-
+
 
 
 &header;
@@ -250,7 +250,7 @@
 	
       
    • 
 
-      
  • 4.11 (Jan, 2005)
+      
  • 4.11 (January, 2005)
 	
 	  Announcement:
 	  Release Notes:

==== //depot/projects/docproj_nl/www/en/security/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/security/Makefile,v 1.17 2008/06/20 20:03:28 danger Exp $
+# $FreeBSD: www/en/security/Makefile,v 1.18 2011/01/04 20:14:36 jkois Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -11,21 +11,30 @@
 DOCS=	charter.sgml
 DOCS+=	security.sgml
 DOCS+=	advisories.sgml
+DOCS+=  notices.sgml
 
 advisories.sgml: advisories.html.inc
 
+notices.sgml: notices.html.inc
+
 INDEXLINK=	security.html
 
-security.html: advisories.html.inc advisories.rdf
-
 DEPENDSET.DEFAULT=	advisories
 DEPENDSET.errata-rss=	notices
+DEPENDSET.notices=	notices
 XML.DEFAULT=		${XML_ADVISORIES}
 
 XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
+PARAMS.advisories=	--param type "'advisory'"
 NO_DATA.advisories=	yes
 NO_TIDY.advisories=	yes
 
+XMLDOCS+=	notices:mkindex.xsl::notices.html.inc
+PARAMS.notices=		--param advisories.xml "'${XML_NOTICES}'"
+PARAMS.notices+=	--param type "'notice'"
+NO_DATA.notices=	yes
+NO_TIDY.notices=	yes
+
 XMLDOCS+=	advisories-rdf:security-rdf.xsl::advisories.rdf
 XMLDOCS+=	advisories-rss:security-rss.xsl::rss.xml
 XMLDOCS+=	errata-rss:errata-rss.xsl::errata.xml

==== //depot/projects/docproj_nl/www/en/security/mkindex.xsl#2 (text+ko) ====

@@ -5,7 +5,7 @@
 
 ]>
 
-
+
 
 
   
@@ -16,6 +16,7 @@
   
     
        
+       
     
   
 

==== //depot/projects/docproj_nl/www/en/security/security.sgml#16 (text+ko) ====

@@ -1,12 +1,11 @@
 
-
+
 
 
  %developers;
-
 ]>
-
+
 
 
   &header;
@@ -32,6 +31,7 @@
   
@@ -318,6 +318,126 @@
       href="http://security.FreeBSD.org/patches/">patches
     subdirectories.
    
 
+  
+  
    Unsupported FreeBSD Releases
    
+
+  
    The following releases are no longer supported but are listed
+    here for reference purposes.
    
+  
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+  
    BranchReleaseTypeRelease DateEoL
    RELENG_4n/an/an/aJanuary 31, 2007
    RELENG_4_114.11-RELEASEExtendedJanuary 25, 2005January 31, 2007
    RELENG_5n/an/an/aMay 31, 2008
    RELENG_5_35.3-RELEASEExtendedNovember 6, 2004October 31, 2006
    RELENG_5_45.4-RELEASENormalMay 9, 2005October 31, 2006
    RELENG_5_55.5-RELEASEExtendedMay 25, 2006May 31, 2008
    RELENG_6n/an/an/aNovember 30, 2010
    RELENG_6_06.0-RELEASENormalNovember 4, 2005January 31, 2007
    RELENG_6_16.1-RELEASEExtendedMay 9, 2006May 31, 2008
    RELENG_6_26.2-RELEASENormalJanuary 15, 2007May 31, 2008
    RELENG_6_36.3-RELEASEExtendedJanuary 18, 2008January 31, 2010
    RELENG_6_46.4-RELEASEExtendedNovember 28, 2008November 30, 2010
    RELENG_7_07.0-RELEASENormalFebruary 27, 2008April 30, 2009
    RELENG_7_27.2-RELEASENormalMay 4, 2009June 30, 2010
    RELENG_8_08.0-RELEASENormalNovember 25, 2009November 30, 2010
    
+
   &footer;
 
 

==== //depot/projects/docproj_nl/www/nl/where.sgml#25 (text+ko) ====

@@ -1,5 +1,5 @@
 
+
 
 
 

==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#21 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.61 2010/10/23 19:19:59 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.62 2011/01/04 19:05:02 jkois Exp $
     
   
 
@@ -190,6 +190,17 @@
     
   
 
+  
+    Midland Computers
+    http://www.midlandcomputers.com/
+    
+      Midland Computers is a UK based FreeBSD hosting provider.  We
+      offer hosting solutions ranging from shared hosting to
+      dedicated servers, all running FreeBSD and we run our own secure
+      data center.
+    
+  
+
   
     Hostpoint AG
     http://www.hostpoint.ch/

==== //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#9 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
-
+
 
 
         
           
+          
           
           
         
       
 
       
-	
-
-	  
-
-	  
-	    
-	    
-	    
-	  
-
-	  
-	    
-	  
-	
-
 	
-	  
+	  
+	  
 	  
 	  
 	
@@ -798,12 +782,13 @@
 
   
     
+    
     
     
 
     
       
-        
+        
           
           

==== //depot/projects/docproj_nl/www/share/sgml/navibar.ent#9 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 Security Information
     
     
  • Bug Reports
       
      

From owner-p4-projects@FreeBSD.ORG  Sat Jan 15 12:50:59 2011
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DBEB110656A3; Sat, 15 Jan 2011 12:50:58 +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 A04991065697
	for ; Sat, 15 Jan 2011 12:50:58 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D8378FC1E
	for ; Sat, 15 Jan 2011 12:50:58 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0FCowWO022783
	for ; Sat, 15 Jan 2011 12:50:58 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0FCowKr022780
	for perforce@freebsd.org; Sat, 15 Jan 2011 12:50:58 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 15 Jan 2011 12:50:58 GMT
Message-Id: <201101151250.p0FCowKr022780@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 187838 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 15 Jan 2011 12:50:59 -0000

http://p4web.freebsd.org/@@187838?ac=10

Change 187838 by trasz@trasz_victim on 2011/01/15 12:50:18

	Use FEATURE().

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#52 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#8 edit
.. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#7 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#52 (text+ko) ====

@@ -62,6 +62,8 @@
 
 #ifdef CONTAINERS
 
+FEATURE(containers, "Resource Containers");
+
 static struct mtx container_lock;
 MTX_SYSINIT(container_lock, &container_lock, "container lock", MTX_DEF);
 

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#8 (text+ko) ====

@@ -63,13 +63,15 @@
 #error "The RCTL option requires the CONTAINERS option"
 #endif
 
+FEATURE(rctl, "Resource Limits");
+
 #define	HRF_DEFAULT		0
 #define	HRF_DONT_INHERIT	1
 #define	HRF_DONT_ACCUMULATE	2
 
 /* Default buffer size for rctl_get_rules(2). */
 #define	RCTL_DEFAULT_BUFSIZE	4096
-#define	RCTL_LOG_BUFSIZE		128
+#define	RCTL_LOG_BUFSIZE	128
 
 /*
  * 'rctl_rule_link' connects a rule with every container it's related to.

==== //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#7 (text+ko) ====

@@ -49,6 +49,12 @@
 [  "$wait" ">" 0 ] || wait="0"
 [  "$count" ">" 0 ] || count="0"
 
+sysctl kern.features.rctl > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+	echo "no RCTL support in the kernel" 2>&1
+	exit 1
+fi
+
 n=0
 while :; do
 	if [ "`basename $0`" = "jailstat" ]; then


    • DateAdvisory name
    Date name