CVS commit: xsrc/external/mit/pixman/dist
Module Name:xsrc Committed By: wiz Date: Tue Sep 14 07:39:55 UTC 2010 Update of /cvsroot/xsrc/external/mit/pixman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11532 Log Message: Import pixman-0.18.4. Changes since 0.18.2: Post-release version bump to 0.18.3 Fix memory leak in the pthreads thread local storage code When storing a g1 pixel, store the lowest bit, rather than comparing with If we bail out of do_composite, make sure to undo any workarounds. Check for read accessors before taking the bilinear fast path Pre-release version bump to 0.18.4 Status: Vendor Tag: xorg Release Tags: pixman-0-18-4 U xsrc/external/mit/pixman/dist/install-sh U xsrc/external/mit/pixman/dist/config.h.in U xsrc/external/mit/pixman/dist/configure.ac U xsrc/external/mit/pixman/dist/pixman-1.pc.in U xsrc/external/mit/pixman/dist/missing U xsrc/external/mit/pixman/dist/ChangeLog U xsrc/external/mit/pixman/dist/AUTHORS U xsrc/external/mit/pixman/dist/configure U xsrc/external/mit/pixman/dist/NEWS U xsrc/external/mit/pixman/dist/aclocal.m4 U xsrc/external/mit/pixman/dist/config.guess U xsrc/external/mit/pixman/dist/TODO U xsrc/external/mit/pixman/dist/COPYING U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in U xsrc/external/mit/pixman/dist/Makefile.am U xsrc/external/mit/pixman/dist/README U xsrc/external/mit/pixman/dist/Makefile.in U xsrc/external/mit/pixman/dist/ltmain.sh U xsrc/external/mit/pixman/dist/depcomp U xsrc/external/mit/pixman/dist/config.sub U xsrc/external/mit/pixman/dist/INSTALL U xsrc/external/mit/pixman/dist/pixman/pixman-region.c U xsrc/external/mit/pixman/dist/pixman/pixman-compiler.h U xsrc/external/mit/pixman/dist/pixman/pixman.h U xsrc/external/mit/pixman/dist/pixman/pixman-version.h.in U xsrc/external/mit/pixman/dist/pixman/pixman-general.c U xsrc/external/mit/pixman/dist/pixman/Makefile.win32 U xsrc/external/mit/pixman/dist/pixman/pixman-utils.c U xsrc/external/mit/pixman/dist/pixman/pixman-access-accessors.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-common.h U xsrc/external/mit/pixman/dist/pixman/pixman.c U xsrc/external/mit/pixman/dist/pixman/pixman-image.c U xsrc/external/mit/pixman/dist/pixman/pixman-region16.c U xsrc/external/mit/pixman/dist/pixman/pixman-access.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine.c.template U xsrc/external/mit/pixman/dist/pixman/pixman-x64-mmx-emulation.h U xsrc/external/mit/pixman/dist/pixman/pixman-combine64.c U xsrc/external/mit/pixman/dist/pixman/pixman-edge-accessors.c U xsrc/external/mit/pixman/dist/pixman/pixman-region32.c U xsrc/external/mit/pixman/dist/pixman/pixman-linear-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-solid-fill.c U xsrc/external/mit/pixman/dist/pixman/solaris-hwcap.mapfile U xsrc/external/mit/pixman/dist/pixman/pixman-combine64.h U xsrc/external/mit/pixman/dist/pixman/pixman-implementation.c U xsrc/external/mit/pixman/dist/pixman/pixman-private.h U xsrc/external/mit/pixman/dist/pixman/pixman-edge-imp.h U xsrc/external/mit/pixman/dist/pixman/pixman-radial-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon.c U xsrc/external/mit/pixman/dist/pixman/pixman-gradient-walker.c U xsrc/external/mit/pixman/dist/pixman/pixman-edge.c U xsrc/external/mit/pixman/dist/pixman/make-combine.pl U xsrc/external/mit/pixman/dist/pixman/pixman-sse2.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd.c U xsrc/external/mit/pixman/dist/pixman/pixman-trap.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine.h.template U xsrc/external/mit/pixman/dist/pixman/pixman-vmx.c U xsrc/external/mit/pixman/dist/pixman/pixman-mmx.c U xsrc/external/mit/pixman/dist/pixman/pixman-cpu.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine32.h U xsrc/external/mit/pixman/dist/pixman/pixman-combine32.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon-asm.h U xsrc/external/mit/pixman/dist/pixman/pixman-timer.c U xsrc/external/mit/pixman/dist/pixman/pixman-fast-path.c U xsrc/external/mit/pixman/dist/pixman/pixman-accessor.h U xsrc/external/mit/pixman/dist/pixman/Makefile.am U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon-asm.S U xsrc/external/mit/pixman/dist/pixman/Makefile.in U xsrc/external/mit/pixman/dist/pixman/pixman-version.h U xsrc/external/mit/pixman/dist/pixman/pixman-conical-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd-asm.S U xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c U xsrc/external/mit/pixman/dist/pixman/pixman-matrix.c U xsrc/external/mit/pixman/dist/test/gradient-test.c U xsrc/external/mit/pixman/dist/test/scaling-test.c U xsrc/external/mit/pixman/dist/test/composite.c U xsrc/external/mit/pixman/dist/test/trap-crasher.c U xsrc/external/mit/pixman/dist/test/alpha-test.c U xsrc/external/mit/pixman/dist/test/alphamap.c U xsrc/external/mit/pixman/dist/test/gtk-utils.h U xsrc/external/mit/pixman/dist/test/window-test.c U xsrc/external/mit/pixman/dist/test/utils.h U xsrc/external/mit/pixman/dist/test/region-test.c U
CVS commit: xsrc/external/mit/pixman/include
Module Name:xsrc Committed By: wiz Date: Tue Sep 14 07:44:47 UTC 2010 Modified Files: xsrc/external/mit/pixman/include: config.h Log Message: Update for 0.18.4. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/pixman/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/pixman/include/config.h diff -u xsrc/external/mit/pixman/include/config.h:1.9 xsrc/external/mit/pixman/include/config.h:1.10 --- xsrc/external/mit/pixman/include/config.h:1.9 Sun May 23 03:58:34 2010 +++ xsrc/external/mit/pixman/include/config.h Tue Sep 14 07:44:47 2010 @@ -57,7 +57,7 @@ #define PACKAGE_NAME pixman /* Define to the full name and version of this package. */ -#define PACKAGE_STRING pixman 0.18.2 +#define PACKAGE_STRING pixman 0.18.4 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME pixman @@ -66,7 +66,7 @@ #define PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 0.18.2 +#define PACKAGE_VERSION 0.18.4 /* enable TIMER_BEGIN/TIMER_END macros */ /* #undef PIXMAN_TIMERS */ @@ -103,7 +103,7 @@ /* #undef USE_VMX */ /* Version number of package */ -#define VERSION 0.18.2 +#define VERSION 0.18.4 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: kim Date: Tue Sep 14 11:04:57 UTC 2010 Modified Files: src/usr.sbin/npf/npfctl: npfctl.8 Log Message: Fix remaining references for npf.conf(8) to npf.conf(5) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/npfctl/npfctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/npf/npfctl/npfctl.8 diff -u src/usr.sbin/npf/npfctl/npfctl.8:1.2 src/usr.sbin/npf/npfctl/npfctl.8:1.3 --- src/usr.sbin/npf/npfctl/npfctl.8:1.2 Tue Aug 24 23:55:05 2010 +++ src/usr.sbin/npf/npfctl/npfctl.8 Tue Sep 14 11:04:57 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: npfctl.8,v 1.2 2010/08/24 23:55:05 rmind Exp $ +.\ $NetBSD: npfctl.8,v 1.3 2010/09/14 11:04:57 kim Exp $ .\ .\ Copyright (c) 2009-2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -43,7 +43,7 @@ .Nm command can be used to control the NPF packet filter. For a description of NPF's configuration file, see -.Xr npf.conf 8 . +.Xr npf.conf 5 . .Pp The first argument, .Ar command , @@ -91,7 +91,7 @@ Therefore, frequent reloads should be avoided. Use of tables should be considered as an alternative design. See -.Xr npf.conf 8 +.Xr npf.conf 5 for details. .\ - .Sh FILES
CVS commit: src/usr.bin/make
Module Name:src Committed By: wiz Date: Tue Sep 14 11:57:03 UTC 2010 Modified Files: src/usr.bin/make: make.1 Log Message: Remove trailing spaces, add a few serial commas. To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.181 src/usr.bin/make/make.1:1.182 --- src/usr.bin/make/make.1:1.181 Mon Sep 13 16:32:00 2010 +++ src/usr.bin/make/make.1 Tue Sep 14 11:57:03 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: make.1,v 1.181 2010/09/13 16:32:00 sjg Exp $ +.\ $NetBSD: make.1,v 1.182 2010/09/14 11:57:03 wiz Exp $ .\ .\ Copyright (c) 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -766,15 +766,15 @@ It can contain a number of keywords: .Bl -hang -width ignore-cmd .It Pa compat -Like +Like .Fl B -puts +puts .Nm into compat mode. .It Pa meta Puts .Nm -into meta mode, where meta files are created for each target +into meta mode, where meta files are created for each target to capture the command run, the output generated and if .Xr filemon 4 is available, the system calls which are of interest to @@ -787,7 +787,7 @@ .Va .MAKE.META.PREFIX . .It Pa ignore-cmd Some makefiles have commands which are simply not stable. -This keyword causes them to be ignored for +This keyword causes them to be ignored for determining whether a target is out of date in meta mode. See also .Ic .NOMETA_CMP . @@ -800,7 +800,7 @@ .It Va .MAKE.META.FILES In meta mode, this variable contains a list of all the meta files used (updated or not). -This list can be used to process the meta files to extract dependency +This list can be used to process the meta files to extract dependency information. .It Va .MAKE.META.PREFIX Defines the message printed for each meta file updated in meta verbose mode. @@ -1659,7 +1659,7 @@ .It Ic .META Create a meta file for the target, even if it is flagged as .Ic .PHONY , -.Ic .MAKE +.Ic .MAKE , or .Ic .SPECIAL . Usage in conjunction with @@ -1669,14 +1669,14 @@ Do not create a meta file for the target. Meta files are also not created for .Ic .PHONY , -.Ic .MAKE +.Ic .MAKE , or .Ic .SPECIAL targets. .It Ic .NOMETA_CMP Ignore differences in commands when deciding if target is out of date. This is useful if the command contains a value which always changes. -If the number of commands change, though the target will still be out of date. +If the number of commands change, though, the target will still be out of date. .It Ic .NOPATH Do not search for the target in the directories specified by .Ic .PATH .
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Tue Sep 14 18:28:18 UTC 2010
Modified Files:
src/sys/dev/sbus: cgthree_sbus.c
Log Message:
always make sure we can access the framebuffer - having more than one wsdisplay
is perfectly reasonable these days
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sbus/cgthree_sbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sbus/cgthree_sbus.c
diff -u src/sys/dev/sbus/cgthree_sbus.c:1.29 src/sys/dev/sbus/cgthree_sbus.c:1.30
--- src/sys/dev/sbus/cgthree_sbus.c:1.29 Fri Sep 18 16:43:19 2009
+++ src/sys/dev/sbus/cgthree_sbus.c Tue Sep 14 18:28:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree_sbus.c,v 1.29 2009/09/18 16:43:19 tsutsui Exp $ */
+/* $NetBSD: cgthree_sbus.c,v 1.30 2010/09/14 18:28:18 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgthree_sbus.c,v 1.29 2009/09/18 16:43:19 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgthree_sbus.c,v 1.30 2010/09/14 18:28:18 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -155,8 +155,7 @@
/*
* When the ROM has mapped in a cgthree display, the address
* maps only the video RAM, so in any case we have to map the
- * registers ourselves. We only need the video RAM if we are
- * going to print characters via rconsole.
+ * registers ourselves.
*/
if (sbus_bus_map(sa-sa_bustag,
sa-sa_slot,
@@ -175,7 +174,7 @@
if (sa-sa_npromvaddrs != 0)
fb-fb_pixels = (void *)(u_long)sa-sa_promvaddrs[0];
- if (isconsole fb-fb_pixels == NULL) {
+ if (fb-fb_pixels == NULL) {
int ramsize = fb-fb_type.fb_height * fb-fb_linebytes;
if (sbus_bus_map(sa-sa_bustag,
sa-sa_slot,
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: macallan
Date: Tue Sep 14 18:42:12 UTC 2010
Modified Files:
src/sys/dev/sun: cgsix.c
Log Message:
don't muck with the screen description if we're not the console, for some
reason this leads to a NULL jump later on, at least on sparc64
should fix PR43873
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/sun/cgsix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sun/cgsix.c
diff -u src/sys/dev/sun/cgsix.c:1.47 src/sys/dev/sun/cgsix.c:1.48
--- src/sys/dev/sun/cgsix.c:1.47 Tue May 4 05:11:06 2010
+++ src/sys/dev/sun/cgsix.c Tue Sep 14 18:42:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.47 2010/05/04 05:11:06 macallan Exp $ */
+/* $NetBSD: cgsix.c,v 1.48 2010/09/14 18:42:12 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.47 2010/05/04 05:11:06 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.48 2010/09/14 18:42:12 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -637,20 +637,6 @@
* we're not the console so we just clear the screen and don't
* set up any sort of text display
*/
- if (cgsix_defaultscreen.textops == NULL) {
- /*
- * ugly, but...
- * we want the console settings to win, so we only
- * touch anything when we find an untouched screen
- * definition. In this case we fill it from fb to
- * avoid problems in case no cgsix is the console
- */
- ri = sc-sc_fb.fb_rinfo;
- cgsix_defaultscreen.textops = ri-ri_ops;
- cgsix_defaultscreen.capabilities = ri-ri_caps;
- cgsix_defaultscreen.nrows = ri-ri_rows;
- cgsix_defaultscreen.ncols = ri-ri_cols;
- }
}
aa.scrdata = cgsix_screenlist;
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: macallan
Date: Tue Sep 14 18:43:41 UTC 2010
Modified Files:
src/sys/dev/sun: cgthree.c
Log Message:
leave the screen description alone when we're not the console in order to
avoid a NULL deref later on ( which only happens on sparc64 for some reason )
While there, use VCONS_DONT_READ
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/sun/cgthree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sun/cgthree.c
diff -u src/sys/dev/sun/cgthree.c:1.26 src/sys/dev/sun/cgthree.c:1.27
--- src/sys/dev/sun/cgthree.c:1.26 Wed Nov 25 21:10:56 2009
+++ src/sys/dev/sun/cgthree.c Tue Sep 14 18:43:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree.c,v 1.26 2009/11/25 21:10:56 macallan Exp $ */
+/* $NetBSD: cgthree.c,v 1.27 2010/09/14 18:43:41 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgthree.c,v 1.26 2009/11/25 21:10:56 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgthree.c,v 1.27 2010/09/14 18:43:41 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -234,20 +234,6 @@
* we're not the console so we just clear the screen and don't
* set up any sort of text display
*/
- if (cgthree_defaultscreen.textops == NULL) {
- /*
- * ugly, but...
- * we want the console settings to win, so we only
- * touch anything when we find an untouched screen
- * definition. In this case we fill it from fb to
- * avoid problems in case no cgthree is the console
- */
- ri = sc-sc_fb.fb_rinfo;
- cgthree_defaultscreen.textops = ri-ri_ops;
- cgthree_defaultscreen.capabilities = ri-ri_caps;
- cgthree_defaultscreen.nrows = ri-ri_rows;
- cgthree_defaultscreen.ncols = ri-ri_cols;
- }
}
/* Initialize the default color map. */
@@ -558,6 +544,8 @@
struct cgthree_softc *sc = cookie;
struct rasops_info *ri = scr-scr_ri;
+ scr-scr_flags |= VCONS_DONT_READ;
+
ri-ri_depth = 8;
ri-ri_width = sc-sc_width;
ri-ri_height = sc-sc_height;
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: macallan
Date: Tue Sep 14 19:36:14 UTC 2010
Modified Files:
src/sys/dev/sun: cgthree.c
Log Message:
clear the screen when attaching, not when adding screens since that may
happen much later
while there, call vcons_replay_msgbuf()
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/sun/cgthree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sun/cgthree.c
diff -u src/sys/dev/sun/cgthree.c:1.27 src/sys/dev/sun/cgthree.c:1.28
--- src/sys/dev/sun/cgthree.c:1.27 Tue Sep 14 18:43:41 2010
+++ src/sys/dev/sun/cgthree.c Tue Sep 14 19:36:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree.c,v 1.27 2010/09/14 18:43:41 macallan Exp $ */
+/* $NetBSD: cgthree.c,v 1.28 2010/09/14 19:36:13 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgthree.c,v 1.27 2010/09/14 18:43:41 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgthree.c,v 1.28 2010/09/14 19:36:13 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -221,6 +221,8 @@
/* we mess with cg3_console_screen only once */
vcons_init_screen(sc-vd, cg3_console_screen, 1,
defattr);
+ memset(sc-sc_fb.fb_pixels, (defattr 16) 0xff,
+ sc-sc_stride * sc-sc_height);
cg3_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
cgthree_defaultscreen.textops = ri-ri_ops;
@@ -229,6 +231,7 @@
cgthree_defaultscreen.ncols = ri-ri_cols;
sc-vd.active = cg3_console_screen;
wsdisplay_cnattach(cgthree_defaultscreen, ri, 0, 0, defattr);
+ vcons_replay_msgbuf(cg3_console_screen);
} else {
/*
* we're not the console so we just clear the screen and don't
@@ -554,8 +557,6 @@
ri-ri_bits = sc-sc_fb.fb_pixels;
- memset(sc-sc_fb.fb_pixels, (*defattr 16) 0xff,
- sc-sc_stride * sc-sc_height);
rasops_init(ri, sc-sc_height/8, sc-sc_width/8);
ri-ri_caps = WSSCREEN_WSCOLORS | WSSCREEN_REVERSE;
rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight,
CVS commit: src/sys/arch/i386/include
Module Name:src Committed By: jym Date: Tue Sep 14 21:34:03 UTC 2010 Modified Files: src/sys/arch/i386/include: pte.h Log Message: Add ULL suffix to PG_NX when it is defined. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/include/pte.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/include/pte.h diff -u src/sys/arch/i386/include/pte.h:1.24 src/sys/arch/i386/include/pte.h:1.25 --- src/sys/arch/i386/include/pte.h:1.24 Tue Jul 6 20:50:34 2010 +++ src/sys/arch/i386/include/pte.h Tue Sep 14 21:34:02 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.24 2010/07/06 20:50:34 cegger Exp $ */ +/* $NetBSD: pte.h,v 1.25 2010/09/14 21:34:02 jym Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -267,7 +267,7 @@ #define PG_KW 0x0002 /* kernel read-write */ #ifdef PAE -#define PG_NX 0x8000 /* No-execute */ +#define PG_NX 0x8000ULL /* No-execute */ #else #define PG_NX 0 /* dummy */ #endif
CVS commit: src/share/man/man9
Module Name:src Committed By: ahoka Date: Tue Sep 14 21:35:53 UTC 2010 Modified Files: src/share/man/man9: mutex.9 Log Message: add a note on IPL and spinning mutexes TODO: explain when the IPL will be restored To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man9/mutex.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/mutex.9 diff -u src/share/man/man9/mutex.9:1.22 src/share/man/man9/mutex.9:1.23 --- src/share/man/man9/mutex.9:1.22 Tue Feb 16 19:21:30 2010 +++ src/share/man/man9/mutex.9 Tue Sep 14 21:35:53 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: mutex.9,v 1.22 2010/02/16 19:21:30 rmind Exp $ +.\ $NetBSD: mutex.9,v 1.23 2010/09/14 21:35:53 ahoka Exp $ .\ .\ Copyright (c) 2007, 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd February 16, 2010 +.Dd September 14, 2010 .Dt MUTEX 9 .Os .Sh NAME @@ -162,6 +162,11 @@ .Pp Adaptive mutexes and other types of lock that can sleep may not be acquired while a spin mutex is held by the caller. +.Pp +When acquiring a spin mutex, the IPL of the current CPU will be raised to +the level set in +.Fn mutex_init +if it is not already equal or higher. .It Fn mutex_exit mtx .Pp Release a mutex.
CVS commit: xsrc/external/mit/xterm/include
Module Name:xsrc Committed By: wiz Date: Tue Sep 14 23:07:17 UTC 2010 Modified Files: xsrc/external/mit/xterm/include: xtermcfg.h Log Message: Revert part of previous: OPT_WIDE_CHARS definitely makes a difference with a UTF8 locale. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xterm/include/xtermcfg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xterm/include/xtermcfg.h diff -u xsrc/external/mit/xterm/include/xtermcfg.h:1.2 xsrc/external/mit/xterm/include/xtermcfg.h:1.3 --- xsrc/external/mit/xterm/include/xtermcfg.h:1.2 Sat Sep 11 22:26:46 2010 +++ xsrc/external/mit/xterm/include/xtermcfg.h Tue Sep 14 23:07:17 2010 @@ -136,6 +136,7 @@ /* #undef OPT_VT52_MODE */ /* CF_ARG_DISABLE(vt52) */ /* #undef OPT_WIDER_ICHAR */ /* CF_ARG_ENABLE(16bit-chars) */ /* #undef OPT_WIDE_CHARS */ /* CF_ARG_OPTION(wide-chars) */ +#define OPT_WIDE_CHARS 1 /* CF_ARG_OPTION(wide-chars) */ /* #undef OPT_XMC_GLITCH */ /* CF_ARG_ENABLE(xmc-glitch) */ /* #undef OPT_ZICONBEEP */ /* CF_ARG_DISABLE(ziconbeep) */ /* #undef OWN_TERMINFO_DIR */ /* AC_ARG_WITH(own-terminfo) */
CVS commit: src
Module Name:src
Committed By: manu
Date: Wed Sep 15 01:51:44 UTC 2010
Modified Files:
src/lib/libperfuse: debug.c fuse.h ops.c perfuse.c perfuse_if.h
perfuse_priv.h
src/usr.sbin/perfused: debug.c msg.c perfused.c perfused.h
Log Message:
- Use SOCK_DGRAM instead of SOCK_STREAM, as the filesystem seems to
assume datagram semantics: when using SOCK_STREAM, if perfused sends
frames faster than the filesystem consumes them, it will grab multiple
frames at once and discard anything beyond the first one. For now the
code can work both with SOCK_DGRAM and SOCK_STREAM, but SOCK_STREAM
support will probably have to be removed for the sake of readability.
- Remeber to sync parent directories when moving a node
- In debug output, display the requeue type (readdir, write, etc...)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libperfuse/debug.c src/lib/libperfuse/fuse.h
cvs rdiff -u -r1.14 -r1.15 src/lib/libperfuse/ops.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libperfuse/perfuse.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libperfuse/perfuse_if.h
cvs rdiff -u -r1.9 -r1.10 src/lib/libperfuse/perfuse_priv.h
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/perfused/debug.c \
src/usr.sbin/perfused/perfused.h
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/perfused/msg.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/perfused/perfused.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/debug.c
diff -u src/lib/libperfuse/debug.c:1.1 src/lib/libperfuse/debug.c:1.2
--- src/lib/libperfuse/debug.c:1.1 Wed Aug 25 07:16:00 2010
+++ src/lib/libperfuse/debug.c Wed Sep 15 01:51:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.c,v 1.1 2010/08/25 07:16:00 manu Exp $ */
+/* $NetBSD: debug.c,v 1.2 2010/09/15 01:51:43 manu Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -79,6 +79,8 @@
{ 0, UNKNOWN },
};
+const char *perfuse_qtypestr[] = { READDIR, READ, WRITE, AFTERWRITE };
+
const char *
perfuse_opname(opcode)
int opcode;
Index: src/lib/libperfuse/fuse.h
diff -u src/lib/libperfuse/fuse.h:1.1 src/lib/libperfuse/fuse.h:1.2
--- src/lib/libperfuse/fuse.h:1.1 Wed Aug 25 07:16:00 2010
+++ src/lib/libperfuse/fuse.h Wed Sep 15 01:51:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fuse.h,v 1.1 2010/08/25 07:16:00 manu Exp $ */
+/* $NetBSD: fuse.h,v 1.2 2010/09/15 01:51:43 manu Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -33,9 +33,11 @@
#define FUSE_ROOT_ID 1
#define FUSE_UNKNOWN_FH (uint64_t)0
+#ifndef FUSE_BUFSIZE
#define FUSE_MIN_BUFSIZE 0x21000
#define FUSE_PREF_BUFSIZE (PAGE_SIZE + 0x1000)
-#define FUSE_BUFSIZE MAX(FUSE_PREF_BUFSIZE, FUSE_MIN_BUFSIZE)
+#define FUSE_BUFSIZE MAX(FUSE_PREF_BUFSIZE /* CONSTCOND */, FUSE_MIN_BUFSIZE)
+#endif /* FUSE_BUFSIZE */
struct fuse_attr {
uint64_t ino;
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.14 src/lib/libperfuse/ops.c:1.15
--- src/lib/libperfuse/ops.c:1.14 Thu Sep 9 09:12:35 2010
+++ src/lib/libperfuse/ops.c Wed Sep 15 01:51:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.14 2010/09/09 09:12:35 manu Exp $ */
+/* $NetBSD: ops.c,v 1.15 2010/09/15 01:51:43 manu Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -613,10 +613,10 @@
TAILQ_INSERT_TAIL(pnd-pnd_pcq, pcq, pcq_next);
#ifdef PERFUSE_DEBUG
-
if (perfuse_diagflags PDF_REQUEUE)
- DPRINTF(%s: REQUEUE opc = %p, pcc = %p\n,
- __func__, (void *)opc, pcq.pcq_cc);
+ DPRINTF(%s: REQUEUE opc = %p, pcc = %p (%s)\n,
+ __func__, (void *)opc, pcq.pcq_cc,
+ perfuse_qtypestr[type]);
#endif
puffs_cc_yield(pcq.pcq_cc);
@@ -624,8 +624,9 @@
#ifdef PERFUSE_DEBUG
if (perfuse_diagflags PDF_REQUEUE)
- DPRINTF(%s: RESUME opc = %p, pcc = %p\n,
- __func__, (void *)opc, pcq.pcq_cc);
+ DPRINTF(%s: RESUME opc = %p, pcc = %p (%s)\n,
+ __func__, (void *)opc, pcq.pcq_cc,
+ perfuse_qtypestr[type]);
#endif
return;
@@ -654,8 +655,9 @@
#ifdef PERFUSE_DEBUG
if (perfuse_diagflags PDF_REQUEUE)
- DPRINTF(%s: SCHEDULE opc = %p, pcc = %p\n,
-__func__, (void *)opc, pcq-pcq_cc);
+ DPRINTF(%s: SCHEDULE opc = %p, pcc = %p (%s)\n,
+__func__, (void *)opc, pcq-pcq_cc,
+ perfuse_qtypestr[type]);
#endif
puffs_cc_schedule(pcq-pcq_cc);
@@ -1812,11 +1814,15 @@
/*
* Update source and destination directories child count
* Update moved object parent directory
+ * Set dirty flag for source and parent
*/
PERFUSE_NODE_DATA(opc)-pnd_childcount--;
PERFUSE_NODE_DATA(targ_dir)-pnd_childcount++;
+
PERFUSE_NODE_DATA(src)-pnd_parent = targ_dir;
+ PERFUSE_NODE_DATA(opc)-pnd_flags |= PND_DIRTY;
+ PERFUSE_NODE_DATA(targ_dir)-pnd_flags |= PND_DIRTY;
out:
ps-ps_destroy_msg(pm);
@@ -2219,13 +2225,14 @@
#ifdef PERFUSE_DEBUG
if (perfuse_diagflags PDF_RECLAIM)
DPRINTF(%s (nodeid %PRId64) is %sreclaimed,
- has childcount %d
CVS commit: xsrc/external/mit/pixman/dist
Module Name:xsrc Committed By: wiz Date: Tue Sep 14 07:39:55 UTC 2010 Update of /cvsroot/xsrc/external/mit/pixman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11532 Log Message: Import pixman-0.18.4. Changes since 0.18.2: Post-release version bump to 0.18.3 Fix memory leak in the pthreads thread local storage code When storing a g1 pixel, store the lowest bit, rather than comparing with If we bail out of do_composite, make sure to undo any workarounds. Check for read accessors before taking the bilinear fast path Pre-release version bump to 0.18.4 Status: Vendor Tag: xorg Release Tags: pixman-0-18-4 U xsrc/external/mit/pixman/dist/install-sh U xsrc/external/mit/pixman/dist/config.h.in U xsrc/external/mit/pixman/dist/configure.ac U xsrc/external/mit/pixman/dist/pixman-1.pc.in U xsrc/external/mit/pixman/dist/missing U xsrc/external/mit/pixman/dist/ChangeLog U xsrc/external/mit/pixman/dist/AUTHORS U xsrc/external/mit/pixman/dist/configure U xsrc/external/mit/pixman/dist/NEWS U xsrc/external/mit/pixman/dist/aclocal.m4 U xsrc/external/mit/pixman/dist/config.guess U xsrc/external/mit/pixman/dist/TODO U xsrc/external/mit/pixman/dist/COPYING U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in U xsrc/external/mit/pixman/dist/Makefile.am U xsrc/external/mit/pixman/dist/README U xsrc/external/mit/pixman/dist/Makefile.in U xsrc/external/mit/pixman/dist/ltmain.sh U xsrc/external/mit/pixman/dist/depcomp U xsrc/external/mit/pixman/dist/config.sub U xsrc/external/mit/pixman/dist/INSTALL U xsrc/external/mit/pixman/dist/pixman/pixman-region.c U xsrc/external/mit/pixman/dist/pixman/pixman-compiler.h U xsrc/external/mit/pixman/dist/pixman/pixman.h U xsrc/external/mit/pixman/dist/pixman/pixman-version.h.in U xsrc/external/mit/pixman/dist/pixman/pixman-general.c U xsrc/external/mit/pixman/dist/pixman/Makefile.win32 U xsrc/external/mit/pixman/dist/pixman/pixman-utils.c U xsrc/external/mit/pixman/dist/pixman/pixman-access-accessors.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-common.h U xsrc/external/mit/pixman/dist/pixman/pixman.c U xsrc/external/mit/pixman/dist/pixman/pixman-image.c U xsrc/external/mit/pixman/dist/pixman/pixman-region16.c U xsrc/external/mit/pixman/dist/pixman/pixman-access.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine.c.template U xsrc/external/mit/pixman/dist/pixman/pixman-x64-mmx-emulation.h U xsrc/external/mit/pixman/dist/pixman/pixman-combine64.c U xsrc/external/mit/pixman/dist/pixman/pixman-edge-accessors.c U xsrc/external/mit/pixman/dist/pixman/pixman-region32.c U xsrc/external/mit/pixman/dist/pixman/pixman-linear-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-solid-fill.c U xsrc/external/mit/pixman/dist/pixman/solaris-hwcap.mapfile U xsrc/external/mit/pixman/dist/pixman/pixman-combine64.h U xsrc/external/mit/pixman/dist/pixman/pixman-implementation.c U xsrc/external/mit/pixman/dist/pixman/pixman-private.h U xsrc/external/mit/pixman/dist/pixman/pixman-edge-imp.h U xsrc/external/mit/pixman/dist/pixman/pixman-radial-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon.c U xsrc/external/mit/pixman/dist/pixman/pixman-gradient-walker.c U xsrc/external/mit/pixman/dist/pixman/pixman-edge.c U xsrc/external/mit/pixman/dist/pixman/make-combine.pl U xsrc/external/mit/pixman/dist/pixman/pixman-sse2.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd.c U xsrc/external/mit/pixman/dist/pixman/pixman-trap.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine.h.template U xsrc/external/mit/pixman/dist/pixman/pixman-vmx.c U xsrc/external/mit/pixman/dist/pixman/pixman-mmx.c U xsrc/external/mit/pixman/dist/pixman/pixman-cpu.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine32.h U xsrc/external/mit/pixman/dist/pixman/pixman-combine32.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon-asm.h U xsrc/external/mit/pixman/dist/pixman/pixman-timer.c U xsrc/external/mit/pixman/dist/pixman/pixman-fast-path.c U xsrc/external/mit/pixman/dist/pixman/pixman-accessor.h U xsrc/external/mit/pixman/dist/pixman/Makefile.am U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon-asm.S U xsrc/external/mit/pixman/dist/pixman/Makefile.in U xsrc/external/mit/pixman/dist/pixman/pixman-version.h U xsrc/external/mit/pixman/dist/pixman/pixman-conical-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd-asm.S U xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c U xsrc/external/mit/pixman/dist/pixman/pixman-matrix.c U xsrc/external/mit/pixman/dist/test/gradient-test.c U xsrc/external/mit/pixman/dist/test/scaling-test.c U xsrc/external/mit/pixman/dist/test/composite.c U xsrc/external/mit/pixman/dist/test/trap-crasher.c U xsrc/external/mit/pixman/dist/test/alpha-test.c U xsrc/external/mit/pixman/dist/test/alphamap.c U xsrc/external/mit/pixman/dist/test/gtk-utils.h U xsrc/external/mit/pixman/dist/test/window-test.c U xsrc/external/mit/pixman/dist/test/utils.h U xsrc/external/mit/pixman/dist/test/region-test.c U
CVS commit: xsrc/external/mit/pixman/include
Module Name:xsrc Committed By: wiz Date: Tue Sep 14 07:44:47 UTC 2010 Modified Files: xsrc/external/mit/pixman/include: config.h Log Message: Update for 0.18.4. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/pixman/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: kim Date: Tue Sep 14 11:04:57 UTC 2010 Modified Files: src/usr.sbin/npf/npfctl: npfctl.8 Log Message: Fix remaining references for npf.conf(8) to npf.conf(5) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/npfctl/npfctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sbus
Module Name:src Committed By: macallan Date: Tue Sep 14 18:28:18 UTC 2010 Modified Files: src/sys/dev/sbus: cgthree_sbus.c Log Message: always make sure we can access the framebuffer - having more than one wsdisplay is perfectly reasonable these days To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sbus/cgthree_sbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sun
Module Name:src Committed By: macallan Date: Tue Sep 14 19:36:14 UTC 2010 Modified Files: src/sys/dev/sun: cgthree.c Log Message: clear the screen when attaching, not when adding screens since that may happen much later while there, call vcons_replay_msgbuf() To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/sun/cgthree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/include
Module Name:src Committed By: jym Date: Tue Sep 14 21:34:03 UTC 2010 Modified Files: src/sys/arch/i386/include: pte.h Log Message: Add ULL suffix to PG_NX when it is defined. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/include/pte.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: ahoka Date: Tue Sep 14 21:35:53 UTC 2010 Modified Files: src/share/man/man9: mutex.9 Log Message: add a note on IPL and spinning mutexes TODO: explain when the IPL will be restored To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man9/mutex.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xterm/include
Module Name:xsrc Committed By: wiz Date: Tue Sep 14 23:07:17 UTC 2010 Modified Files: xsrc/external/mit/xterm/include: xtermcfg.h Log Message: Revert part of previous: OPT_WIDE_CHARS definitely makes a difference with a UTF8 locale. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xterm/include/xtermcfg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: manu Date: Wed Sep 15 01:51:44 UTC 2010 Modified Files: src/lib/libperfuse: debug.c fuse.h ops.c perfuse.c perfuse_if.h perfuse_priv.h src/usr.sbin/perfused: debug.c msg.c perfused.c perfused.h Log Message: - Use SOCK_DGRAM instead of SOCK_STREAM, as the filesystem seems to assume datagram semantics: when using SOCK_STREAM, if perfused sends frames faster than the filesystem consumes them, it will grab multiple frames at once and discard anything beyond the first one. For now the code can work both with SOCK_DGRAM and SOCK_STREAM, but SOCK_STREAM support will probably have to be removed for the sake of readability. - Remeber to sync parent directories when moving a node - In debug output, display the requeue type (readdir, write, etc...) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libperfuse/debug.c src/lib/libperfuse/fuse.h cvs rdiff -u -r1.14 -r1.15 src/lib/libperfuse/ops.c cvs rdiff -u -r1.5 -r1.6 src/lib/libperfuse/perfuse.c cvs rdiff -u -r1.7 -r1.8 src/lib/libperfuse/perfuse_if.h cvs rdiff -u -r1.9 -r1.10 src/lib/libperfuse/perfuse_priv.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/perfused/debug.c \ src/usr.sbin/perfused/perfused.h cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/perfused/msg.c cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/perfused/perfused.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
