CVS commit: xsrc/external/mit/libpthread-stubs/include
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 07:10:53 UTC 2014 Added Files: xsrc/external/mit/libpthread-stubs/include: config.h Log Message: libpthread-stubs needs a config.h To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/libpthread-stubs/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/libpthread-stubs/include/config.h diff -u /dev/null xsrc/external/mit/libpthread-stubs/include/config.h:1.1 --- /dev/null Mon Mar 17 07:10:53 2014 +++ xsrc/external/mit/libpthread-stubs/include/config.h Mon Mar 17 07:10:53 2014 @@ -0,0 +1,92 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `pthread_cond_broadcast' function. */ +#define HAVE_PTHREAD_COND_BROADCAST 1 + +/* Define to 1 if you have the `pthread_cond_destroy' function. */ +#define HAVE_PTHREAD_COND_DESTROY 1 + +/* Define to 1 if you have the `pthread_cond_init' function. */ +#define HAVE_PTHREAD_COND_INIT 1 + +/* Define to 1 if you have the `pthread_cond_signal' function. */ +#define HAVE_PTHREAD_COND_SIGNAL 1 + +/* Define to 1 if you have the `pthread_cond_wait' function. */ +#define HAVE_PTHREAD_COND_WAIT 1 + +/* Define to 1 if you have the `pthread_equal' function. */ +#define HAVE_PTHREAD_EQUAL 1 + +/* Define to 1 if you have the `pthread_mutex_destroy' function. */ +#define HAVE_PTHREAD_MUTEX_DESTROY 1 + +/* Define to 1 if you have the `pthread_mutex_init' function. */ +#define HAVE_PTHREAD_MUTEX_INIT 1 + +/* Define to 1 if you have the `pthread_mutex_lock' function. */ +#define HAVE_PTHREAD_MUTEX_LOCK 1 + +/* Define to 1 if you have the `pthread_mutex_unlock' function. */ +#define HAVE_PTHREAD_MUTEX_UNLOCK 1 + +/* Define to 1 if you have the `pthread_self' function. */ +#define HAVE_PTHREAD_SELF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Name of package */ +#define PACKAGE "libpthread-stubs" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "x...@lists.freedesktop.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libpthread-stubs" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "libpthread-stubs 0.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libpthread-stubs" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.1" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define this if the compiler supports the alias attribute */ +#define SUPPORT_ATTRIBUTE_ALIAS 1 + +/* Version number of package */ +#define VERSION "0.1"
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Mon Mar 17 07:11:40 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
add libpthread-stubs.
To generate a diff of this commit:
cvs rdiff -u -r1.788 -r1.789 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.788 src/share/mk/bsd.own.mk:1.789
--- src/share/mk/bsd.own.mk:1.788 Sun Mar 16 23:07:42 2014
+++ src/share/mk/bsd.own.mk Mon Mar 17 07:11:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.788 2014/03/16 23:07:42 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.789 2014/03/17 07:11:40 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1200,7 +1200,8 @@ X11SRCDIRMIT?= ${X11SRCDIR}/external/mi
FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xpm \
Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
- fontenc xkbfile xkbui Xaw lbxutil Xfontcache pciaccess xcb
+ fontenc xkbfile xkbui Xaw lbxutil Xfontcache pciaccess xcb \
+ pthread-stubs
X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist
.endfor
CVS commit: src
Module Name:src Committed By: mrg Date: Mon Mar 17 07:25:35 UTC 2014 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xcomp: mi shl.mi src/distrib/sets/lists/xdebug: mi shl.mi src/external/mit/xorg/lib: Makefile src/external/mit/xorg/lib/libxcb: Makefile src/external/mit/xorg/lib/libxcb/files: Makefile Makefile.xmlsrcs composite.h config.h damage.h dpms.h dri2.c dri2.h glx.c glx.h randr.c randr.h record.c render.c render.h res.c res.h screensaver.c screensaver.h shape.c shape.h shm.c shm.h sync.c sync.h xc_misc.c xcb.h xcb_conn.c xcb_in.c xcb_list.c xcb_out.c xcb_util.c xcbext.h xcbint.h xevie.h xf86dri.c xfixes.c xfixes.h xinerama.c xinput.c xinput.h xkb.c xkb.h xprint.c xproto.c xproto.h xselinux.c xtest.h xv.c xv.h xvmc.c src/external/mit/xorg/lib/libxcb/sync: Makefile src/external/mit/xorg/lib/libxcb/xinput: Makefile Added Files: src/external/mit/xorg/lib/libpthread-stubs: Makefile src/external/mit/xorg/lib/libxcb/dri3: Makefile src/external/mit/xorg/lib/libxcb/files: dri3.c dri3.h present.c present.h src/external/mit/xorg/lib/libxcb/present: Makefile src/external/mit/xorg/lib/libxcb/xkb: Makefile Log Message: merge libxcb 1.10 and libpthread-stubs build. update the libxcb generated files. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.146 -r1.147 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xdebug/mi cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libpthread-stubs/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxcb/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxcb/dri3/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxcb/files/Makefile \ src/external/mit/xorg/lib/libxcb/files/xcb.h \ src/external/mit/xorg/lib/libxcb/files/xcb_conn.c \ src/external/mit/xorg/lib/libxcb/files/xcb_in.c \ src/external/mit/xorg/lib/libxcb/files/xcb_list.c \ src/external/mit/xorg/lib/libxcb/files/xcb_out.c \ src/external/mit/xorg/lib/libxcb/files/xcb_util.c \ src/external/mit/xorg/lib/libxcb/files/xcbext.h \ src/external/mit/xorg/lib/libxcb/files/xcbint.h \ src/external/mit/xorg/lib/libxcb/files/xkb.c \ src/external/mit/xorg/lib/libxcb/files/xkb.h \ src/external/mit/xorg/lib/libxcb/files/xprint.c cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs \ src/external/mit/xorg/lib/libxcb/files/composite.h \ src/external/mit/xorg/lib/libxcb/files/config.h \ src/external/mit/xorg/lib/libxcb/files/damage.h \ src/external/mit/xorg/lib/libxcb/files/dpms.h \ src/external/mit/xorg/lib/libxcb/files/dri2.c \ src/external/mit/xorg/lib/libxcb/files/dri2.h \ src/external/mit/xorg/lib/libxcb/files/glx.c \ src/external/mit/xorg/lib/libxcb/files/glx.h \ src/external/mit/xorg/lib/libxcb/files/randr.c \ src/external/mit/xorg/lib/libxcb/files/randr.h \ src/external/mit/xorg/lib/libxcb/files/record.c \ src/external/mit/xorg/lib/libxcb/files/render.c \ src/external/mit/xorg/lib/libxcb/files/render.h \ src/external/mit/xorg/lib/libxcb/files/res.c \ src/external/mit/xorg/lib/libxcb/files/res.h \ src/external/mit/xorg/lib/libxcb/files/screensaver.c \ src/external/mit/xorg/lib/libxcb/files/screensaver.h \ src/external/mit/xorg/lib/libxcb/files/shape.c \ src/external/mit/xorg/lib/libxcb/files/shape.h \ src/external/mit/xorg/lib/libxcb/files/shm.c \ src/external/mit/xorg/lib/libxcb/files/shm.h \ src/external/mit/xorg/lib/libxcb/files/sync.c \ src/external/mit/xorg/lib/libxcb/files/sync.h \ src/external/mit/xorg/lib/libxcb/files/xc_misc.c \ src/external/mit/xorg/lib/libxcb/files/xevie.h \ src/external/mit/xorg/lib/libxcb/files/xf86dri.c \ src/external/mit/xorg/lib/libxcb/files/xfixes.c \ src/external/mit/xorg/lib/libxcb/files/xfixes.h \ src/external/mit/xorg/lib/libxcb/files/xinerama.c \ src/external/mit/xorg/lib/libxcb/files/xinput.c \ src/external/mit/xorg/lib/libxcb/files/xinput.h \ src/external/mit/xorg/lib/libxcb/files/xproto.c \ src/external/mit/xorg/lib/libxcb/files/xproto.h \ src/external/mit/xorg/lib/libxcb/files/xselinux.c \ src/external/mit/xorg/lib/libxcb/files/xtest.h \ src/external/mit/xorg/lib/libxcb/files/xv.c \ src/external/mit/xorg/lib/libxcb/files/xv.h \ src/external/mit/xorg/lib/libxcb/files/xvmc.c cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxcb/files/dri3.c \ src/external/mit/xorg/lib/libxcb/files/dri3.h \ src/external/mi
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 07:51:43 UTC 2014 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17403 Log Message: initial import of libdrm-2.4.52 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-52 U xsrc/external/mit/libdrm/dist/xf86drmMode.c U xsrc/external/mit/libdrm/dist/aclocal.m4 U xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/config.h.in U xsrc/external/mit/libdrm/dist/Makefile.in U xsrc/external/mit/libdrm/dist/xf86atomic.h C xsrc/external/mit/libdrm/dist/xf86drm.c U xsrc/external/mit/libdrm/dist/configure U xsrc/external/mit/libdrm/dist/libdrm.pc.in U xsrc/external/mit/libdrm/dist/Makefile.am U xsrc/external/mit/libdrm/dist/xf86drmSL.c C xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/README U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/configure.ac U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/xf86drmRandom.c N xsrc/external/mit/libdrm/dist/freedreno/list.h N xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c N xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h N xsrc/external/mit/libdrm/dist/freedreno/Makefile.in N xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c N xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c N xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h N xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in N xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h N xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c N xsrc/external/mit/libdrm/dist/freedreno/Makefile.am N xsrc/external/mit/libdrm/dist/freedreno/README N xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_device.c N xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_pipe.c N xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_ringbuffer.c N xsrc/external/mit/libdrm/dist/freedreno/kgsl/msm_kgsl.h N xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_bo.c N xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_priv.h N xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_drm.h N xsrc/external/mit/libdrm/dist/freedreno/msm/msm_pipe.c N xsrc/external/mit/libdrm/dist/freedreno/msm/msm_bo.c N xsrc/external/mit/libdrm/dist/freedreno/msm/msm_ringbuffer.c N xsrc/external/mit/libdrm/dist/freedreno/msm/msm_priv.h N xsrc/external/mit/libdrm/dist/freedreno/msm/msm_drm.h N xsrc/external/mit/libdrm/dist/freedreno/msm/msm_device.c N xsrc/external/mit/libdrm/dist/build-aux/config.sub N xsrc/external/mit/libdrm/dist/build-aux/depcomp N xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh N xsrc/external/mit/libdrm/dist/build-aux/missing N xsrc/external/mit/libdrm/dist/build-aux/test-driver N xsrc/external/mit/libdrm/dist/build-aux/config.guess N xsrc/external/mit/libdrm/dist/build-aux/install-sh N xsrc/external/mit/libdrm/dist/m4/lt~obsolete.m4 N xsrc/external/mit/libdrm/dist/m4/ltversion.m4 N xsrc/external/mit/libdrm/dist/m4/ltsugar.m4 N xsrc/external/mit/libdrm/dist/m4/libtool.m4 N xsrc/external/mit/libdrm/dist/m4/ltoptions.m4 N xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h N xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h N xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in N xsrc/external/mit/libdrm/dist/exynos/Makefile.in N xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c N xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h N xsrc/external/mit/libdrm/dist/exynos/fimg2d.h N xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c N xsrc/external/mit/libdrm/dist/exynos/Makefile.am N xsrc/external/mit/libdrm/dist/man/drm-memory.xml N xsrc/external/mit/libdrm/dist/man/Makefile.in N xsrc/external/mit/libdrm/dist/man/drmHandleEvent.xml N xsrc/external/mit/libdrm/dist/man/drmAvailable.xml N xsrc/external/mit/libdrm/dist/man/drm-kms.xml N xsrc/external/mit/libdrm/dist/man/drm.xml N xsrc/external/mit/libdrm/dist/man/Makefile.am N xsrc/external/mit/libdrm/dist/man/drmModeGetResources.xml N xsrc/external/mit/libdrm/dist/omap/libdrm_omap.pc.in N xsrc/external/mit/libdrm/dist/omap/omap_drmif.h N xsrc/external/mit/libdrm/dist/omap/Makefile.in N xsrc/external/mit/libdrm/dist/omap/omap_drm.h N xsrc/external/mit/libdrm/dist/omap/Makefile.am N xsrc/external/mit/libdrm/dist/omap/omap_drm.c U xsrc/external/mit/libdrm/dist/tests/updatedraw.c U xsrc/external/mit/libdrm/dist/tests/drmtest.c U xsrc/external/mit/libdrm/dist/tests/drmtest.h U xsrc/external/mit/libdrm/dist/tests/Makefile.in U xsrc/external/mit/libdrm/dist/tests/name_from_fd.c U xsrc/external/mit/libdrm/dist/tests/getversion.c U xsrc/external/mit/libdrm/dist/tests/getclient.c U xsrc/external/mit/libdrm/dist/tests/setversion.c U xsrc/external/mit/libdrm/dist/tests/drmstat.c U xsrc/external/mit/libdrm/dist/tests/gem_basic.c U xsrc/external/mit/libdrm/dist/tests/gem_flink.c U xsrc/external/mit/libdrm/dist/tests/getstats.c U xsrc/external/mit/libdrm/dist/tests/Makefile.am U xsrc/external/mit/libdrm/dist/tests/ope
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Mon Mar 17 08:01:18 UTC 2014
Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile
src/external/mit/xorg/lib/libdrm/drm: Makefile
src/external/mit/xorg/lib/libdrm_intel: Makefile
src/external/mit/xorg/lib/libdrm_radeon: Makefile
Added Files:
src/external/mit/xorg/lib/libdrm: Makefile.defines
Log Message:
various updates for libdrm 2.4.52.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libdrm/Makefile.defines
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libdrm/drm/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libdrm_intel/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libdrm_radeon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.8 src/external/mit/xorg/lib/libdrm/Makefile:1.9
--- src/external/mit/xorg/lib/libdrm/Makefile:1.8 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/libdrm/Makefile Mon Mar 17 08:01:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/03/17 08:01:18 mrg Exp $
.include
@@ -19,6 +19,20 @@ PKGDIST= ${LIB}
CWARNFLAGS.clang+= -Wno-conversion -Wno-tautological-compare
+.if 0
+MAN= drm.7 \
+ drm-kms.7 \
+ drm-memory.7 \
+ drmAvailable.3 \
+ drmHandleEvent.3 \
+ drmModeGetResources.3
+# XXX is this right?
+MLINKS+= drm-mm.7 drm-gem.7 \
+ drm-mm.7 drm-ttm.7
+.endif
+
+.include "Makefile.defines"
+
.include
.include
.include
Index: src/external/mit/xorg/lib/libdrm/drm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/drm/Makefile:1.5 src/external/mit/xorg/lib/libdrm/drm/Makefile:1.6
--- src/external/mit/xorg/lib/libdrm/drm/Makefile:1.5 Sat May 22 23:19:24 2010
+++ src/external/mit/xorg/lib/libdrm/drm/Makefile Mon Mar 17 08:01:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/05/22 23:19:24 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/17 08:01:18 mrg Exp $
# install include/libdrm files
@@ -9,14 +9,18 @@
.PATH: ${X11SRCDIR.drm}/radeon
INCS= drm.h \
+ drm_fourcc.h \
drm_mode.h \
drm_sarea.h \
i915_drm.h \
+ intel_aub.h \
intel_bufmgr.h \
+ intel_debug.h \
mach64_drm.h \
mga_drm.h \
nouveau_drm.h \
r128_drm.h \
+ r600_pci_ids.h \
radeon_bo.h \
radeon_bo_gem.h \
radeon_bo_int.h \
@@ -24,9 +28,11 @@ INCS= drm.h \
radeon_cs_gem.h \
radeon_cs_int.h \
radeon_drm.h \
+ radeon_surface.h \
savage_drm.h \
sis_drm.h \
- via_drm.h
+ via_drm.h \
+ qxl_drm.h
INCSDIR=${X11INCDIR}/libdrm
Index: src/external/mit/xorg/lib/libdrm_intel/Makefile
diff -u src/external/mit/xorg/lib/libdrm_intel/Makefile:1.7 src/external/mit/xorg/lib/libdrm_intel/Makefile:1.8
--- src/external/mit/xorg/lib/libdrm_intel/Makefile:1.7 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/libdrm_intel/Makefile Mon Mar 17 08:01:18 2014
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/17 08:01:18 mrg Exp $
.include
LIB= drm_intel
.PATH: ${X11SRCDIR.drm}/intel
-SRCS= intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c mm.c
+SRCS= intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c \
+ intel_decode.c mm.c
+
+CFLAGS+= -std=c99
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
@@ -17,5 +20,7 @@ PKGDIST= drm
CWARNFLAGS.clang+= -Wno-pointer-sign
+.include "../libdrm/Makefile.defines"
+
.include
.include
Index: src/external/mit/xorg/lib/libdrm_radeon/Makefile
diff -u src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.4 src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.5
--- src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.4 Sat Aug 14 10:29:43 2010
+++ src/external/mit/xorg/lib/libdrm_radeon/Makefile Mon Mar 17 08:01:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/08/14 10:29:43 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/17 08:01:18 mrg Exp $
.include
@@ -11,6 +11,7 @@ SRCS= radeon_bo.c \
radeon_cs.c \
radeon_cs_gem.c \
radeon_cs_space.c \
+ radeon_surface.c \
bof.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
@@ -23,5 +24,7 @@ LIBDPLIBS= drm ${.CURDIR}/../libdrm
PKGCONFIG= libdrm_radeon
PKGDIST= drm
+.include "../libdrm/Makefile.defines"
+
.include
.include
Added files:
Index: src/external/mit/xorg/lib/libdrm/Makefile.defines
diff -u /dev/null src/external/mit/xorg/lib/libdrm/Makefile.defines:1.1
--- /dev/null Mon Mar 17 08:01:18 2014
+++ src/external/mit/xorg/lib/libdrm/Makefile.defines Mon Mar 17 08:01:18 2014
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.defines,v 1.1 2014/03/17 08:01:18 mrg Exp $
+
+# common defiles for libdrm components
+
+CPPFLAGS+= -DHAVE_INTTYPES_H \
+ -DHAVE_RADEO
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: mrg Date: Mon Mar 17 08:11:32 UTC 2014 Modified Files: src/distrib/sets/lists/xcomp: mi Log Message: updates for libdrm 2.4.52. To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/distrib/sets/lists/xcomp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.147 src/distrib/sets/lists/xcomp/mi:1.148 --- src/distrib/sets/lists/xcomp/mi:1.147 Mon Mar 17 07:25:34 2014 +++ src/distrib/sets/lists/xcomp/mi Mon Mar 17 08:11:32 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.147 2014/03/17 07:25:34 mrg Exp $ +# $NetBSD: mi,v 1.148 2014/03/17 08:11:32 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -5738,14 +5738,19 @@ ./usr/X11R7/include/freetype2/freetype/ttunpat.h -unknown- xorg ./usr/X11R7/include/ft2build.h-unknown- xorg ./usr/X11R7/include/libdrm/drm.h -unknown- xorg +./usr/X11R7/include/libdrm/drm_fourcc.h -unknown- xorg ./usr/X11R7/include/libdrm/drm_mode.h -unknown- xorg ./usr/X11R7/include/libdrm/drm_sarea.h -unknown- xorg ./usr/X11R7/include/libdrm/i915_drm.h -unknown- xorg +./usr/X11R7/include/libdrm/intel_aub.h -unknown- xorg ./usr/X11R7/include/libdrm/intel_bufmgr.h -unknown- xorg +./usr/X11R7/include/libdrm/intel_debug.h -unknown- xorg ./usr/X11R7/include/libdrm/mach64_drm.h -unknown- xorg ./usr/X11R7/include/libdrm/mga_drm.h -unknown- xorg ./usr/X11R7/include/libdrm/nouveau_drm.h -unknown- xorg +./usr/X11R7/include/libdrm/qxl_drm.h -unknown- xorg ./usr/X11R7/include/libdrm/r128_drm.h -unknown- xorg +./usr/X11R7/include/libdrm/r600_pci_ids.h -unknown- xorg ./usr/X11R7/include/libdrm/radeon_bo.h -unknown- xorg ./usr/X11R7/include/libdrm/radeon_bo_gem.h -unknown- xorg ./usr/X11R7/include/libdrm/radeon_bo_int.h -unknown- xorg @@ -5753,6 +5758,7 @@ ./usr/X11R7/include/libdrm/radeon_cs_gem.h -unknown- xorg ./usr/X11R7/include/libdrm/radeon_cs_int.h -unknown- xorg ./usr/X11R7/include/libdrm/radeon_drm.h -unknown- xorg +./usr/X11R7/include/libdrm/radeon_surface.h -unknown- xorg ./usr/X11R7/include/libdrm/savage_drm.h -unknown- xorg ./usr/X11R7/include/libdrm/sis_drm.h -unknown- xorg ./usr/X11R7/include/libdrm/via_drm.h -unknown- xorg
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 08:32:04 UTC 2014 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18473 Log Message: initial import of xkeyboard-config-2.11 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-11 U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in U xsrc/external/mit/xkeyboard-config/dist/configure.ac U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/Makefile.in C xsrc/external/mit/xkeyboard-config/dist/config.guess U xsrc/external/mit/xkeyboard-config/dist/install-sh C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/AUTHORS C xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/TODO U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/po/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/po/uk.po U xsrc/external/mit/xkeyboard-config/dist/po/hr.po U xsrc/external/mit/xkeyboard-config/dist/po/az.po U xsrc/external/mit/xkeyboard-config/dist/po/nl.po U xsrc/external/mit/xkeyboard-config/dist/po/ca.po U xsrc/external/mit/xkeyboard-config/dist/po/de.po U xsrc/external/mit/xkeyboard-config/dist/po/sv.po U xsrc/external/mit/xkeyboard-config/dist/po/ro.po U xsrc/external/mit/xkeyboard-config/dist/po/es.po U xsrc/external/mit/xkeyboard-config/dist/po/zh_TW.po U xsrc/external/mit/xkeyboard-config/dist/po/it.po U xsrc/external/mit/xkeyboard-config/dist/po/da.po U xsrc/external/mit/xkeyboard-config/dist/po/crh.po U xsrc/external/mit/xkeyboard-config/dist/po/gl.po U xsrc/external/mit/xkeyboard-config/dist/po/pl.po U xsrc/external/mit/xkeyboard-config/dist/po/ko.po U xsrc/external/mit/xkeyboard-config/dist/po/fr.po U xsrc/external/mit/xkeyboard-config/dist/po/sk.po U xsrc/external/mit/xkeyboard-config/dist/po/zh_CN.po U xsrc/external/mit/xkeyboard-config/dist/po/sq.po U xsrc/external/mit/xkeyboard-config/dist/po/rw.po U xsrc/external/mit/xkeyboard-config/dist/po/eo.po U xsrc/external/mit/xkeyboard-config/dist/po/hu.po U xsrc/external/mit/xkeyboard-config/dist/po/id.po U xsrc/external/mit/xkeyboard-config/dist/po/pt_BR.po U xsrc/external/mit/xkeyboard-config/dist/po/bg.po U xsrc/external/mit/xkeyboard-config/dist/po/sr.po U xsrc/external/mit/xkeyboard-config/dist/po/el.po U xsrc/external/mit/xkeyboard-config/dist/po/af.po U xsrc/external/mit/xkeyboard-config/dist/po/nb.po U xsrc/external/mit/xkeyboard-config/dist/po/cs.po U xsrc/external/mit/xkeyboard-config/dist/po/ja.po U xsrc/external/mit/xkeyboard-config/dist/po/tr.po U xsrc/external/mit/xkeyboard-config/dist/po/Makefile.in.in U xsrc/external/mit/xkeyboard-config/dist/po/ru.po U xsrc/external/mit/xkeyboard-config/dist/po/fi.po U xsrc/external/mit/xkeyboard-config/dist/po/POTFILES.skip U xsrc/external/mit/xkeyboard-config/dist/po/POTFILES.in U xsrc/external/mit/xkeyboard-config/dist/po/ky.po U xsrc/external/mit/xkeyboard-config/dist/po/ka.po U xsrc/external/mit/xkeyboard-config/dist/po/sl.po U xsrc/external/mit/xkeyboard-config/dist/po/en_GB.po U xsrc/external/mit/xkeyboard-config/dist/po/Makevars U xsrc/external/mit/xkeyboard-config/dist/po/vi.po U xsrc/external/mit/xkeyboard-config/dist/po/lt.po N xsrc/external/mit/xkeyboard-config/dist/m4/intlmacosx.m4 N xsrc/external/mit/xkeyboard-config/dist/m4/lib-prefix.m4 N xsrc/external/mit/xkeyboard-config/dist/m4/gettext.m4 N xsrc/external/mit/xkeyboard-config/dist/m4/nls.m4 N xsrc/external/mit/xkeyboard-config/dist/m4/lib-ld.m4 N xsrc/external/mit/xkeyboard-config/dist/m4/lib-link.m4 N xsrc/external/mit/xkeyboard-config/dist/m4/iconv.m4 N xsrc/external/mit/xkeyboard-config/dist/m4/progtest.m4 N xsrc/external/mit/xkeyboard-config/dist/m4/po.m4 U xsrc/external/mit/xkeyboard-config/dist/keycodes/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/keycodes/ataritt U xsrc/external/mit/xkeyboard-config/dist/keycodes/xfree98 U xsrc/external/mit/xkeyboard-config/dist/keycodes/xfree86 U xsrc/external/mit/xkeyboard-config/dist/keycodes/olpc U xsrc/external/mit/xkeyboard-config/dist/keycodes/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/keycodes/aliases U xsrc/external/mit/xkeyboard-config/dist/keycodes/fujitsu U xsrc/external/mit/xkeyboard-config/dist/keycodes/evdev U xsrc/external/mit/xkeyboard-config/dist/keycodes/hp U x
CVS import: xsrc/external/mit/twm/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 08:48:43 UTC 2014 Update of /cvsroot/xsrc/external/mit/twm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19600 Log Message: initial import of twm-1.0.8 Status: Vendor Tag: xorg Release Tags: twm-1-0-8 U xsrc/external/mit/twm/dist/configure.ac U xsrc/external/mit/twm/dist/missing U xsrc/external/mit/twm/dist/config.h.in U xsrc/external/mit/twm/dist/depcomp N xsrc/external/mit/twm/dist/compile U xsrc/external/mit/twm/dist/config.sub U xsrc/external/mit/twm/dist/COPYING U xsrc/external/mit/twm/dist/Makefile.am U xsrc/external/mit/twm/dist/ylwrap U xsrc/external/mit/twm/dist/README U xsrc/external/mit/twm/dist/ChangeLog U xsrc/external/mit/twm/dist/aclocal.m4 U xsrc/external/mit/twm/dist/INSTALL U xsrc/external/mit/twm/dist/install-sh U xsrc/external/mit/twm/dist/Makefile.in U xsrc/external/mit/twm/dist/configure U xsrc/external/mit/twm/dist/config.guess U xsrc/external/mit/twm/dist/sample-twmrc/lemke.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/keith.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/jim.twmrc U xsrc/external/mit/twm/dist/man/Makefile.in U xsrc/external/mit/twm/dist/man/twm.man U xsrc/external/mit/twm/dist/man/Makefile.am U xsrc/external/mit/twm/dist/src/icons.c U xsrc/external/mit/twm/dist/src/gc.h U xsrc/external/mit/twm/dist/src/system.twmrc U xsrc/external/mit/twm/dist/src/deftwmrc.c U xsrc/external/mit/twm/dist/src/list.h U xsrc/external/mit/twm/dist/src/siconify.bm U xsrc/external/mit/twm/dist/src/twm.c U xsrc/external/mit/twm/dist/src/menus.h U xsrc/external/mit/twm/dist/src/session.c U xsrc/external/mit/twm/dist/src/parse.c U xsrc/external/mit/twm/dist/src/events.c C xsrc/external/mit/twm/dist/src/gram.h U xsrc/external/mit/twm/dist/src/iconmgr.c U xsrc/external/mit/twm/dist/src/cursor.c U xsrc/external/mit/twm/dist/src/add_window.c U xsrc/external/mit/twm/dist/src/util.h U xsrc/external/mit/twm/dist/src/resize.h U xsrc/external/mit/twm/dist/src/lex.l U xsrc/external/mit/twm/dist/src/screen.h U xsrc/external/mit/twm/dist/src/version.c U xsrc/external/mit/twm/dist/src/session.h U xsrc/external/mit/twm/dist/src/parse.h U xsrc/external/mit/twm/dist/src/gram.y U xsrc/external/mit/twm/dist/src/list.c U xsrc/external/mit/twm/dist/src/twm.h U xsrc/external/mit/twm/dist/src/menus.c U xsrc/external/mit/twm/dist/src/icons.h U xsrc/external/mit/twm/dist/src/Makefile.am U xsrc/external/mit/twm/dist/src/gc.c U xsrc/external/mit/twm/dist/src/deftwmrc.sed C xsrc/external/mit/twm/dist/src/lex.c U xsrc/external/mit/twm/dist/src/version.h U xsrc/external/mit/twm/dist/src/resize.c U xsrc/external/mit/twm/dist/src/Makefile.in U xsrc/external/mit/twm/dist/src/add_window.h U xsrc/external/mit/twm/dist/src/util.c U xsrc/external/mit/twm/dist/src/events.h C xsrc/external/mit/twm/dist/src/gram.c U xsrc/external/mit/twm/dist/src/iconmgr.h 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/twm/dist
CVS import: xsrc/external/mit/mkfontscale/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 08:48:42 UTC 2014 Update of /cvsroot/xsrc/external/mit/mkfontscale/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15446 Log Message: initial import of mkfontscale-1.1.1 Status: Vendor Tag: xorg Release Tags: mkfontscale-1-1-1 C xsrc/external/mit/mkfontscale/dist/mkfontscale.c U xsrc/external/mit/mkfontscale/dist/config.guess U xsrc/external/mit/mkfontscale/dist/aclocal.m4 U xsrc/external/mit/mkfontscale/dist/missing U xsrc/external/mit/mkfontscale/dist/install-sh U xsrc/external/mit/mkfontscale/dist/config.h.in U xsrc/external/mit/mkfontscale/dist/ident.h U xsrc/external/mit/mkfontscale/dist/configure U xsrc/external/mit/mkfontscale/dist/data.h U xsrc/external/mit/mkfontscale/dist/INSTALL U xsrc/external/mit/mkfontscale/dist/ChangeLog U xsrc/external/mit/mkfontscale/dist/list.h U xsrc/external/mit/mkfontscale/dist/hash.h U xsrc/external/mit/mkfontscale/dist/Makefile.in U xsrc/external/mit/mkfontscale/dist/config.sub U xsrc/external/mit/mkfontscale/dist/depcomp U xsrc/external/mit/mkfontscale/dist/Makefile.am N xsrc/external/mit/mkfontscale/dist/compile U xsrc/external/mit/mkfontscale/dist/list.c U xsrc/external/mit/mkfontscale/dist/hash.c U xsrc/external/mit/mkfontscale/dist/README U xsrc/external/mit/mkfontscale/dist/COPYING U xsrc/external/mit/mkfontscale/dist/configure.ac C xsrc/external/mit/mkfontscale/dist/ident.c U xsrc/external/mit/mkfontscale/dist/man/mkfontscale.man U xsrc/external/mit/mkfontscale/dist/man/Makefile.am U xsrc/external/mit/mkfontscale/dist/man/Makefile.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/mkfontscale/dist
CVS import: xsrc/external/mit/imake/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 08:48:39 UTC 2014 Update of /cvsroot/xsrc/external/mit/imake/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1817 Log Message: initial import of imake-1.0.6 Status: Vendor Tag: xorg Release Tags: imake-1-0-6 U xsrc/external/mit/imake/dist/mkhtmlindex.sh U xsrc/external/mit/imake/dist/config.h.in U xsrc/external/mit/imake/dist/mkdirhier.man U xsrc/external/mit/imake/dist/COPYING C xsrc/external/mit/imake/dist/compile U xsrc/external/mit/imake/dist/imake.c U xsrc/external/mit/imake/dist/mkhtmlindex.pl U xsrc/external/mit/imake/dist/mkdirhier U xsrc/external/mit/imake/dist/install-sh U xsrc/external/mit/imake/dist/mdepend.cpp U xsrc/external/mit/imake/dist/revpath.man U xsrc/external/mit/imake/dist/xmkmf.man U xsrc/external/mit/imake/dist/configure.ac U xsrc/external/mit/imake/dist/aclocal.m4 U xsrc/external/mit/imake/dist/configure U xsrc/external/mit/imake/dist/mergelib.man U xsrc/external/mit/imake/dist/missing U xsrc/external/mit/imake/dist/depcomp U xsrc/external/mit/imake/dist/ChangeLog U xsrc/external/mit/imake/dist/cleanlinks.man U xsrc/external/mit/imake/dist/config.sub U xsrc/external/mit/imake/dist/xmkmf.cpp U xsrc/external/mit/imake/dist/cleanlinks U xsrc/external/mit/imake/dist/imake.man U xsrc/external/mit/imake/dist/makeg U xsrc/external/mit/imake/dist/imakemdep.h U xsrc/external/mit/imake/dist/INSTALL U xsrc/external/mit/imake/dist/Makefile.in U xsrc/external/mit/imake/dist/revpath.c U xsrc/external/mit/imake/dist/mergelib.cpp U xsrc/external/mit/imake/dist/config.guess U xsrc/external/mit/imake/dist/ccmakedep.man U xsrc/external/mit/imake/dist/Makefile.am U xsrc/external/mit/imake/dist/makeg.man U xsrc/external/mit/imake/dist/mkhtmlindex.man U xsrc/external/mit/imake/dist/README 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/imake/dist
CVS import: xsrc/external/mit/iceauth/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 08:48:38 UTC 2014 Update of /cvsroot/xsrc/external/mit/iceauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26563 Log Message: initial import of iceauth-1.0.6 Status: Vendor Tag: xorg Release Tags: iceauth-1-0-6 N xsrc/external/mit/iceauth/dist/compile U xsrc/external/mit/iceauth/dist/configure.ac U xsrc/external/mit/iceauth/dist/install-sh U xsrc/external/mit/iceauth/dist/aclocal.m4 U xsrc/external/mit/iceauth/dist/Makefile.am U xsrc/external/mit/iceauth/dist/INSTALL U xsrc/external/mit/iceauth/dist/ChangeLog U xsrc/external/mit/iceauth/dist/configure U xsrc/external/mit/iceauth/dist/Makefile.in U xsrc/external/mit/iceauth/dist/iceauth.h U xsrc/external/mit/iceauth/dist/README U xsrc/external/mit/iceauth/dist/COPYING U xsrc/external/mit/iceauth/dist/config.sub U xsrc/external/mit/iceauth/dist/process.c U xsrc/external/mit/iceauth/dist/config.h.in U xsrc/external/mit/iceauth/dist/iceauth.c U xsrc/external/mit/iceauth/dist/config.guess U xsrc/external/mit/iceauth/dist/missing U xsrc/external/mit/iceauth/dist/depcomp U xsrc/external/mit/iceauth/dist/man/iceauth.man U xsrc/external/mit/iceauth/dist/man/Makefile.am U xsrc/external/mit/iceauth/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/makedepend/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 08:48:41 UTC 2014 Update of /cvsroot/xsrc/external/mit/makedepend/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29430 Log Message: initial import of makedepend-1.0.5 Status: Vendor Tag: xorg Release Tags: makedepend-1-0-5 U xsrc/external/mit/makedepend/dist/makedepend.man U xsrc/external/mit/makedepend/dist/config.guess U xsrc/external/mit/makedepend/dist/parse.c U xsrc/external/mit/makedepend/dist/Makefile.am U xsrc/external/mit/makedepend/dist/autogen.sh U xsrc/external/mit/makedepend/dist/ifparser.c N xsrc/external/mit/makedepend/dist/test-driver U xsrc/external/mit/makedepend/dist/makedepend-config.h.in U xsrc/external/mit/makedepend/dist/Makefile.in U xsrc/external/mit/makedepend/dist/README U xsrc/external/mit/makedepend/dist/config.sub U xsrc/external/mit/makedepend/dist/imakemdep.h U xsrc/external/mit/makedepend/dist/include.c U xsrc/external/mit/makedepend/dist/main.c U xsrc/external/mit/makedepend/dist/cppsetup.c U xsrc/external/mit/makedepend/dist/ifparser.h U xsrc/external/mit/makedepend/dist/configure U xsrc/external/mit/makedepend/dist/depcomp U xsrc/external/mit/makedepend/dist/ChangeLog U xsrc/external/mit/makedepend/dist/missing U xsrc/external/mit/makedepend/dist/def.h U xsrc/external/mit/makedepend/dist/COPYING U xsrc/external/mit/makedepend/dist/install-sh U xsrc/external/mit/makedepend/dist/AUTHORS U xsrc/external/mit/makedepend/dist/aclocal.m4 U xsrc/external/mit/makedepend/dist/compile U xsrc/external/mit/makedepend/dist/configure.ac U xsrc/external/mit/makedepend/dist/pr.c U xsrc/external/mit/makedepend/dist/tests/28045/makedep.sh U xsrc/external/mit/makedepend/dist/tests/28045/foo.cpp No conflicts created by this import
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Mon Mar 17 08:51:28 UTC 2014
Modified Files:
xsrc/external/mit/imake/include: config.h
xsrc/external/mit/mkfontscale/dist: ident.c mkfontscale.c
Added Files:
xsrc/external/mit/imake/dist: compile
Log Message:
merge iceauth 1.0.5, imake 1.0.5, makedepend 1.0.4, mkfontscale 1.1.0,
and twm 1.0.7.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/imake/dist/compile
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/imake/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/mkfontscale/dist/ident.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/mkfontscale/dist/mkfontscale.c
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/imake/include/config.h
diff -u xsrc/external/mit/imake/include/config.h:1.3 xsrc/external/mit/imake/include/config.h:1.4
--- xsrc/external/mit/imake/include/config.h:1.3 Fri May 31 05:24:01 2013
+++ xsrc/external/mit/imake/include/config.h Mon Mar 17 08:51:28 2014
@@ -41,7 +41,7 @@
#define PACKAGE_NAME "imake"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "imake 1.0.5"
+#define PACKAGE_STRING "imake 1.0.6"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "imake"
@@ -50,7 +50,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.5"
+#define PACKAGE_VERSION "1.0.6"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -59,10 +59,10 @@
#define PACKAGE_VERSION_MINOR 0
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 5
+#define PACKAGE_VERSION_PATCHLEVEL 6
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.0.5"
+#define VERSION "1.0.6"
Index: xsrc/external/mit/mkfontscale/dist/ident.c
diff -u xsrc/external/mit/mkfontscale/dist/ident.c:1.4 xsrc/external/mit/mkfontscale/dist/ident.c:1.5
--- xsrc/external/mit/mkfontscale/dist/ident.c:1.4 Fri May 31 05:11:36 2013
+++ xsrc/external/mit/mkfontscale/dist/ident.c Mon Mar 17 08:51:28 2014
@@ -317,10 +317,9 @@ pcfIdentify(fontFile *f, char **name)
if(i >= nprops)
goto fail;
-s = malloc(strlen(strings + props[i].value) + 1);
+s = strdup(strings + props[i].value);
if(s == NULL)
goto fail;
-strcpy(s, strings + props[i].value);
*name = s;
free(strings);
free(props);
Index: xsrc/external/mit/mkfontscale/dist/mkfontscale.c
diff -u xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.2 xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.3
--- xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.2 Fri May 31 05:43:13 2013
+++ xsrc/external/mit/mkfontscale/dist/mkfontscale.c Mon Mar 17 08:51:28 2014
@@ -20,11 +20,14 @@
THE SOFTWARE.
*/
+#include "config.h"
+
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -826,6 +829,9 @@ doDirectory(const char *dirname_given, i
while((entry = readdir(dirp)) != NULL) {
int have_face = 0;
char *xlfd_name = NULL;
+ struct stat f_stat;
+ int tprio = 1;
+
xlfd = NULL;
if (xl) {
@@ -836,6 +842,23 @@ doDirectory(const char *dirname_given, i
filename = dsprintf("%s%s", dirname, entry->d_name);
+#define PRIO(x) ((x << 1) + tprio)
+#ifdef DT_LNK
+ if (entry->d_type != DT_UNKNOWN) {
+ if (entry->d_type == DT_LNK)
+ tprio = 0;
+ } else
+#endif
+#ifdef S_ISLNK
+ {
+ if (lstat(filename, &f_stat))
+ goto done;
+ if (S_ISLNK(f_stat.st_mode))
+ tprio = 0;
+ }
+#else
+ ;
+#endif
if(doBitmaps)
rc = bitmapIdentify(filename, &xlfd_name);
else
@@ -875,10 +898,9 @@ doDirectory(const char *dirname_given, i
BDF_PropertyRec prop;
rc = FT_Get_BDF_Property(face, "FONT", &prop);
if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_ATOM) {
-xlfd_name = malloc(strlen(prop.u.atom) + 1);
+xlfd_name = strdup(prop.u.atom);
if(xlfd_name == NULL)
goto done;
-strcpy(xlfd_name, prop.u.atom);
}
}
}
@@ -896,7 +918,7 @@ doDirectory(const char *dirname_given, i
xlfd = listCons(s, xlfd);
} else {
/* Not a reencodable font -- skip all the rest of the loop body */
-putHash(entries, xlfd_name, entry->d_name, filePrio(entry->d_name));
+putHash(entries, xlfd_name, entry->d_name, PRIO(filePrio(entry->d_name)));
goto done;
}
}
@@ -930,7 +952,7 @@ doDirectory(const char *dirname_given, i
found = 1;
snprintf(buf, MAXFONTNAMELEN, "%s-%s",
lp->value,
CVS commit: xsrc/external/mit/mkfontscale
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:01:38 UTC 2014 Modified Files: xsrc/external/mit/mkfontscale/dist: hash.c mkfontscale.c Added Files: xsrc/external/mit/mkfontscale/include: config.h Log Message: merge mkfontscale 1.1.1 bits. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/mkfontscale/dist/hash.c cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/mkfontscale/dist/mkfontscale.c cvs rdiff -u -r0 -r1.1 xsrc/external/mit/mkfontscale/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/mkfontscale/dist/hash.c diff -u xsrc/external/mit/mkfontscale/dist/hash.c:1.1.1.3 xsrc/external/mit/mkfontscale/dist/hash.c:1.2 --- xsrc/external/mit/mkfontscale/dist/hash.c:1.1.1.3 Mon Mar 17 08:48:41 2014 +++ xsrc/external/mit/mkfontscale/dist/hash.c Mon Mar 17 09:01:38 2014 @@ -20,7 +20,9 @@ THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include #include Index: xsrc/external/mit/mkfontscale/dist/mkfontscale.c diff -u xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.3 xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.4 --- xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.3 Mon Mar 17 08:51:28 2014 +++ xsrc/external/mit/mkfontscale/dist/mkfontscale.c Mon Mar 17 09:01:38 2014 @@ -20,7 +20,9 @@ THE SOFTWARE. */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include #include Added files: Index: xsrc/external/mit/mkfontscale/include/config.h diff -u /dev/null xsrc/external/mit/mkfontscale/include/config.h:1.1 --- /dev/null Mon Mar 17 09:01:38 2014 +++ xsrc/external/mit/mkfontscale/include/config.h Mon Mar 17 09:01:38 2014 @@ -0,0 +1,106 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `bz2' library (-lbz2). */ +#define HAVE_LIBBZ2 1 + +/* Define to 1 if you have the `z' library (-lz). */ +#define HAVE_LIBZ 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Name of package */ +#define PACKAGE "mkfontscale" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"; + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "mkfontscale" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "mkfontscale 1.1.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "mkfontscale" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.1.1" + +/* Major version of this package */ +#define PACKAGE_VERSION_MAJOR 1 + +/* Minor version of this package */ +#define PACKAGE_VERSION_MINOR 1 + +/* Patch version of this package */ +#define PACKAGE_VERSION_PATCHLEVEL 1 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + +/* Version number of package */ +#define VERSION "1.1.1" + +/* Support bzip2 for bitmap fonts */ +#define X_BZIP2_FONT_COMPRESSION 1 + +/* Define to 1 if on MINIX. */ +/* #undef _MINIX */ + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +/* #undef _POSIX_SOURCE */
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name:src Committed By: mrg Date: Mon Mar 17 09:02:02 UTC 2014 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: regenerate for xkeyboard-config 2.11. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.6 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.7 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.6 Tue Feb 25 13:07:29 2014 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Mon Mar 17 09:02:02 2014 @@ -40,45 +40,6 @@ ! $azerty = be fr ! $qwertz = al cz de hr hu ro si sk -! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \ - airkey \ - apple armada azonaRF2300 \ - benqx brother \ - btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \ - cherryblue cherrybluea cherryblueb \ - cherrycyboard cherrycmexpert \ - chicony chicony0108 chicony0420 chicony9885 \ - compalfl90 \ - compaqeak8 compaqik7 compaqik13 compaqik18 \ - creativedw7000 \ - cymotionlinux \ - dell dellm65 inspiron dellusbmm \ - emachines ennyah_dkb1008 evdev \ - genius geniuscomfy2 \ - gyration honeywell_euroboard \ - hp250x hp5xx hp500fa hpdv5 \ - hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \ - ibm_spacesaver ipaq inspiron intel \ - logiaccess logicda logicink \ - logiex110 logiclx300 \ - logiinkse logiinkseusb logiitc logiik \ - logitech_base itouch logiultrax \ - logitech_g15 \ - logidinovo logidinovoedge \ - microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ - microsoftoffice microsoftmult \ - mx1998 mx2500 mx2750 \ - oretec \ - pc105 \ - presario propeller \ - qtronix \ - rapidaccess rapidaccess2 thinkpad60 \ - samsung4500 samsung4510 \ - silvercrest \ - sk1300 sk2500 sk6200 sk7100 \ - sven sven303 symplon \ - toshiba_s3000 trust trustda \ - unitekkb1925 yahoo // all layouts with 3rd and 4th groups ! $threelevellayouts = al az \ @@ -102,8 +63,6 @@ vn \ za -! $evdevkbds = ibm_spacesaver - ! $thinkpads = thinkpad thinkpad60 thinkpadz60 ! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \ @@ -125,6 +84,61 @@ ! $htcdreamlayouts = us it de +! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \ + airkey \ + apple armada azonaRF2300 \ + benqx brother \ + btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \ + cherryblue cherrybluea cherryblueb \ + cherrycyboard cherrycmexpert \ + chicony chicony0108 chicony0420 chicony9885 \ + compalfl90 \ + compaqeak8 compaqik7 compaqik13 compaqik18 \ + creativedw7000 \ + cymotionlinux \ + dell dellm65 inspiron dellusbmm \ + emachines ennyah_dkb1008 evdev \ + genius geniuscomfy2 \ + gyration honeywell_euroboard \ + hp250x hp5xx hp500fa hpdv5 \ + hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \ + ibm_spacesaver ipaq inspiron intel \ + logiaccess logicda logicink \ + logiex110 logiclx300 \ + logiinkse logiinkseusb logiitc logiik \ + logitech_base itouch logiultrax \ + logitech_g15 \ + logidinovo logidinovoedge \ + microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ + microsoftoffice microsoftmult \ + mx1998 mx2500 mx2750 \ + oretec \ + pc105 \ + presario propeller \ + qtronix \ + rapidaccess rapidaccess2 thinkpad60 \ + samsung4500 samsung4510 \ + silvercrest \ + sk1300 sk2500 sk6200 sk7100 \ + sven sven303 symplon \ + toshiba_s3000 trust trustda \ + unitekkb1925 yahoo + +! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \ + cherry
CVS commit: src/external/mit/xorg/bin/mkfontscale
Module Name:src
Committed By: mrg
Date: Mon Mar 17 09:02:16 UTC 2014
Modified Files:
src/external/mit/xorg/bin/mkfontscale: Makefile
Log Message:
update for mkfontscale 1.1.1.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/mkfontscale/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/mkfontscale/Makefile
diff -u src/external/mit/xorg/bin/mkfontscale/Makefile:1.3 src/external/mit/xorg/bin/mkfontscale/Makefile:1.4
--- src/external/mit/xorg/bin/mkfontscale/Makefile:1.3 Sat Jul 23 06:06:40 2011
+++ src/external/mit/xorg/bin/mkfontscale/Makefile Mon Mar 17 09:02:16 2014
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2011/07/23 06:06:40 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/17 09:02:16 mrg Exp $
.include
PROG= mkfontscale
SRCS= mkfontscale.c list.c hash.c ident.c
-CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 \
- -DXFREE86_FT2 -DX_BZIP2_FONT_COMPRESSION
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
LDADD+= -lfontenc -lfreetype -lz -lbz2
DPADD+= ${LIBFONTENC} ${LIBFREETYPE} ${LIBZ} ${LIBBZ2}
CVS commit: src/external/mit/xorg/bin/makedepend
Module Name:src
Committed By: mrg
Date: Mon Mar 17 09:07:09 UTC 2014
Modified Files:
src/external/mit/xorg/bin/makedepend: Makefile
Log Message:
updates for makedepend 1.0.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/makedepend/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/makedepend/Makefile
diff -u src/external/mit/xorg/bin/makedepend/Makefile:1.1.1.1 src/external/mit/xorg/bin/makedepend/Makefile:1.2
--- src/external/mit/xorg/bin/makedepend/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/makedepend/Makefile Mon Mar 17 09:07:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/17 09:07:09 mrg Exp $
.include
@@ -6,7 +6,8 @@ PROG= makedepend
SRCS= include.c main.c parse.c pr.c cppsetup.c ifparser.c
CPPFLAGS+= -I${X11SRCDIR.xc}/config/imake \
- -I${DESTDIR}${X11INCDIR}/X11
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -DHAVE_RENAME -DHAVE_FCHMOD
CPPFLAGS.main.c=-DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".o\"
CVS import: xsrc/external/mit/xclock/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:19:36 UTC 2014 Update of /cvsroot/xsrc/external/mit/xclock/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17327 Log Message: initial import of xclock-1.0.7 Status: Vendor Tag: xorg Release Tags: xclock-1-0-7 U xsrc/external/mit/xclock/dist/depcomp U xsrc/external/mit/xclock/dist/ChangeLog U xsrc/external/mit/xclock/dist/config.sub U xsrc/external/mit/xclock/dist/config.h.in U xsrc/external/mit/xclock/dist/clock.bit U xsrc/external/mit/xclock/dist/configure U xsrc/external/mit/xclock/dist/configure.ac U xsrc/external/mit/xclock/dist/Clock.h U xsrc/external/mit/xclock/dist/clmask.bit U xsrc/external/mit/xclock/dist/ClockP.h U xsrc/external/mit/xclock/dist/INSTALL U xsrc/external/mit/xclock/dist/aclocal.m4 U xsrc/external/mit/xclock/dist/missing U xsrc/external/mit/xclock/dist/xclock.c U xsrc/external/mit/xclock/dist/config.guess U xsrc/external/mit/xclock/dist/Makefile.in U xsrc/external/mit/xclock/dist/install-sh U xsrc/external/mit/xclock/dist/config.rpath U xsrc/external/mit/xclock/dist/README U xsrc/external/mit/xclock/dist/COPYING U xsrc/external/mit/xclock/dist/Clock.c U xsrc/external/mit/xclock/dist/Makefile.am N xsrc/external/mit/xclock/dist/compile U xsrc/external/mit/xclock/dist/app-defaults/XClock-color U xsrc/external/mit/xclock/dist/app-defaults/XClock U xsrc/external/mit/xclock/dist/man/Makefile.in U xsrc/external/mit/xclock/dist/man/xclock.man U xsrc/external/mit/xclock/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xclipboard/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:19:35 UTC 2014 Update of /cvsroot/xsrc/external/mit/xclipboard/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1497 Log Message: initial import of xclipboard-1.1.3 Status: Vendor Tag: xorg Release Tags: xclipboard-1-1-3 U xsrc/external/mit/xclipboard/dist/INSTALL U xsrc/external/mit/xclipboard/dist/ChangeLog U xsrc/external/mit/xclipboard/dist/config.guess U xsrc/external/mit/xclipboard/dist/xclipboard.c U xsrc/external/mit/xclipboard/dist/aclocal.m4 U xsrc/external/mit/xclipboard/dist/install-sh U xsrc/external/mit/xclipboard/dist/configure U xsrc/external/mit/xclipboard/dist/config.h.in U xsrc/external/mit/xclipboard/dist/depcomp U xsrc/external/mit/xclipboard/dist/config.sub U xsrc/external/mit/xclipboard/dist/Makefile.in U xsrc/external/mit/xclipboard/dist/missing U xsrc/external/mit/xclipboard/dist/xcutsel.c C xsrc/external/mit/xclipboard/dist/compile U xsrc/external/mit/xclipboard/dist/Makefile.am U xsrc/external/mit/xclipboard/dist/configure.ac U xsrc/external/mit/xclipboard/dist/COPYING U xsrc/external/mit/xclipboard/dist/README U xsrc/external/mit/xclipboard/dist/man/xclipboard.man U xsrc/external/mit/xclipboard/dist/man/Makefile.in U xsrc/external/mit/xclipboard/dist/man/Makefile.am U xsrc/external/mit/xclipboard/dist/man/xcutsel.man U xsrc/external/mit/xclipboard/dist/app-defaults/XClipboard 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xclipboard/dist
CVS import: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:19:33 UTC 2014 Update of /cvsroot/xsrc/external/mit/xauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10039 Log Message: initial import of xauth-1.0.8 Status: Vendor Tag: xorg Release Tags: xauth-1-0-8 U xsrc/external/mit/xauth/dist/parsedpy.c U xsrc/external/mit/xauth/dist/install-sh U xsrc/external/mit/xauth/dist/configure.ac U xsrc/external/mit/xauth/dist/config.guess U xsrc/external/mit/xauth/dist/config.sub U xsrc/external/mit/xauth/dist/README C xsrc/external/mit/xauth/dist/process.c U xsrc/external/mit/xauth/dist/depcomp U xsrc/external/mit/xauth/dist/ChangeLog U xsrc/external/mit/xauth/dist/Makefile.am U xsrc/external/mit/xauth/dist/COPYING U xsrc/external/mit/xauth/dist/gethost.c U xsrc/external/mit/xauth/dist/xauth.h U xsrc/external/mit/xauth/dist/Makefile.in U xsrc/external/mit/xauth/dist/config.h.in U xsrc/external/mit/xauth/dist/xauth.c U xsrc/external/mit/xauth/dist/aclocal.m4 U xsrc/external/mit/xauth/dist/INSTALL U xsrc/external/mit/xauth/dist/missing U xsrc/external/mit/xauth/dist/configure N xsrc/external/mit/xauth/dist/tests/test_xauth.c N xsrc/external/mit/xauth/dist/tests/Makefile.am N xsrc/external/mit/xauth/dist/tests/Makefile.in U xsrc/external/mit/xauth/dist/man/xauth.man U xsrc/external/mit/xauth/dist/man/Makefile.am U xsrc/external/mit/xauth/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xauth/dist
CVS import: xsrc/external/mit/xconsole/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:19:37 UTC 2014 Update of /cvsroot/xsrc/external/mit/xconsole/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29269 Log Message: initial import of xconsole-1.0.6 Status: Vendor Tag: xorg Release Tags: xconsole-1-0-6 U xsrc/external/mit/xconsole/dist/ChangeLog U xsrc/external/mit/xconsole/dist/README U xsrc/external/mit/xconsole/dist/config.h.in U xsrc/external/mit/xconsole/dist/INSTALL U xsrc/external/mit/xconsole/dist/configure U xsrc/external/mit/xconsole/dist/missing C xsrc/external/mit/xconsole/dist/xconsole.c U xsrc/external/mit/xconsole/dist/config.sub U xsrc/external/mit/xconsole/dist/configure.ac U xsrc/external/mit/xconsole/dist/config.guess U xsrc/external/mit/xconsole/dist/COPYING U xsrc/external/mit/xconsole/dist/Makefile.in N xsrc/external/mit/xconsole/dist/compile U xsrc/external/mit/xconsole/dist/Makefile.am U xsrc/external/mit/xconsole/dist/install-sh U xsrc/external/mit/xconsole/dist/depcomp U xsrc/external/mit/xconsole/dist/aclocal.m4 U xsrc/external/mit/xconsole/dist/app-defaults/XConsole N xsrc/external/mit/xconsole/dist/man/Makefile.am N xsrc/external/mit/xconsole/dist/man/xconsole.man N xsrc/external/mit/xconsole/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xconsole/dist
CVS import: xsrc/external/mit/xfd/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:19:38 UTC 2014 Update of /cvsroot/xsrc/external/mit/xfd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7246 Log Message: initial import of xfd-1.1.2 Status: Vendor Tag: xorg Release Tags: xfd-1-1-2 U xsrc/external/mit/xfd/dist/COPYING U xsrc/external/mit/xfd/dist/config.sub U xsrc/external/mit/xfd/dist/INSTALL U xsrc/external/mit/xfd/dist/Makefile.am U xsrc/external/mit/xfd/dist/README U xsrc/external/mit/xfd/dist/grid.h U xsrc/external/mit/xfd/dist/Makefile.in U xsrc/external/mit/xfd/dist/config.guess U xsrc/external/mit/xfd/dist/gridP.h U xsrc/external/mit/xfd/dist/configure.ac U xsrc/external/mit/xfd/dist/configure C xsrc/external/mit/xfd/dist/compile U xsrc/external/mit/xfd/dist/aclocal.m4 U xsrc/external/mit/xfd/dist/ChangeLog U xsrc/external/mit/xfd/dist/install-sh U xsrc/external/mit/xfd/dist/config.h.in U xsrc/external/mit/xfd/dist/grid.c U xsrc/external/mit/xfd/dist/missing U xsrc/external/mit/xfd/dist/depcomp U xsrc/external/mit/xfd/dist/xfd.c U xsrc/external/mit/xfd/dist/man/Makefile.am U xsrc/external/mit/xfd/dist/man/xfd.man U xsrc/external/mit/xfd/dist/man/Makefile.in U xsrc/external/mit/xfd/dist/app-defaults/Xfd 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xfd/dist
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Mon Mar 17 09:20:46 UTC 2014
Modified Files:
xsrc/external/mit/xauth/dist: process.c
xsrc/external/mit/xconsole/dist: xconsole.c
Added Files:
xsrc/external/mit/xclipboard/dist: compile
xsrc/external/mit/xfd/dist: compile
Removed Files:
xsrc/external/mit/xconsole/dist: xconsole.man
Log Message:
merge xauth 1.0.7, xclipboard 1.1.2, xclock 1.0.6, xconsole 1.0.4
and xfd 1.1.2.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xauth/dist/process.c
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xclipboard/dist/compile
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xconsole/dist/xconsole.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xconsole/dist/xconsole.man
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xfd/dist/compile
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/xauth/dist/process.c
diff -u xsrc/external/mit/xauth/dist/process.c:1.3 xsrc/external/mit/xauth/dist/process.c:1.4
--- xsrc/external/mit/xauth/dist/process.c:1.3 Sun Jun 30 11:31:42 2013
+++ xsrc/external/mit/xauth/dist/process.c Mon Mar 17 09:20:46 2014
@@ -38,7 +38,11 @@ from The Open Group.
#include
#include
#include
+#ifndef WIN32
#include
+#else
+#include
+#endif
#include
#include /* for Family constants */
@@ -112,6 +116,7 @@ static int do_exit ( const char *inputfi
static int do_quit ( const char *inputfilename, int lineno, int argc, const char **argv );
static int do_source ( const char *inputfilename, int lineno, int argc, const char **argv );
static int do_generate ( const char *inputfilename, int lineno, int argc, const char **argv );
+static int do_version ( const char *inputfilename, int lineno, int argc, const char **argv );
static CommandTable command_table[] = { /* table of known commands */
{ "add", 2, 3, do_add,
@@ -140,6 +145,8 @@ static CommandTable command_table[] = {
"remove dpyname... remove entries" },
{ "source", 1, 6, do_source,
"source filenameread commands from file" },
+{ "version", 1, 7, do_version,
+ "versionshow version number of xauth" },
{ "?",1, 1, do_questionmark,
"? list available commands" },
{ "generate", 1, 8, do_generate,
@@ -244,17 +251,17 @@ skip_nonspace(register char *s)
return s;
}
-static char **
+static const char **
split_into_words(char *src, int *argcp) /* argvify string */
{
char *jword;
char savec;
-char **argv;
+const char **argv;
int cur, total;
*argcp = 0;
#define WORDSTOALLOC 4 /* most lines are short */
-argv = (char **) malloc (WORDSTOALLOC * sizeof (char *));
+argv = malloc (WORDSTOALLOC * sizeof (char *));
if (!argv) return NULL;
cur = 0;
total = WORDSTOALLOC;
@@ -272,7 +279,7 @@ split_into_words(char *src, int *argcp)
*src = '\0';
if (cur == total) {
total += WORDSTOALLOC;
- argv = (char **) realloc (argv, total * sizeof (char *));
+ argv = realloc (argv, total * sizeof (char *));
if (!argv) return NULL;
}
argv[cur++] = jword;
@@ -633,18 +640,17 @@ static volatile Bool dieing = False;
#define WRITES(fd, S) (void)write((fd), (S), strlen((S)))
/* ARGSUSED */
-static RETSIGTYPE
+_X_NORETURN
+static void
die(int sig)
{
dieing = True;
_exit (auth_finalize ());
/* NOTREACHED */
-#ifdef SIGNALRETURNSINT
-return -1;/* for picky compilers */
-#endif
}
-static RETSIGTYPE
+_X_NORETURN
+static void
catchsig(int sig)
{
#ifdef SYSV
@@ -661,9 +667,6 @@ catchsig(int sig)
#endif
die (sig);
/* NOTREACHED */
-#ifdef SIGNALRETURNSINT
-return -1;/* for picky compilers */
-#endif
}
static void
@@ -1066,11 +1069,31 @@ eq_auth(Xauth *a, Xauth *b)
static int
match_auth_dpy(register Xauth *a, register Xauth *b)
{
-return ((a->family == b->family &&
- a->address_length == b->address_length &&
- a->number_length == b->number_length &&
- memcmp(a->address, b->address, a->address_length) == 0 &&
- memcmp(a->number, b->number, a->number_length) == 0) ? 1 : 0);
+if (a->family != FamilyWild && b->family != FamilyWild) {
+/* Both "a" and "b" are not FamilyWild, they are "normal" families. */
+
+ /* Make sure, that both families match: */
+ if (a->family != b->family)
+return 0;
+
+ /* By looking at 'man Xsecurity' and the code in
+ * GetAuthByAddr() and XauGetBestAuthByAddr() in libXau, we
+ * decided, that the address is only relevant for "normal"
+ * families and therefore should be ignored for
+ * "FamilyWild". */
+ if (a->address_length != b->address_length ||
+memcmp(a->address, b->address, a->address_length) != 0)
+return 0;
+}
+
+if (a->number_length != 0 && b->number_length != 0) {
+ /* Both "a" and "b" h
CVS commit: src/external/mit/xorg/bin/twm
Module Name:src
Committed By: mrg
Date: Mon Mar 17 09:21:19 UTC 2014
Modified Files:
src/external/mit/xorg/bin/twm: Makefile
Log Message:
avoid const problems for now.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/twm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/twm/Makefile
diff -u src/external/mit/xorg/bin/twm/Makefile:1.5 src/external/mit/xorg/bin/twm/Makefile:1.6
--- src/external/mit/xorg/bin/twm/Makefile:1.5 Thu Aug 11 23:15:35 2011
+++ src/external/mit/xorg/bin/twm/Makefile Mon Mar 17 09:21:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:35 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/17 09:21:19 mrg Exp $
.include
@@ -46,5 +46,9 @@ DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LI
CWARNFLAGS.clang+= -Wno-pointer-sign
+# XXX: has const issues best solved upstream
+COPTS.menus.c+= -Wno-error
+COPTS.util.c+= -Wno-error
+
.include
.include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Mon Mar 17 09:24:11 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xauth: Makefile
src/external/mit/xorg/bin/xconsole: Makefile
Log Message:
updates for xauth 1.0.8 and xconsole 1.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xauth/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xconsole/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xauth/Makefile
diff -u src/external/mit/xorg/bin/xauth/Makefile:1.2 src/external/mit/xorg/bin/xauth/Makefile:1.3
--- src/external/mit/xorg/bin/xauth/Makefile:1.2 Sat Jul 23 06:41:08 2011
+++ src/external/mit/xorg/bin/xauth/Makefile Mon Mar 17 09:24:11 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2011/07/23 06:41:08 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/17 09:24:11 mrg Exp $
.include
PROG= xauth
SRCS= xauth.c gethost.c process.c parsedpy.c
-CPPFLAGS+= -DRETSIGTYPE=void
+CPPFLAGS+= -DRETSIGTYPE=void -DPACKAGE_VERSION=\"1.0.8\"
CPPFLAGS.gethost.c= ${X11FLAGS.CONNECTION}
CPPFLAGS.parsedpy.c= ${X11FLAGS.CONNECTION}
Index: src/external/mit/xorg/bin/xconsole/Makefile
diff -u src/external/mit/xorg/bin/xconsole/Makefile:1.3 src/external/mit/xorg/bin/xconsole/Makefile:1.4
--- src/external/mit/xorg/bin/xconsole/Makefile:1.3 Sun May 15 21:25:33 2011
+++ src/external/mit/xorg/bin/xconsole/Makefile Mon Mar 17 09:24:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/15 21:25:33 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/17 09:24:11 mrg Exp $
.include
@@ -11,6 +11,7 @@ DPADD+= ${LIBUTIL} ${LIBXAW} ${LIBXMU} $
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
CPPFLAGS+=-DHAS_OPENPTY -DHAVE_UTIL_H
CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:27:37 UTC 2014
Modified Files:
src/sys/kern: vfs_vnode.c
Log Message:
Add fstrans_startnowait()/fstrans_done() to vrele_thread().
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/vfs_vnode.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/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.33 src/sys/kern/vfs_vnode.c:1.34
--- src/sys/kern/vfs_vnode.c:1.33 Wed Mar 5 09:37:29 2014
+++ src/sys/kern/vfs_vnode.c Mon Mar 17 09:27:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.33 2014/03/05 09:37:29 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.34 2014/03/17 09:27:37 hannken Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.33 2014/03/05 09:37:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.34 2014/03/17 09:27:37 hannken Exp $");
#define _VFS_VNODE_PRIVATE
@@ -820,17 +820,27 @@ vrele_async(vnode_t *vp)
static void
vrele_thread(void *cookie)
{
+ vnodelst_t skip_list;
vnode_t *vp;
+ struct mount *mp;
+
+ TAILQ_INIT(&skip_list);
+ mutex_enter(&vrele_lock);
for (;;) {
- mutex_enter(&vrele_lock);
while (TAILQ_EMPTY(&vrele_list)) {
vrele_gen++;
cv_broadcast(&vrele_cv);
cv_timedwait(&vrele_cv, &vrele_lock, hz);
+ TAILQ_CONCAT(&vrele_list, &skip_list, v_freelist);
}
vp = TAILQ_FIRST(&vrele_list);
+ mp = vp->v_mount;
TAILQ_REMOVE(&vrele_list, vp, v_freelist);
+ if (fstrans_start_nowait(mp, FSTRANS_LAZY) != 0) {
+ TAILQ_INSERT_TAIL(&skip_list, vp, v_freelist);
+ continue;
+ }
vrele_pending--;
mutex_exit(&vrele_lock);
@@ -840,6 +850,8 @@ vrele_thread(void *cookie)
*/
mutex_enter(vp->v_interlock);
vrelel(vp, 0);
+ fstrans_done(mp);
+ mutex_enter(&vrele_lock);
}
}
CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:28:37 UTC 2014
Modified Files:
src/sys/kern: vfs_subr.c
Log Message:
Change sysctl_kern_vnode() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.442 -r1.443 src/sys/kern/vfs_subr.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/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.442 src/sys/kern/vfs_subr.c:1.443
--- src/sys/kern/vfs_subr.c:1.442 Thu Feb 27 13:00:06 2014
+++ src/sys/kern/vfs_subr.c Mon Mar 17 09:28:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.442 2014/02/27 13:00:06 hannken Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.443 2014/03/17 09:28:37 hannken Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.442 2014/02/27 13:00:06 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.443 2014/03/17 09:28:37 hannken Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -611,7 +611,8 @@ sysctl_kern_vnode(SYSCTLFN_ARGS)
char *where = oldp;
size_t *sizep = oldlenp;
struct mount *mp, *nmp;
- vnode_t *vp, *mvp, vbuf;
+ vnode_t *vp, vbuf;
+ struct vnode_iterator *marker;
char *bp = where;
char *ewhere;
int error;
@@ -635,47 +636,29 @@ sysctl_kern_vnode(SYSCTLFN_ARGS)
if (vfs_busy(mp, &nmp)) {
continue;
}
- /* Allocate a marker vnode. */
- mvp = vnalloc(mp);
- /* Should never fail for mp != NULL */
- KASSERT(mvp != NULL);
- mutex_enter(&mntvnode_lock);
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp;
- vp = vunmark(mvp)) {
- vmark(mvp, vp);
- /*
- * Check that the vp is still associated with
- * this filesystem. RACE: could have been
- * recycled onto the same filesystem.
- */
- if (vp->v_mount != mp || vismarker(vp))
-continue;
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
if (bp + VPTRSZ + VNODESZ > ewhere) {
-(void)vunmark(mvp);
-mutex_exit(&mntvnode_lock);
-vnfree(mvp);
+vrele(vp);
+vfs_vnode_iterator_destroy(marker);
vfs_unbusy(mp, false, NULL);
sysctl_relock();
*sizep = bp - where;
return (ENOMEM);
}
memcpy(&vbuf, vp, VNODESZ);
- mutex_exit(&mntvnode_lock);
if ((error = copyout(&vp, bp, VPTRSZ)) ||
(error = copyout(&vbuf, bp + VPTRSZ, VNODESZ))) {
- mutex_enter(&mntvnode_lock);
-(void)vunmark(mvp);
-mutex_exit(&mntvnode_lock);
-vnfree(mvp);
+vrele(vp);
+vfs_vnode_iterator_destroy(marker);
vfs_unbusy(mp, false, NULL);
sysctl_relock();
return (error);
}
+ vrele(vp);
bp += VPTRSZ + VNODESZ;
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
- vnfree(mvp);
+ vfs_vnode_iterator_destroy(marker);
vfs_unbusy(mp, false, &nmp);
}
mutex_exit(&mountlist_lock);
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:29:20 UTC 2014
Modified Files:
src/sys/ufs/ffs: ffs_snapshot.c
Log Message:
Change snapshot_expunge() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/ufs/ffs/ffs_snapshot.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/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.132 src/sys/ufs/ffs/ffs_snapshot.c:1.133
--- src/sys/ufs/ffs/ffs_snapshot.c:1.132 Tue Dec 17 01:17:39 2013
+++ src/sys/ufs/ffs/ffs_snapshot.c Mon Mar 17 09:29:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.132 2013/12/17 01:17:39 joerg Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.133 2014/03/17 09:29:20 hannken Exp $ */
/*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.132 2013/12/17 01:17:39 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.133 2014/03/17 09:29:20 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -617,7 +617,8 @@ snapshot_expunge(struct mount *mp, struc
struct inode *xp;
struct lwp *l = curlwp;
struct vattr vat;
- struct vnode *logvp = NULL, *mvp = NULL, *xvp;
+ struct vnode *logvp = NULL, *xvp;
+ struct vnode_iterator *marker;
*snaplist = NULL;
/*
@@ -631,41 +632,18 @@ snapshot_expunge(struct mount *mp, struc
goto out;
}
/*
- * Allocate a marker vnode.
- */
- mvp = vnalloc(mp);
- /*
* We also calculate the needed size for the snapshot list.
*/
*snaplistsize = fs->fs_ncg + howmany(fs->fs_cssize, fs->fs_bsize) +
FSMAXSNAP + 1 /* superblock */ + 1 /* last block */ + 1 /* size */;
- mutex_enter(&mntvnode_lock);
- /*
- * NOTE: not using the TAILQ_FOREACH here since in this loop vgone()
- * and vclean() can be called indirectly
- */
- for (xvp = TAILQ_FIRST(&mp->mnt_vnodelist); xvp; xvp = vunmark(mvp)) {
- vmark(mvp, xvp);
- /*
- * Make sure this vnode wasn't reclaimed in getnewvnode().
- * Start over if it has (it won't be on the list anymore).
- */
- if (xvp->v_mount != mp || vismarker(xvp))
- continue;
- mutex_enter(xvp->v_interlock);
- if ((xvp->v_iflag & VI_XLOCK) ||
- xvp->v_usecount == 0 || xvp->v_type == VNON ||
- VTOI(xvp) == NULL ||
+
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &xvp)) {
+ if (xvp->v_type == VNON || VTOI(xvp) == NULL ||
(VTOI(xvp)->i_flags & SF_SNAPSHOT)) {
- mutex_exit(xvp->v_interlock);
+ vrele(xvp);
continue;
}
- mutex_exit(&mntvnode_lock);
- /*
- * XXXAD should increase vnode ref count to prevent it
- * disappearing or being recycled.
- */
- mutex_exit(xvp->v_interlock);
#ifdef DEBUG
if (snapdebug)
vprint("ffs_snapshot: busy vnode", xvp);
@@ -674,11 +652,11 @@ snapshot_expunge(struct mount *mp, struc
if (xvp != logvp) {
if (VOP_GETATTR(xvp, &vat, l->l_cred) == 0 &&
vat.va_nlink > 0) {
-mutex_enter(&mntvnode_lock);
+vrele(xvp);
continue;
}
if (ffs_checkfreefile(copy_fs, vp, xp->i_number)) {
-mutex_enter(&mntvnode_lock);
+vrele(xvp);
continue;
}
}
@@ -692,7 +670,8 @@ snapshot_expunge(struct mount *mp, struc
if (len > 0 && len < fs->fs_bsize) {
error = UFS_WAPBL_BEGIN(mp);
if (error) {
- (void)vunmark(mvp);
+ vrele(xvp);
+ vfs_vnode_iterator_destroy(marker);
goto out;
}
ffs_blkfree_snap(copy_fs, vp, db_get(xp, loc),
@@ -714,13 +693,14 @@ snapshot_expunge(struct mount *mp, struc
UFS_WAPBL_END(mp);
}
}
+ vrele(xvp);
if (error) {
- (void)vunmark(mvp);
+ vfs_vnode_iterator_destroy(marker);
goto out;
}
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
+ vfs_vnode_iterator_destroy(marker);
+
/*
* Create a preliminary list of preallocated snapshot blocks.
*/
@@ -741,8 +721,6 @@ snapshot_expunge(struct mount *mp, struc
(*snaplist)[0] = blkp - &(*snaplist)[0];
out:
- if (mvp != NULL)
- vnfree(mvp);
if (logvp != NULL)
vput(logvp);
if (error && *snaplist != NULL) {
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:29:55 UTC 2014
Modified Files:
src/sys/ufs/ffs: ffs_vfsops.c
Log Message:
Change ffs_sync() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.293 -r1.294 src/sys/ufs/ffs/ffs_vfsops.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/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.293 src/sys/ufs/ffs/ffs_vfsops.c:1.294
--- src/sys/ufs/ffs/ffs_vfsops.c:1.293 Wed Mar 5 09:37:29 2014
+++ src/sys/ufs/ffs/ffs_vfsops.c Mon Mar 17 09:29:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.293 2014/03/05 09:37:29 hannken Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.294 2014/03/17 09:29:55 hannken Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.293 2014/03/05 09:37:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.294 2014/03/17 09:29:55 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -1603,10 +1603,11 @@ ffs_statvfs(struct mount *mp, struct sta
int
ffs_sync(struct mount *mp, int waitfor, kauth_cred_t cred)
{
- struct vnode *vp, *mvp, *nvp;
+ struct vnode *vp;
struct inode *ip;
struct ufsmount *ump = VFSTOUFS(mp);
struct fs *fs;
+ struct vnode_iterator *marker;
int error, allerror = 0;
bool is_suspending;
@@ -1616,42 +1617,24 @@ ffs_sync(struct mount *mp, int waitfor,
panic("update: rofs mod");
}
- /* Allocate a marker vnode. */
- mvp = vnalloc(mp);
-
fstrans_start(mp, FSTRANS_SHARED);
is_suspending = (fstrans_getstate(mp) == FSTRANS_SUSPENDING);
/*
* Write back each (modified) inode.
*/
- mutex_enter(&mntvnode_lock);
-loop:
- /*
- * NOTE: not using the TAILQ_FOREACH here since in this loop vgone()
- * and vclean() can be called indirectly
- */
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = nvp) {
- nvp = TAILQ_NEXT(vp, v_mntvnodes);
- /*
- * If the vnode that we are about to sync is no longer
- * associated with this mount point, start over.
- */
- if (vp->v_mount != mp)
- goto loop;
- /*
- * Don't interfere with concurrent scans of this FS.
- */
- if (vismarker(vp))
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(vp);
continue;
- mutex_enter(vp->v_interlock);
+ }
ip = VTOI(vp);
-
/*
* Skip the vnode/inode if inaccessible.
*/
- if (ip == NULL || (vp->v_iflag & (VI_XLOCK | VI_CLEAN)) != 0 ||
- vp->v_type == VNON) {
- mutex_exit(vp->v_interlock);
+ if (ip == NULL || vp->v_type == VNON) {
+ vput(vp);
continue;
}
@@ -1674,22 +1657,11 @@ loop:
IN_MODIFY | IN_MODIFIED | IN_ACCESSED)) == 0 &&
(waitfor == MNT_LAZY || (LIST_EMPTY(&vp->v_dirtyblkhd) &&
UVM_OBJ_IS_CLEAN(&vp->v_uobj {
- mutex_exit(vp->v_interlock);
+ vput(vp);
continue;
}
if (vp->v_type == VBLK && is_suspending) {
- mutex_exit(vp->v_interlock);
- continue;
- }
- vmark(mvp, vp);
- mutex_exit(&mntvnode_lock);
- error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT);
- if (error) {
- mutex_enter(&mntvnode_lock);
- nvp = vunmark(mvp);
- if (error == ENOENT) {
-goto loop;
- }
+ vput(vp);
continue;
}
if (waitfor == MNT_LAZY) {
@@ -1706,10 +1678,9 @@ loop:
if (error)
allerror = error;
vput(vp);
- mutex_enter(&mntvnode_lock);
- nvp = vunmark(mvp);
}
- mutex_exit(&mntvnode_lock);
+ vfs_vnode_iterator_destroy(marker);
+
/*
* Force stale file system control information to be flushed.
*/
@@ -1721,10 +1692,6 @@ loop:
0, 0)) != 0)
allerror = error;
VOP_UNLOCK(ump->um_devvp);
- if (allerror == 0 && waitfor == MNT_WAIT && !mp->mnt_wapbl) {
- mutex_enter(&mntvnode_lock);
- goto loop;
- }
}
#if defined(QUOTA) || defined(QUOTA2)
qsync(mp);
@@ -1754,7 +1721,6 @@ loop:
#endif
fstrans_done(mp);
- vnfree(mvp);
return (allerror);
}
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:30:32 UTC 2014
Modified Files:
src/sys/ufs/ext2fs: ext2fs_vfsops.c
Log Message:
Change ext2fs_sync() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/ufs/ext2fs/ext2fs_vfsops.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/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.177 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.178
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.177 Wed Mar 5 09:37:29 2014
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Mon Mar 17 09:30:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.177 2014/03/05 09:37:29 hannken Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.178 2014/03/17 09:30:32 hannken Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.177 2014/03/05 09:37:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.178 2014/03/17 09:30:32 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -871,10 +871,11 @@ ext2fs_statvfs(struct mount *mp, struct
int
ext2fs_sync(struct mount *mp, int waitfor, kauth_cred_t cred)
{
- struct vnode *vp, *mvp;
+ struct vnode *vp;
struct inode *ip;
struct ufsmount *ump = VFSTOUFS(mp);
struct m_ext2fs *fs;
+ struct vnode_iterator *marker;
int error, allerror = 0;
fs = ump->um_e2fs;
@@ -883,43 +884,30 @@ ext2fs_sync(struct mount *mp, int waitfo
panic("update: rofs mod");
}
- /* Allocate a marker vnode. */
- mvp = vnalloc(mp);
-
/*
* Write back each (modified) inode.
*/
- mutex_enter(&mntvnode_lock);
-loop:
- /*
- * NOTE: not using the TAILQ_FOREACH here since in this loop vgone()
- * and vclean() can be called indirectly
- */
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
- vmark(mvp, vp);
- if (vp->v_mount != mp || vismarker(vp))
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(vp);
continue;
- mutex_enter(vp->v_interlock);
+ }
ip = VTOI(vp);
- if (ip == NULL || (vp->v_iflag & (VI_XLOCK|VI_CLEAN)) != 0 ||
- vp->v_type == VNON ||
- ((ip->i_flag &
- (IN_CHANGE | IN_UPDATE | IN_MODIFIED)) == 0 &&
- LIST_EMPTY(&vp->v_dirtyblkhd) &&
- UVM_OBJ_IS_CLEAN(&vp->v_uobj)))
- {
- mutex_exit(vp->v_interlock);
+ /*
+ * Skip the vnode/inode if inaccessible.
+ */
+ if (ip == NULL || vp->v_type == VNON) {
+ vput(vp);
continue;
}
- mutex_exit(&mntvnode_lock);
- error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT);
- if (error) {
- mutex_enter(&mntvnode_lock);
- if (error == ENOENT) {
-mutex_enter(&mntvnode_lock);
-(void)vunmark(mvp);
-goto loop;
- }
+
+ if (((ip->i_flag &
+ (IN_CHANGE | IN_UPDATE | IN_MODIFIED)) == 0 &&
+ LIST_EMPTY(&vp->v_dirtyblkhd) &&
+ UVM_OBJ_IS_CLEAN(&vp->v_uobj))) {
+ vput(vp);
continue;
}
if (vp->v_type == VREG && waitfor == MNT_LAZY)
@@ -930,10 +918,8 @@ loop:
if (error)
allerror = error;
vput(vp);
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
- vnfree(mvp);
+ vfs_vnode_iterator_destroy(marker);
/*
* Force stale file system control information to be flushed.
*/
CVS commit: src/sys/ufs/ufs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:31:35 UTC 2014
Modified Files:
src/sys/ufs/ufs: ufs_quota1.c
Log Message:
Change quota1_handle_cmd_quotaon() and q1sync() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/ufs/ufs/ufs_quota1.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/ufs/ufs/ufs_quota1.c
diff -u src/sys/ufs/ufs/ufs_quota1.c:1.18 src/sys/ufs/ufs/ufs_quota1.c:1.19
--- src/sys/ufs/ufs/ufs_quota1.c:1.18 Thu Feb 2 03:00:48 2012
+++ src/sys/ufs/ufs/ufs_quota1.c Mon Mar 17 09:31:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota1.c,v 1.18 2012/02/02 03:00:48 matt Exp $ */
+/* $NetBSD: ufs_quota1.c,v 1.19 2014/03/17 09:31:35 hannken Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.18 2012/02/02 03:00:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.19 2014/03/17 09:31:35 hannken Exp $");
#include
#include
@@ -304,7 +304,8 @@ quota1_handle_cmd_quotaon(struct lwp *l,
const char *fname)
{
struct mount *mp = ump->um_mountp;
- struct vnode *vp, **vpp, *mvp;
+ struct vnode *vp, **vpp;
+ struct vnode_iterator *marker;
struct dquot *dq;
int error;
struct pathbuf *pb;
@@ -366,41 +367,33 @@ quota1_handle_cmd_quotaon(struct lwp *l,
ump->umq1_itime[type] = dq->dq_itime;
dqrele(NULLVP, dq);
}
- /* Allocate a marker vnode. */
- mvp = vnalloc(mp);
/*
* Search vnodes associated with this mount point,
* adding references to quota file being opened.
* NB: only need to add dquot's for inodes being modified.
*/
- mutex_enter(&mntvnode_lock);
-again:
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
- vmark(mvp, vp);
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(vp);
+ continue;
+ }
mutex_enter(vp->v_interlock);
- if (VTOI(vp) == NULL || vp->v_mount != mp || vismarker(vp) ||
- vp->v_type == VNON || vp->v_writecount == 0 ||
- (vp->v_iflag & (VI_XLOCK | VI_CLEAN)) != 0) {
+ if (VTOI(vp) == NULL || vp->v_type == VNON ||
+ vp->v_writecount == 0) {
mutex_exit(vp->v_interlock);
+ vput(vp);
continue;
}
- mutex_exit(&mntvnode_lock);
- if (vget(vp, LK_EXCLUSIVE)) {
- mutex_enter(&mntvnode_lock);
- (void)vunmark(mvp);
- goto again;
- }
+ mutex_exit(vp->v_interlock);
if ((error = getinoquota(VTOI(vp))) != 0) {
vput(vp);
- mutex_enter(&mntvnode_lock);
- (void)vunmark(mvp);
break;
}
vput(vp);
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
- vnfree(mvp);
+ vfs_vnode_iterator_destroy(marker);
mutex_enter(&dqlock);
ump->umq1_qflags[type] &= ~QTF_OPENING;
@@ -421,21 +414,18 @@ quota1_handle_cmd_quotaoff(struct lwp *l
{
struct mount *mp = ump->um_mountp;
struct vnode *vp;
- struct vnode *qvp, *mvp;
+ struct vnode *qvp;
+ struct vnode_iterator *marker;
struct dquot *dq;
struct inode *ip;
kauth_cred_t cred;
int i, error;
- /* Allocate a marker vnode. */
- mvp = vnalloc(mp);
-
mutex_enter(&dqlock);
while ((ump->umq1_qflags[type] & (QTF_CLOSING | QTF_OPENING)) != 0)
cv_wait(&dqcv, &dqlock);
if ((qvp = ump->um_quotas[type]) == NULLVP) {
mutex_exit(&dqlock);
- vnfree(mvp);
return (0);
}
ump->umq1_qflags[type] |= QTF_CLOSING;
@@ -445,31 +435,24 @@ quota1_handle_cmd_quotaoff(struct lwp *l
* Search vnodes associated with this mount point,
* deleting any references to quota file being closed.
*/
- mutex_enter(&mntvnode_lock);
-again:
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
- vmark(mvp, vp);
- mutex_enter(vp->v_interlock);
- if (VTOI(vp) == NULL || vp->v_mount != mp || vismarker(vp) ||
- vp->v_type == VNON ||
- (vp->v_iflag & (VI_XLOCK | VI_CLEAN)) != 0) {
- mutex_exit(vp->v_interlock);
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(vp);
continue;
}
- mutex_exit(&mntvnode_lock);
- if (vget(vp, LK_EXCLUSIVE)) {
- mutex_enter(&mntvnode_lock);
- (void)vunmark(mvp);
- goto again;
- }
ip = VTOI(vp);
+ if (ip == NULL || vp->v_type == VNON) {
+ vput(vp);
+ continue;
+ }
dq = ip->i_dquot[type];
ip->i_dquot[type] = NODQUOT;
dqrele(vp, dq);
vput(vp);
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
+ vfs_vnode_iterator_destroy(marker);
#ifdef DIAGNOSTIC
dqflush(qvp);
#endif
@@ -759,7 +742,8 @@ int
q1sync(struct mount *mp)
{
struct ufsmount *ump = VFSTOUFS(mp);
- struct vnode *vp, *mvp;
+ struct vnode *vp;
+ struct vnode_iterator *marker;
struct dquot *dq;
int i, error;
@@ -773,32 +757,19 @@ q1sync(struct mount *mp)
if (i == MAXQUOTAS)
return (0);
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:33:20 UTC 2014
Modified Files:
src/sys/ufs/lfs: lfs_segment.c
Log Message:
Change vismarker() to VI_MARKER for lfs_writevnodes().
This operation has to be changed to vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/ufs/lfs/lfs_segment.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/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.233 src/sys/ufs/lfs/lfs_segment.c:1.234
--- src/sys/ufs/lfs/lfs_segment.c:1.233 Tue Oct 29 09:53:51 2013
+++ src/sys/ufs/lfs/lfs_segment.c Mon Mar 17 09:33:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.233 2013/10/29 09:53:51 hannken Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.234 2014/03/17 09:33:20 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.233 2013/10/29 09:53:51 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.234 2014/03/17 09:33:20 hannken Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -508,7 +508,7 @@ lfs_writevnodes(struct lfs *fs, struct m
}
mutex_enter(vp->v_interlock);
- if (vp->v_type == VNON || vismarker(vp) ||
+ if (vp->v_type == VNON || (vp->v_iflag & VI_MARKER) ||
(vp->v_iflag & VI_CLEAN) != 0) {
mutex_exit(vp->v_interlock);
continue;
CVS commit: src/sys/nfs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:34:51 UTC 2014
Modified Files:
src/sys/nfs: nfs_vfsops.c
Log Message:
Change nfs_sync() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/sys/nfs/nfs_vfsops.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/nfs/nfs_vfsops.c
diff -u src/sys/nfs/nfs_vfsops.c:1.224 src/sys/nfs/nfs_vfsops.c:1.225
--- src/sys/nfs/nfs_vfsops.c:1.224 Tue Feb 25 18:30:12 2014
+++ src/sys/nfs/nfs_vfsops.c Mon Mar 17 09:34:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vfsops.c,v 1.224 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: nfs_vfsops.c,v 1.225 2014/03/17 09:34:51 hannken Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.224 2014/02/25 18:30:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.225 2014/03/17 09:34:51 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_nfs.h"
@@ -945,51 +945,33 @@ extern int syncprt;
int
nfs_sync(struct mount *mp, int waitfor, kauth_cred_t cred)
{
- struct vnode *vp, *mvp;
+ struct vnode *vp;
+ struct vnode_iterator *marker;
int error, allerror = 0;
/*
* Force stale buffer cache information to be flushed.
*/
- mvp = vnalloc(mp);
-loop:
- /*
- * NOTE: not using the TAILQ_FOREACH here since in this loop vgone()
- * and vclean() can be called indirectly
- */
- mutex_enter(&mntvnode_lock);
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
- vmark(mvp, vp);
- if (vp->v_mount != mp || vismarker(vp))
- continue;
- mutex_enter(vp->v_interlock);
- /* XXX MNT_LAZY cannot be right? */
- if (waitfor == MNT_LAZY ||
- (LIST_EMPTY(&vp->v_dirtyblkhd) &&
- UVM_OBJ_IS_CLEAN(&vp->v_uobj))) {
- mutex_exit(vp->v_interlock);
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(vp);
continue;
}
- mutex_exit(&mntvnode_lock);
- error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT);
- if (error != 0) {
- if (error != ENOENT) {
-mutex_enter(&mntvnode_lock);
-continue;
- }
- (void)vunmark(mvp);
- goto loop;
+ if (LIST_EMPTY(&vp->v_dirtyblkhd) &&
+ UVM_OBJ_IS_CLEAN(&vp->v_uobj)) {
+ vput(vp);
+ continue;
}
error = VOP_FSYNC(vp, cred,
waitfor == MNT_WAIT ? FSYNC_WAIT : 0, 0, 0);
if (error)
allerror = error;
vput(vp);
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
- vnfree(mvp);
- return (allerror);
+ vfs_vnode_iterator_destroy(marker);
+ return allerror;
}
/*
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:34:16 UTC 2014
Modified Files:
src/sys/ufs/lfs: ulfs_quota1.c
Log Message:
Change lfsquota1_handle_cmd_quotaon() and lfs_q1sync()
to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/lfs/ulfs_quota1.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/ufs/lfs/ulfs_quota1.c
diff -u src/sys/ufs/lfs/ulfs_quota1.c:1.6 src/sys/ufs/lfs/ulfs_quota1.c:1.7
--- src/sys/ufs/lfs/ulfs_quota1.c:1.6 Sun Jul 28 01:10:49 2013
+++ src/sys/ufs/lfs/ulfs_quota1.c Mon Mar 17 09:34:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota1.c,v 1.6 2013/07/28 01:10:49 dholland Exp $ */
+/* $NetBSD: ulfs_quota1.c,v 1.7 2014/03/17 09:34:16 hannken Exp $ */
/* from NetBSD: ufs_quota1.c,v 1.18 2012/02/02 03:00:48 matt Exp */
/*
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota1.c,v 1.6 2013/07/28 01:10:49 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota1.c,v 1.7 2014/03/17 09:34:16 hannken Exp $");
#include
#include
@@ -307,7 +307,8 @@ lfsquota1_handle_cmd_quotaon(struct lwp
{
struct mount *mp = ump->um_mountp;
struct lfs *fs = ump->um_lfs;
- struct vnode *vp, **vpp, *mvp;
+ struct vnode *vp, **vpp;
+ struct vnode_iterator *marker;
struct dquot *dq;
int error;
struct pathbuf *pb;
@@ -363,41 +364,33 @@ lfsquota1_handle_cmd_quotaon(struct lwp
ump->umq1_itime[type] = dq->dq_itime;
lfs_dqrele(NULLVP, dq);
}
- /* Allocate a marker vnode. */
- mvp = vnalloc(mp);
/*
* Search vnodes associated with this mount point,
* adding references to quota file being opened.
* NB: only need to add dquot's for inodes being modified.
*/
- mutex_enter(&mntvnode_lock);
-again:
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
- vmark(mvp, vp);
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(vp);
+ continue;
+ }
mutex_enter(vp->v_interlock);
- if (VTOI(vp) == NULL || vp->v_mount != mp || vismarker(vp) ||
- vp->v_type == VNON || vp->v_writecount == 0 ||
- (vp->v_iflag & (VI_XLOCK | VI_CLEAN)) != 0) {
+ if (VTOI(vp) == NULL || vp->v_type == VNON ||
+ vp->v_writecount == 0) {
mutex_exit(vp->v_interlock);
+ vput(vp);
continue;
}
- mutex_exit(&mntvnode_lock);
- if (vget(vp, LK_EXCLUSIVE)) {
- mutex_enter(&mntvnode_lock);
- (void)vunmark(mvp);
- goto again;
- }
+ mutex_exit(vp->v_interlock);
if ((error = lfs_getinoquota(VTOI(vp))) != 0) {
vput(vp);
- mutex_enter(&mntvnode_lock);
- (void)vunmark(mvp);
break;
}
vput(vp);
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
- vnfree(mvp);
+ vfs_vnode_iterator_destroy(marker);
mutex_enter(&lfs_dqlock);
ump->umq1_qflags[type] &= ~QTF_OPENING;
@@ -419,21 +412,18 @@ lfsquota1_handle_cmd_quotaoff(struct lwp
struct mount *mp = ump->um_mountp;
struct lfs *fs = ump->um_lfs;
struct vnode *vp;
- struct vnode *qvp, *mvp;
+ struct vnode *qvp;
+ struct vnode_iterator *marker;
struct dquot *dq;
struct inode *ip;
kauth_cred_t cred;
int i, error;
- /* Allocate a marker vnode. */
- mvp = vnalloc(mp);
-
mutex_enter(&lfs_dqlock);
while ((ump->umq1_qflags[type] & (QTF_CLOSING | QTF_OPENING)) != 0)
cv_wait(&lfs_dqcv, &lfs_dqlock);
if ((qvp = ump->um_quotas[type]) == NULLVP) {
mutex_exit(&lfs_dqlock);
- vnfree(mvp);
return (0);
}
ump->umq1_qflags[type] |= QTF_CLOSING;
@@ -443,31 +433,24 @@ lfsquota1_handle_cmd_quotaoff(struct lwp
* Search vnodes associated with this mount point,
* deleting any references to quota file being closed.
*/
- mutex_enter(&mntvnode_lock);
-again:
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
- vmark(mvp, vp);
- mutex_enter(vp->v_interlock);
- if (VTOI(vp) == NULL || vp->v_mount != mp || vismarker(vp) ||
- vp->v_type == VNON ||
- (vp->v_iflag & (VI_XLOCK | VI_CLEAN)) != 0) {
- mutex_exit(vp->v_interlock);
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(vp);
continue;
}
- mutex_exit(&mntvnode_lock);
- if (vget(vp, LK_EXCLUSIVE)) {
- mutex_enter(&mntvnode_lock);
- (void)vunmark(mvp);
- goto again;
- }
ip = VTOI(vp);
+ if (ip == NULL || vp->v_type == VNON) {
+ vput(vp);
+ continue;
+ }
dq = ip->i_dquot[type];
ip->i_dquot[type] = NODQUOT;
lfs_dqrele(vp, dq);
vput(vp);
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
+ vfs_vnode_iterator_destroy(marker);
#ifdef DIAGNOSTIC
lfs_dqflush(qvp);
#endif
@@ -757,7 +740,8 @@ int
lfs_q1sync(struct mount *mp)
{
struct ulfsmount *ump = VFSTOULFS(mp);
- struct vnode *vp, *mvp;
+ struct vnode *vp;
+ struct vnode_iterator *marker;
st
CVS commit: src/sys/nfs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:35:24 UTC 2014
Modified Files:
src/sys/nfs: nfs_subs.c
Log Message:
Change nfs_clearcommit() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/sys/nfs/nfs_subs.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/nfs/nfs_subs.c
diff -u src/sys/nfs/nfs_subs.c:1.224 src/sys/nfs/nfs_subs.c:1.225
--- src/sys/nfs/nfs_subs.c:1.224 Wed Sep 18 23:27:38 2013
+++ src/sys/nfs/nfs_subs.c Mon Mar 17 09:35:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_subs.c,v 1.224 2013/09/18 23:27:38 pgoyette Exp $ */
+/* $NetBSD: nfs_subs.c,v 1.225 2014/03/17 09:35:24 hannken Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.224 2013/09/18 23:27:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.225 2014/03/17 09:35:24 hannken Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -1754,22 +1754,21 @@ void
nfs_clearcommit(struct mount *mp)
{
struct vnode *vp;
+ struct vnode_iterator *marker;
struct nfsnode *np;
struct vm_page *pg;
struct nfsmount *nmp = VFSTONFS(mp);
rw_enter(&nmp->nm_writeverflock, RW_WRITER);
- mutex_enter(&mntvnode_lock);
- TAILQ_FOREACH(vp, &mp->mnt_vnodelist, v_mntvnodes) {
- KASSERT(vp->v_mount == mp);
- if (vp->v_type != VREG)
- continue;
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
mutex_enter(vp->v_interlock);
- if (vp->v_iflag & (VI_XLOCK | VI_CLEAN)) {
+ np = VTONFS(vp);
+ if (vp->v_type != VREG || vp->v_mount != mp || np == NULL) {
mutex_exit(vp->v_interlock);
+ vrele(vp);
continue;
}
- np = VTONFS(vp);
np->n_pushlo = np->n_pushhi = np->n_pushedlo =
np->n_pushedhi = 0;
np->n_commitflags &=
@@ -1778,8 +1777,9 @@ nfs_clearcommit(struct mount *mp)
pg->flags &= ~PG_NEEDCOMMIT;
}
mutex_exit(vp->v_interlock);
+ vrele(vp);
}
- mutex_exit(&mntvnode_lock);
+ vfs_vnode_iterator_destroy(marker);
mutex_enter(&nmp->nm_lock);
nmp->nm_iflag &= ~NFSMNT_STALEWRITEVERF;
mutex_exit(&nmp->nm_lock);
CVS commit: src/sys/fs/msdosfs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:35:59 UTC 2014
Modified Files:
src/sys/fs/msdosfs: msdosfs_vfsops.c
Log Message:
Change msdosfs_sync() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/fs/msdosfs/msdosfs_vfsops.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/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.104 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.105
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.104 Tue Feb 25 18:30:10 2014
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Mon Mar 17 09:35:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.104 2014/02/25 18:30:10 pooka Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.105 2014/03/17 09:35:59 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.104 2014/02/25 18:30:10 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.105 2014/03/17 09:35:59 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -946,7 +946,8 @@ msdosfs_statvfs(struct mount *mp, struct
int
msdosfs_sync(struct mount *mp, int waitfor, kauth_cred_t cred)
{
- struct vnode *vp, *mvp;
+ struct vnode *vp;
+ struct vnode_iterator *marker;
struct denode *dep;
struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
int error, allerror = 0;
@@ -962,46 +963,32 @@ msdosfs_sync(struct mount *mp, int waitf
/* update FATs here */
}
}
- /* Allocate a marker vnode. */
- mvp = vnalloc(mp);
fstrans_start(mp, FSTRANS_SHARED);
/*
* Write back each (modified) denode.
*/
- mutex_enter(&mntvnode_lock);
-loop:
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
- vmark(mvp, vp);
- if (vp->v_mount != mp || vismarker(vp))
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(vp);
continue;
- mutex_enter(vp->v_interlock);
+ }
dep = VTODE(vp);
if (waitfor == MNT_LAZY || vp->v_type == VNON ||
dep == NULL || (((dep->de_flag &
(DE_ACCESS | DE_CREATE | DE_UPDATE | DE_MODIFIED)) == 0) &&
(LIST_EMPTY(&vp->v_dirtyblkhd) &&
UVM_OBJ_IS_CLEAN(&vp->v_uobj {
- mutex_exit(vp->v_interlock);
- continue;
- }
- mutex_exit(&mntvnode_lock);
- error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT);
- if (error) {
- mutex_enter(&mntvnode_lock);
- if (error == ENOENT) {
-(void)vunmark(mvp);
-goto loop;
- }
+ vput(vp);
continue;
}
if ((error = VOP_FSYNC(vp, cred,
waitfor == MNT_WAIT ? FSYNC_WAIT : 0, 0, 0)) != 0)
allerror = error;
vput(vp);
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
- vnfree(mvp);
+ vfs_vnode_iterator_destroy(marker);
/*
* Force stale file system control information to be flushed.
CVS commit: src/sys/fs/smbfs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:37:09 UTC 2014
Modified Files:
src/sys/fs/smbfs: smbfs_vfsops.c
Log Message:
Change smbfs_sync() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/fs/smbfs/smbfs_vfsops.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/fs/smbfs/smbfs_vfsops.c
diff -u src/sys/fs/smbfs/smbfs_vfsops.c:1.97 src/sys/fs/smbfs/smbfs_vfsops.c:1.98
--- src/sys/fs/smbfs/smbfs_vfsops.c:1.97 Tue Feb 25 18:30:11 2014
+++ src/sys/fs/smbfs/smbfs_vfsops.c Mon Mar 17 09:37:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_vfsops.c,v 1.97 2014/02/25 18:30:11 pooka Exp $ */
+/* $NetBSD: smbfs_vfsops.c,v 1.98 2014/03/17 09:37:09 hannken Exp $ */
/*
* Copyright (c) 2000-2001, Boris Popov
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: smbfs_vfsops.c,v 1.97 2014/02/25 18:30:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_vfsops.c,v 1.98 2014/03/17 09:37:09 hannken Exp $");
#include
#include
@@ -406,45 +406,27 @@ smbfs_statvfs(struct mount *mp, struct s
int
smbfs_sync(struct mount *mp, int waitfor, kauth_cred_t cred)
{
- struct vnode *vp, *mvp;
+ struct vnode *vp;
+ struct vnode_iterator *marker;
struct smbnode *np;
int error, allerror = 0;
- /* Allocate a marker vnode. */
- mvp = vnalloc(mp);
- /*
- * Force stale buffer cache information to be flushed.
- */
- mutex_enter(&mntvnode_lock);
-loop:
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
- vmark(mvp, vp);
- /*
- * If the vnode that we are about to sync is no longer
- * associated with this mount point, start over.
- */
- if (vp->v_mount != mp || vismarker(vp))
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(vp);
continue;
- mutex_enter(vp->v_interlock);
+ }
np = VTOSMB(vp);
if (np == NULL) {
- mutex_exit(vp->v_interlock);
+ vput(vp);
continue;
}
if ((vp->v_type == VNON || (np->n_flag & NMODIFIED) == 0) &&
LIST_EMPTY(&vp->v_dirtyblkhd) &&
vp->v_uobj.uo_npages == 0) {
- mutex_exit(vp->v_interlock);
- continue;
- }
- mutex_exit(&mntvnode_lock);
- error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT);
- if (error) {
- mutex_enter(&mntvnode_lock);
- if (error == ENOENT) {
-(void)vunmark(mvp);
-goto loop;
- }
+ vput(vp);
continue;
}
error = VOP_FSYNC(vp, cred,
@@ -452,10 +434,8 @@ loop:
if (error)
allerror = error;
vput(vp);
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
- vnfree(mvp);
+ vfs_vnode_iterator_destroy(marker);
return (allerror);
}
CVS commit: src/sys/fs/puffs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:36:35 UTC 2014
Modified Files:
src/sys/fs/puffs: puffs_vfsops.c
Log Message:
Change pageflush() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/fs/puffs/puffs_vfsops.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/fs/puffs/puffs_vfsops.c
diff -u src/sys/fs/puffs/puffs_vfsops.c:1.107 src/sys/fs/puffs/puffs_vfsops.c:1.108
--- src/sys/fs/puffs/puffs_vfsops.c:1.107 Wed Jan 16 21:10:14 2013
+++ src/sys/fs/puffs/puffs_vfsops.c Mon Mar 17 09:36:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vfsops.c,v 1.107 2013/01/16 21:10:14 pooka Exp $ */
+/* $NetBSD: puffs_vfsops.c,v 1.108 2014/03/17 09:36:34 hannken Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.107 2013/01/16 21:10:14 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.108 2014/03/17 09:36:34 hannken Exp $");
#include
#include
@@ -518,37 +518,21 @@ static int
pageflush(struct mount *mp, kauth_cred_t cred, int waitfor)
{
struct puffs_node *pn;
- struct vnode *vp, *mvp;
+ struct vnode *vp;
+ struct vnode_iterator *marker;
int error, rv, fsyncwait;
error = 0;
fsyncwait = (waitfor == MNT_WAIT) ? FSYNC_WAIT : 0;
- /* Allocate a marker vnode. */
- mvp = vnalloc(mp);
-
/*
* Sync all cached data from regular vnodes (which are not
* currently locked, see below). After this we call VFS_SYNC
* for the fs server, which should handle data and metadata for
* all the nodes it knows to exist.
*/
- mutex_enter(&mntvnode_lock);
- loop:
- for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
- vmark(mvp, vp);
- if (vp->v_mount != mp || vismarker(vp))
- continue;
-
- mutex_enter(vp->v_interlock);
- pn = VPTOPP(vp);
- if (vp->v_type != VREG || UVM_OBJ_IS_CLEAN(&vp->v_uobj)) {
- mutex_exit(vp->v_interlock);
- continue;
- }
-
- mutex_exit(&mntvnode_lock);
-
+ vfs_vnode_iterator_init(mp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
/*
* Here we try to get a reference to the vnode and to
* lock it. This is mostly cargo-culted, but I will
@@ -564,13 +548,14 @@ pageflush(struct mount *mp, kauth_cred_t
* vnodes through other routes in any case. So there,
* sync() doesn't actually sync. Happy now?
*/
- rv = vget(vp, LK_EXCLUSIVE | LK_NOWAIT);
- if (rv) {
- mutex_enter(&mntvnode_lock);
- if (rv == ENOENT) {
-(void)vunmark(mvp);
-goto loop;
- }
+ error = vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT);
+ if (error) {
+ vrele(vp);
+ continue;
+ }
+ pn = VPTOPP(vp);
+ if (vp->v_type != VREG || UVM_OBJ_IS_CLEAN(&vp->v_uobj)) {
+ vput(vp);
continue;
}
@@ -589,10 +574,8 @@ pageflush(struct mount *mp, kauth_cred_t
if (rv)
error = rv;
vput(vp);
- mutex_enter(&mntvnode_lock);
}
- mutex_exit(&mntvnode_lock);
- vnfree(mvp);
+ vfs_vnode_iterator_destroy(marker);
return error;
}
CVS import: xsrc/external/mit/xfwp/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:37:33 UTC 2014 Update of /cvsroot/xsrc/external/mit/xfwp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv853 Log Message: initial import of xfwp-1.0.3 Status: Vendor Tag: xorg Release Tags: xfwp-1-0-3 U xsrc/external/mit/xfwp/dist/Makefile.am U xsrc/external/mit/xfwp/dist/io.h U xsrc/external/mit/xfwp/dist/config.sub U xsrc/external/mit/xfwp/dist/config.guess U xsrc/external/mit/xfwp/dist/misc.h U xsrc/external/mit/xfwp/dist/NEWS U xsrc/external/mit/xfwp/dist/pm.c U xsrc/external/mit/xfwp/dist/INSTALL U xsrc/external/mit/xfwp/dist/Makefile.in U xsrc/external/mit/xfwp/dist/xfwp.c U xsrc/external/mit/xfwp/dist/transport.h U xsrc/external/mit/xfwp/dist/configure U xsrc/external/mit/xfwp/dist/aclocal.m4 U xsrc/external/mit/xfwp/dist/missing U xsrc/external/mit/xfwp/dist/io.c U xsrc/external/mit/xfwp/dist/install-sh U xsrc/external/mit/xfwp/dist/depcomp U xsrc/external/mit/xfwp/dist/configure.ac U xsrc/external/mit/xfwp/dist/ChangeLog U xsrc/external/mit/xfwp/dist/README U xsrc/external/mit/xfwp/dist/transport.c U xsrc/external/mit/xfwp/dist/AUTHORS C xsrc/external/mit/xfwp/dist/compile U xsrc/external/mit/xfwp/dist/xfwp.h U xsrc/external/mit/xfwp/dist/xfwp.man U xsrc/external/mit/xfwp/dist/config.h.in U xsrc/external/mit/xfwp/dist/pm.h U xsrc/external/mit/xfwp/dist/COPYING U xsrc/external/mit/xfwp/dist/misc.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xfwp/dist
CVS import: xsrc/external/mit/xload/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:37:37 UTC 2014 Update of /cvsroot/xsrc/external/mit/xload/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12270 Log Message: initial import of xload-1.1.2 Status: Vendor Tag: xorg Release Tags: xload-1-1-2 U xsrc/external/mit/xload/dist/configure.ac U xsrc/external/mit/xload/dist/configure U xsrc/external/mit/xload/dist/config.sub U xsrc/external/mit/xload/dist/xload.bit U xsrc/external/mit/xload/dist/INSTALL U xsrc/external/mit/xload/dist/xload.h U xsrc/external/mit/xload/dist/config.h.in U xsrc/external/mit/xload/dist/ChangeLog U xsrc/external/mit/xload/dist/get_load.c U xsrc/external/mit/xload/dist/get_rload.c U xsrc/external/mit/xload/dist/Makefile.am U xsrc/external/mit/xload/dist/README U xsrc/external/mit/xload/dist/missing U xsrc/external/mit/xload/dist/depcomp U xsrc/external/mit/xload/dist/config.guess U xsrc/external/mit/xload/dist/Makefile.in U xsrc/external/mit/xload/dist/xload.c U xsrc/external/mit/xload/dist/COPYING C xsrc/external/mit/xload/dist/compile U xsrc/external/mit/xload/dist/aclocal.m4 U xsrc/external/mit/xload/dist/install-sh U xsrc/external/mit/xload/dist/app-defaults/XLoad U xsrc/external/mit/xload/dist/man/Makefile.in U xsrc/external/mit/xload/dist/man/Makefile.am U xsrc/external/mit/xload/dist/man/xload.man U xsrc/external/mit/xload/dist/m4/ax_define_dir.m4 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xload/dist
CVS import: xsrc/external/mit/xhost/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:37:34 UTC 2014 Update of /cvsroot/xsrc/external/mit/xhost/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3161 Log Message: initial import of xhost-1.0.6 Status: Vendor Tag: xorg Release Tags: xhost-1-0-6 U xsrc/external/mit/xhost/dist/configure.ac U xsrc/external/mit/xhost/dist/COPYING U xsrc/external/mit/xhost/dist/missing U xsrc/external/mit/xhost/dist/Makefile.in U xsrc/external/mit/xhost/dist/AUTHORS N xsrc/external/mit/xhost/dist/compile U xsrc/external/mit/xhost/dist/aclocal.m4 U xsrc/external/mit/xhost/dist/install-sh U xsrc/external/mit/xhost/dist/README U xsrc/external/mit/xhost/dist/Makefile.am U xsrc/external/mit/xhost/dist/depcomp U xsrc/external/mit/xhost/dist/configure U xsrc/external/mit/xhost/dist/config.h.in U xsrc/external/mit/xhost/dist/ChangeLog U xsrc/external/mit/xhost/dist/INSTALL U xsrc/external/mit/xhost/dist/xhost.c U xsrc/external/mit/xhost/dist/config.guess U xsrc/external/mit/xhost/dist/config.sub U xsrc/external/mit/xhost/dist/man/Makefile.in U xsrc/external/mit/xhost/dist/man/Makefile.am U xsrc/external/mit/xhost/dist/man/xhost.man No conflicts created by this import
CVS import: xsrc/external/mit/xfindproxy/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:37:32 UTC 2014 Update of /cvsroot/xsrc/external/mit/xfindproxy/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10657 Log Message: initial import of xfindproxy-1.0.3 Status: Vendor Tag: xorg Release Tags: xfindproxy-1-0-3 U xsrc/external/mit/xfindproxy/dist/xfindproxy.man U xsrc/external/mit/xfindproxy/dist/configure.ac U xsrc/external/mit/xfindproxy/dist/ChangeLog U xsrc/external/mit/xfindproxy/dist/depcomp U xsrc/external/mit/xfindproxy/dist/missing U xsrc/external/mit/xfindproxy/dist/configure U xsrc/external/mit/xfindproxy/dist/README U xsrc/external/mit/xfindproxy/dist/COPYING U xsrc/external/mit/xfindproxy/dist/config.sub U xsrc/external/mit/xfindproxy/dist/xfindproxy.c U xsrc/external/mit/xfindproxy/dist/NEWS C xsrc/external/mit/xfindproxy/dist/compile U xsrc/external/mit/xfindproxy/dist/AUTHORS U xsrc/external/mit/xfindproxy/dist/config.h.in U xsrc/external/mit/xfindproxy/dist/Makefile.am U xsrc/external/mit/xfindproxy/dist/Makefile.in U xsrc/external/mit/xfindproxy/dist/xfindproxy.h U xsrc/external/mit/xfindproxy/dist/install-sh U xsrc/external/mit/xfindproxy/dist/aclocal.m4 U xsrc/external/mit/xfindproxy/dist/INSTALL U xsrc/external/mit/xfindproxy/dist/config.guess 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xfindproxy/dist
CVS import: xsrc/external/mit/xinit/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:37:36 UTC 2014 Update of /cvsroot/xsrc/external/mit/xinit/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11013 Log Message: initial import of xinit-1.3.3 Status: Vendor Tag: xorg Release Tags: xinit-1-3-3 U xsrc/external/mit/xinit/dist/configure U xsrc/external/mit/xinit/dist/configure.ac U xsrc/external/mit/xinit/dist/install-sh U xsrc/external/mit/xinit/dist/cpprules.in U xsrc/external/mit/xinit/dist/aclocal.m4 U xsrc/external/mit/xinit/dist/ChangeLog U xsrc/external/mit/xinit/dist/INSTALL U xsrc/external/mit/xinit/dist/README C xsrc/external/mit/xinit/dist/startx.cpp U xsrc/external/mit/xinit/dist/config.h.in U xsrc/external/mit/xinit/dist/COPYING U xsrc/external/mit/xinit/dist/config.sub U xsrc/external/mit/xinit/dist/Makefile.am C xsrc/external/mit/xinit/dist/xinit.c C xsrc/external/mit/xinit/dist/compile U xsrc/external/mit/xinit/dist/Makefile.in U xsrc/external/mit/xinit/dist/autogen.sh C xsrc/external/mit/xinit/dist/xinitrc.cpp U xsrc/external/mit/xinit/dist/config.guess U xsrc/external/mit/xinit/dist/missing U xsrc/external/mit/xinit/dist/depcomp U xsrc/external/mit/xinit/dist/launchd/console_redirect.h U xsrc/external/mit/xinit/dist/launchd/Makefile.am U xsrc/external/mit/xinit/dist/launchd/Makefile.in U xsrc/external/mit/xinit/dist/launchd/console_redirect.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/server.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx_types.h U xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.am U xsrc/external/mit/xinit/dist/launchd/privileged_startx/10-tmpdirs.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/20-font_cache.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.plist.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.defs U xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.in U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/client.c U xsrc/external/mit/xinit/dist/launchd/user_startx/launchd_startx.c U xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.am U xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.in U xsrc/external/mit/xinit/dist/launchd/user_startx/startx.plist.cpp U xsrc/external/mit/xinit/dist/man/Makefile.am U xsrc/external/mit/xinit/dist/man/xinit.man U xsrc/external/mit/xinit/dist/man/Makefile.in U xsrc/external/mit/xinit/dist/man/startx.man 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xinit/dist
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: hannken
Date: Mon Mar 17 09:37:41 UTC 2014
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vfsops.c
Log Message:
Change zfs_sync() to use vfs_vnode_iterator.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.8 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.9
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.8 Mon Oct 15 23:08:19 2012
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c Mon Mar 17 09:37:41 2014
@@ -153,7 +153,8 @@ zfs_sync(vfs_t *vfsp, int flag, cred_t *
{
zfsvfs_t *zfsvfs = vfsp->vfs_data;
znode_t *zp;
- vnode_t *vp, *nvp, *mvp;
+ vnode_t *vp;
+ struct vnode_iterator *marker;
dmu_tx_t *tx;
int error;
@@ -167,51 +168,26 @@ zfs_sync(vfs_t *vfsp, int flag, cred_t *
if (panicstr)
return (0);
- /* Allocate a marker vnode. */
- mvp = vnalloc(vfsp);
-
/*
* On NetBSD, we need to push out atime updates. Solaris does
* this during VOP_INACTIVE, but that does not work well with the
* BSD VFS, so we do it in batch here.
*/
- mutex_enter(&mntvnode_lock);
-loop:
- for (vp = TAILQ_FIRST(&vfsp->mnt_vnodelist); vp; vp = nvp) {
- nvp = TAILQ_NEXT(vp, v_mntvnodes);
- /*
- * If the vnode that we are about to sync is no
- * longer associated with this mount point, start
- * over.
- */
- if (vp->v_mount != vfsp)
- goto loop;
- /*
- * Don't interfere with concurrent scans of this FS.
- */
- if (vismarker(vp))
+ vfs_vnode_iterator_init(vfsp, &marker);
+ while (vfs_vnode_iterator_next(marker, &vp)) {
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error) {
+ vrele(vp);
continue;
+ }
/*
* Skip the vnode/inode if inaccessible, or if the
* atime is clean.
*/
- mutex_enter(vp->v_interlock);
zp = VTOZ(vp);
if (zp == NULL || vp->v_type == VNON ||
- (vp->v_iflag & (VI_XLOCK | VI_CLEAN)) != 0 ||
zp->z_atime_dirty == 0 || zp->z_unlinked) {
- mutex_exit(vp->v_interlock);
- continue;
- }
- vmark(mvp, vp);
- mutex_exit(&mntvnode_lock);
- error = vget(vp, LK_EXCLUSIVE);
- if (error) {
- mutex_enter(&mntvnode_lock);
- nvp = vunmark(mvp);
- if (error == ENOENT) {
-goto loop;
- }
+ vput(vp);
continue;
}
tx = dmu_tx_create(zfsvfs->z_os);
@@ -227,10 +203,8 @@ loop:
dmu_tx_commit(tx);
}
vput(vp);
- mutex_enter(&mntvnode_lock);
- nvp = vunmark(mvp);
}
- mutex_exit(&mntvnode_lock);
+ vfs_vnode_iterator_destroy(marker);
/*
* SYNC_ATTR is used by fsflush() to force old filesystems like UFS
@@ -274,8 +248,6 @@ loop:
spa_sync_allpools();
}
- vnfree(nvp);
-
return (0);
}
CVS import: xsrc/external/mit/xlsclients/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:37:38 UTC 2014 Update of /cvsroot/xsrc/external/mit/xlsclients/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26548 Log Message: initial import of xlsclients-1.1.3 Status: Vendor Tag: xorg Release Tags: xlsclients-1-1-3 U xsrc/external/mit/xlsclients/dist/aclocal.m4 U xsrc/external/mit/xlsclients/dist/COPYING U xsrc/external/mit/xlsclients/dist/depcomp U xsrc/external/mit/xlsclients/dist/install-sh U xsrc/external/mit/xlsclients/dist/config.guess U xsrc/external/mit/xlsclients/dist/README U xsrc/external/mit/xlsclients/dist/strnlen.c U xsrc/external/mit/xlsclients/dist/compile U xsrc/external/mit/xlsclients/dist/config.h.in U xsrc/external/mit/xlsclients/dist/missing U xsrc/external/mit/xlsclients/dist/strnlen.h U xsrc/external/mit/xlsclients/dist/Makefile.am U xsrc/external/mit/xlsclients/dist/config.sub U xsrc/external/mit/xlsclients/dist/INSTALL U xsrc/external/mit/xlsclients/dist/Makefile.in U xsrc/external/mit/xlsclients/dist/xlsclients.c U xsrc/external/mit/xlsclients/dist/configure U xsrc/external/mit/xlsclients/dist/configure.ac U xsrc/external/mit/xlsclients/dist/ChangeLog U xsrc/external/mit/xlsclients/dist/man/xlsclients.man U xsrc/external/mit/xlsclients/dist/man/Makefile.am U xsrc/external/mit/xlsclients/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xman/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 09:37:39 UTC 2014 Update of /cvsroot/xsrc/external/mit/xman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22554 Log Message: initial import of xman-1.1.3 Status: Vendor Tag: xorg Release Tags: xman-1-1-3 U xsrc/external/mit/xman/dist/README U xsrc/external/mit/xman/dist/xman.help C xsrc/external/mit/xman/dist/handler.c U xsrc/external/mit/xman/dist/icon_open.h U xsrc/external/mit/xman/dist/Makefile.am N xsrc/external/mit/xman/dist/compile C xsrc/external/mit/xman/dist/misc.c U xsrc/external/mit/xman/dist/buttons.c U xsrc/external/mit/xman/dist/iconclosed.h U xsrc/external/mit/xman/dist/COPYING U xsrc/external/mit/xman/dist/vendor.c U xsrc/external/mit/xman/dist/configure.ac U xsrc/external/mit/xman/dist/config.sub U xsrc/external/mit/xman/dist/man.c U xsrc/external/mit/xman/dist/Makefile.in U xsrc/external/mit/xman/dist/main.c U xsrc/external/mit/xman/dist/configure U xsrc/external/mit/xman/dist/depcomp U xsrc/external/mit/xman/dist/missing U xsrc/external/mit/xman/dist/globals.c U xsrc/external/mit/xman/dist/ScrollByL.h U xsrc/external/mit/xman/dist/ChangeLog U xsrc/external/mit/xman/dist/icon_help.h U xsrc/external/mit/xman/dist/help.c U xsrc/external/mit/xman/dist/install-sh U xsrc/external/mit/xman/dist/man.h U xsrc/external/mit/xman/dist/search.c U xsrc/external/mit/xman/dist/INSTALL C xsrc/external/mit/xman/dist/vendor.h U xsrc/external/mit/xman/dist/aclocal.m4 U xsrc/external/mit/xman/dist/defs.h U xsrc/external/mit/xman/dist/ScrollByLP.h U xsrc/external/mit/xman/dist/ScrollByL.c U xsrc/external/mit/xman/dist/globals.h U xsrc/external/mit/xman/dist/config.guess U xsrc/external/mit/xman/dist/tkfuncs.c U xsrc/external/mit/xman/dist/config.h.in U xsrc/external/mit/xman/dist/man/Makefile.in U xsrc/external/mit/xman/dist/man/xman.man U xsrc/external/mit/xman/dist/man/Makefile.am U xsrc/external/mit/xman/dist/app-defaults/Xman 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xman/dist
CVS commit: src/external/mit/xorg/bin/xlsclients
Module Name:src
Committed By: mrg
Date: Mon Mar 17 09:46:10 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xlsclients: Makefile
Log Message:
update for xlsclients 1.1.3.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xlsclients/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.5 src/external/mit/xorg/bin/xlsclients/Makefile:1.6
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.5 Sat Jul 23 07:11:48 2011
+++ src/external/mit/xorg/bin/xlsclients/Makefile Mon Mar 17 09:46:10 2014
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2011/07/23 07:11:48 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/17 09:46:10 mrg Exp $
.include
PROG= xlsclients
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN \
+ -DPACKAGE_STRING=\"1.1.3\"
#BUILDSYMLINKS= xlscli.man xlsclients.man
CVS import: xsrc/external/mit/xprop/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 10:00:24 UTC 2014 Update of /cvsroot/xsrc/external/mit/xprop/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20111 Log Message: initial import of xprop-1.2.2 Status: Vendor Tag: xorg Release Tags: xprop-1-2-2 U xsrc/external/mit/xprop/dist/depcomp U xsrc/external/mit/xprop/dist/config.h.in U xsrc/external/mit/xprop/dist/dsimple.h U xsrc/external/mit/xprop/dist/config.guess U xsrc/external/mit/xprop/dist/missing U xsrc/external/mit/xprop/dist/configure U xsrc/external/mit/xprop/dist/COPYING U xsrc/external/mit/xprop/dist/clientwin.h U xsrc/external/mit/xprop/dist/config.sub U xsrc/external/mit/xprop/dist/ChangeLog N xsrc/external/mit/xprop/dist/compile U xsrc/external/mit/xprop/dist/dsimple.c U xsrc/external/mit/xprop/dist/Makefile.in U xsrc/external/mit/xprop/dist/README U xsrc/external/mit/xprop/dist/aclocal.m4 U xsrc/external/mit/xprop/dist/configure.ac U xsrc/external/mit/xprop/dist/install-sh U xsrc/external/mit/xprop/dist/INSTALL U xsrc/external/mit/xprop/dist/clientwin.c U xsrc/external/mit/xprop/dist/xprop.c U xsrc/external/mit/xprop/dist/Makefile.am U xsrc/external/mit/xprop/dist/man/Makefile.in U xsrc/external/mit/xprop/dist/man/xprop.man U xsrc/external/mit/xprop/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xmessage/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 10:00:21 UTC 2014 Update of /cvsroot/xsrc/external/mit/xmessage/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16134 Log Message: initial import of xmessage-1.0.3 Status: Vendor Tag: xorg Release Tags: xmessage-1-0-3 U xsrc/external/mit/xmessage/dist/Makefile.am U xsrc/external/mit/xmessage/dist/depcomp U xsrc/external/mit/xmessage/dist/missing U xsrc/external/mit/xmessage/dist/config.guess U xsrc/external/mit/xmessage/dist/Makefile.in U xsrc/external/mit/xmessage/dist/xmessage.man U xsrc/external/mit/xmessage/dist/readfile.h U xsrc/external/mit/xmessage/dist/install-sh U xsrc/external/mit/xmessage/dist/xmessage.h U xsrc/external/mit/xmessage/dist/aclocal.m4 U xsrc/external/mit/xmessage/dist/COPYING U xsrc/external/mit/xmessage/dist/configure.ac U xsrc/external/mit/xmessage/dist/makeform.c U xsrc/external/mit/xmessage/dist/INSTALL U xsrc/external/mit/xmessage/dist/README U xsrc/external/mit/xmessage/dist/config.sub U xsrc/external/mit/xmessage/dist/readfile.c U xsrc/external/mit/xmessage/dist/config.h.in U xsrc/external/mit/xmessage/dist/configure U xsrc/external/mit/xmessage/dist/xmessage.c U xsrc/external/mit/xmessage/dist/ChangeLog U xsrc/external/mit/xmessage/dist/app-defaults/Xmessage-color U xsrc/external/mit/xmessage/dist/app-defaults/Xmessage No conflicts created by this import
CVS import: xsrc/external/mit/xmodmap/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 10:00:22 UTC 2014 Update of /cvsroot/xsrc/external/mit/xmodmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10703 Log Message: initial import of xmodmap-1.0.8 Status: Vendor Tag: xorg Release Tags: xmodmap-1-0-8 U xsrc/external/mit/xmodmap/dist/INSTALL U xsrc/external/mit/xmodmap/dist/configure.ac U xsrc/external/mit/xmodmap/dist/install-sh U xsrc/external/mit/xmodmap/dist/xmodmap.c U xsrc/external/mit/xmodmap/dist/aclocal.m4 U xsrc/external/mit/xmodmap/dist/pf.c U xsrc/external/mit/xmodmap/dist/exec.c U xsrc/external/mit/xmodmap/dist/config.h.in U xsrc/external/mit/xmodmap/dist/handle.c U xsrc/external/mit/xmodmap/dist/missing U xsrc/external/mit/xmodmap/dist/depcomp U xsrc/external/mit/xmodmap/dist/Makefile.in U xsrc/external/mit/xmodmap/dist/swap.km U xsrc/external/mit/xmodmap/dist/xmodmap.h U xsrc/external/mit/xmodmap/dist/wq.h U xsrc/external/mit/xmodmap/dist/config.sub N xsrc/external/mit/xmodmap/dist/compile U xsrc/external/mit/xmodmap/dist/AUTHORS U xsrc/external/mit/xmodmap/dist/README U xsrc/external/mit/xmodmap/dist/ChangeLog U xsrc/external/mit/xmodmap/dist/Makefile.am U xsrc/external/mit/xmodmap/dist/configure U xsrc/external/mit/xmodmap/dist/autogen.sh U xsrc/external/mit/xmodmap/dist/config.guess U xsrc/external/mit/xmodmap/dist/COPYING U xsrc/external/mit/xmodmap/dist/man/xmodmap.man U xsrc/external/mit/xmodmap/dist/man/Makefile.in U xsrc/external/mit/xmodmap/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xrdb/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 10:00:26 UTC 2014 Update of /cvsroot/xsrc/external/mit/xrdb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7640 Log Message: initial import of xrdb-1.1.0 Status: Vendor Tag: xorg Release Tags: xrdb-1-1-0 U xsrc/external/mit/xrdb/dist/INSTALL U xsrc/external/mit/xrdb/dist/aclocal.m4 C xsrc/external/mit/xrdb/dist/xrdb.c U xsrc/external/mit/xrdb/dist/install-sh U xsrc/external/mit/xrdb/dist/missing U xsrc/external/mit/xrdb/dist/depcomp U xsrc/external/mit/xrdb/dist/README U xsrc/external/mit/xrdb/dist/configure U xsrc/external/mit/xrdb/dist/COPYING U xsrc/external/mit/xrdb/dist/AUTHORS N xsrc/external/mit/xrdb/dist/compile U xsrc/external/mit/xrdb/dist/config.h.in U xsrc/external/mit/xrdb/dist/ChangeLog U xsrc/external/mit/xrdb/dist/configure.ac U xsrc/external/mit/xrdb/dist/Makefile.am U xsrc/external/mit/xrdb/dist/config.guess U xsrc/external/mit/xrdb/dist/config.sub U xsrc/external/mit/xrdb/dist/Makefile.in U xsrc/external/mit/xrdb/dist/man/Makefile.am U xsrc/external/mit/xrdb/dist/man/Makefile.in U xsrc/external/mit/xrdb/dist/man/xrdb.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrdb/dist
CVS import: xsrc/external/mit/xrandr/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 10:00:25 UTC 2014 Update of /cvsroot/xsrc/external/mit/xrandr/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25207 Log Message: initial import of xrandr-1.4.1 Status: Vendor Tag: xorg Release Tags: xrandr-1-4-1 U xsrc/external/mit/xrandr/dist/ChangeLog U xsrc/external/mit/xrandr/dist/depcomp U xsrc/external/mit/xrandr/dist/missing U xsrc/external/mit/xrandr/dist/COPYING U xsrc/external/mit/xrandr/dist/xrandr_test.pl U xsrc/external/mit/xrandr/dist/config.sub U xsrc/external/mit/xrandr/dist/configure U xsrc/external/mit/xrandr/dist/config.h.in U xsrc/external/mit/xrandr/dist/config.guess N xsrc/external/mit/xrandr/dist/compile U xsrc/external/mit/xrandr/dist/keystone.5c U xsrc/external/mit/xrandr/dist/install-sh U xsrc/external/mit/xrandr/dist/aclocal.m4 U xsrc/external/mit/xrandr/dist/Makefile.am U xsrc/external/mit/xrandr/dist/configure.ac U xsrc/external/mit/xrandr/dist/INSTALL C xsrc/external/mit/xrandr/dist/xrandr.c U xsrc/external/mit/xrandr/dist/README U xsrc/external/mit/xrandr/dist/Makefile.in U xsrc/external/mit/xrandr/dist/man/Makefile.am U xsrc/external/mit/xrandr/dist/man/Makefile.in U xsrc/external/mit/xrandr/dist/man/xrandr.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrandr/dist
CVS import: xsrc/external/mit/xset/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 10:00:27 UTC 2014 Update of /cvsroot/xsrc/external/mit/xset/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20527 Log Message: initial import of xset-1.2.3 Status: Vendor Tag: xorg Release Tags: xset-1-2-3 U xsrc/external/mit/xset/dist/configure.ac U xsrc/external/mit/xset/dist/README U xsrc/external/mit/xset/dist/Makefile.in U xsrc/external/mit/xset/dist/missing U xsrc/external/mit/xset/dist/xset.c U xsrc/external/mit/xset/dist/depcomp U xsrc/external/mit/xset/dist/Makefile.am U xsrc/external/mit/xset/dist/COPYING U xsrc/external/mit/xset/dist/INSTALL U xsrc/external/mit/xset/dist/install-sh N xsrc/external/mit/xset/dist/compile U xsrc/external/mit/xset/dist/aclocal.m4 U xsrc/external/mit/xset/dist/config.h.in U xsrc/external/mit/xset/dist/configure U xsrc/external/mit/xset/dist/config.sub U xsrc/external/mit/xset/dist/ChangeLog U xsrc/external/mit/xset/dist/config.guess U xsrc/external/mit/xset/dist/man/Makefile.in U xsrc/external/mit/xset/dist/man/xset.man U xsrc/external/mit/xset/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xwd/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 10:00:29 UTC 2014 Update of /cvsroot/xsrc/external/mit/xwd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21947 Log Message: initial import of xwd-1.0.6 Status: Vendor Tag: xorg Release Tags: xwd-1-0-6 U xsrc/external/mit/xwd/dist/Makefile.in U xsrc/external/mit/xwd/dist/list.h U xsrc/external/mit/xwd/dist/compile U xsrc/external/mit/xwd/dist/COPYING U xsrc/external/mit/xwd/dist/multiVis.h U xsrc/external/mit/xwd/dist/wsutils.h U xsrc/external/mit/xwd/dist/configure.ac U xsrc/external/mit/xwd/dist/dsimple.c U xsrc/external/mit/xwd/dist/depcomp U xsrc/external/mit/xwd/dist/missing U xsrc/external/mit/xwd/dist/install-sh U xsrc/external/mit/xwd/dist/Makefile.am U xsrc/external/mit/xwd/dist/clientwin.c U xsrc/external/mit/xwd/dist/aclocal.m4 U xsrc/external/mit/xwd/dist/config.h.in U xsrc/external/mit/xwd/dist/multiVis.c U xsrc/external/mit/xwd/dist/README U xsrc/external/mit/xwd/dist/INSTALL U xsrc/external/mit/xwd/dist/ChangeLog U xsrc/external/mit/xwd/dist/configure U xsrc/external/mit/xwd/dist/config.guess U xsrc/external/mit/xwd/dist/list.c U xsrc/external/mit/xwd/dist/clientwin.h U xsrc/external/mit/xwd/dist/config.sub U xsrc/external/mit/xwd/dist/dsimple.h U xsrc/external/mit/xwd/dist/xwd.c U xsrc/external/mit/xwd/dist/man/Makefile.in U xsrc/external/mit/xwd/dist/man/Makefile.am U xsrc/external/mit/xwd/dist/man/xwd.man No conflicts created by this import
CVS import: xsrc/external/mit/xvinfo/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 10:00:28 UTC 2014 Update of /cvsroot/xsrc/external/mit/xvinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9321 Log Message: initial import of xvinfo-1.1.2 Status: Vendor Tag: xorg Release Tags: xvinfo-1-1-2 U xsrc/external/mit/xvinfo/dist/config.guess U xsrc/external/mit/xvinfo/dist/xvinfo.c U xsrc/external/mit/xvinfo/dist/INSTALL U xsrc/external/mit/xvinfo/dist/ChangeLog U xsrc/external/mit/xvinfo/dist/configure U xsrc/external/mit/xvinfo/dist/README U xsrc/external/mit/xvinfo/dist/Makefile.am U xsrc/external/mit/xvinfo/dist/config.sub U xsrc/external/mit/xvinfo/dist/Makefile.in U xsrc/external/mit/xvinfo/dist/COPYING U xsrc/external/mit/xvinfo/dist/config.h.in U xsrc/external/mit/xvinfo/dist/depcomp U xsrc/external/mit/xvinfo/dist/missing U xsrc/external/mit/xvinfo/dist/install-sh U xsrc/external/mit/xvinfo/dist/configure.ac U xsrc/external/mit/xvinfo/dist/aclocal.m4 N xsrc/external/mit/xvinfo/dist/man/Makefile.am N xsrc/external/mit/xvinfo/dist/man/Makefile.in N xsrc/external/mit/xvinfo/dist/man/xvinfo.man No conflicts created by this import
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Mon Mar 17 10:03:20 UTC 2014
Modified Files:
xsrc/external/mit/xmodmap/include: config.h
xsrc/external/mit/xprop/include: config.h
xsrc/external/mit/xrandr/dist: xrandr.c
xsrc/external/mit/xrdb/dist: xrdb.c
Removed Files:
xsrc/external/mit/xvinfo/dist: xvinfo.man
Log Message:
merge xmessage 1.0.3, xmodmap 1.0.8, xprop 1.2.2, xrandr 1.4.1,
xrdb 1.1.0, xset 1.2.3, xvinfo 1.1.2, and xwd 1.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xmodmap/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xprop/include/config.h
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xrandr/dist/xrandr.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xrdb/dist/xrdb.c
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xvinfo/dist/xvinfo.man
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/xmodmap/include/config.h
diff -u xsrc/external/mit/xmodmap/include/config.h:1.4 xsrc/external/mit/xmodmap/include/config.h:1.5
--- xsrc/external/mit/xmodmap/include/config.h:1.4 Sat Nov 20 23:24:51 2010
+++ xsrc/external/mit/xmodmap/include/config.h Mon Mar 17 10:03:19 2014
@@ -1,6 +1,9 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the `asprintf' function. */
+#define HAVE_ASPRINTF 1
+
/* Define to 1 if you have the header file. */
#define HAVE_INTTYPES_H 1
@@ -41,7 +44,7 @@
#define PACKAGE_NAME "xmodmap"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xmodmap 1.0.5"
+#define PACKAGE_STRING "xmodmap 1.0.8"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xmodmap"
@@ -50,7 +53,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.5"
+#define PACKAGE_VERSION "1.0.8"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -59,10 +62,10 @@
#define PACKAGE_VERSION_MINOR 0
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 5
+#define PACKAGE_VERSION_PATCHLEVEL 8
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.0.5"
+#define VERSION "1.0.8"
Index: xsrc/external/mit/xprop/include/config.h
diff -u xsrc/external/mit/xprop/include/config.h:1.4 xsrc/external/mit/xprop/include/config.h:1.5
--- xsrc/external/mit/xprop/include/config.h:1.4 Sat Nov 20 23:25:11 2010
+++ xsrc/external/mit/xprop/include/config.h Mon Mar 17 10:03:19 2014
@@ -47,7 +47,7 @@
#define PACKAGE_NAME "xprop"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xprop 1.2.0"
+#define PACKAGE_STRING "xprop 1.2.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xprop"
@@ -56,7 +56,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.0"
+#define PACKAGE_VERSION "1.2.2"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -65,10 +65,10 @@
#define PACKAGE_VERSION_MINOR 2
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 0
+#define PACKAGE_VERSION_PATCHLEVEL 2
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.2.0"
+#define VERSION "1.2.2"
Index: xsrc/external/mit/xrandr/dist/xrandr.c
diff -u xsrc/external/mit/xrandr/dist/xrandr.c:1.9 xsrc/external/mit/xrandr/dist/xrandr.c:1.10
--- xsrc/external/mit/xrandr/dist/xrandr.c:1.9 Wed Jun 12 07:50:29 2013
+++ xsrc/external/mit/xrandr/dist/xrandr.c Mon Mar 17 10:03:19 2014
@@ -97,62 +97,62 @@ static const struct {
static void
usage(void)
{
-printf("usage: %s [options]\n", program_name);
-printf(" where options are:\n");
-printf(" -display or -d \n");
-printf(" --help\n");
-printf(" -o \n");
-printf("or --orientation \n");
-printf(" -qor --query\n");
-printf(" -s /x or --size /x\n");
-printf(" -r or --rate or --refresh \n");
-printf(" -vor --version\n");
-printf(" -x(reflect in x)\n");
-printf(" -y(reflect in y)\n");
-printf(" --screen \n");
-printf(" --verbose\n");
-printf(" --current\n");
-printf(" --dryrun\n");
-printf(" --nograb\n");
-printf(" --prop or --properties\n");
-printf(" --fb x\n");
-printf(" --fbmm x\n");
-printf(" --dpi /\n");
-printf(" --output \n");
-printf(" --auto\n");
-printf(" --mode \n");
-printf(" --preferred\n");
-printf(" --pos x\n");
-printf(" --rate or --refresh \n");
-printf(" --reflect normal,x,y,xy\n");
-printf(" --rotate normal,inverted,left,
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Mon Mar 17 10:09:18 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xrdb: Makefile
src/external/mit/xorg/bin/xset: Makefile
src/external/mit/xorg/bin/xvinfo: Makefile
src/external/mit/xorg/bin/xwd: Makefile
Log Message:
merge xrdb 1.1.0, xset 1.2.3, xvinfo 1.1.2, and xwd 1.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xrdb/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xset/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xvinfo/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xwd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xrdb/Makefile
diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.4 src/external/mit/xorg/bin/xrdb/Makefile:1.5
--- src/external/mit/xorg/bin/xrdb/Makefile:1.4 Fri Jul 19 08:29:27 2013
+++ src/external/mit/xorg/bin/xrdb/Makefile Mon Mar 17 10:09:18 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2013/07/19 08:29:27 prlw1 Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/17 10:09:18 mrg Exp $
.include
PROG= xrdb
CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAS_MKSTEMP # XXX
-CPPFLAGS+=-DHAVE_ASPRINTF
+CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING=\"1.1.0\"
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.2 src/external/mit/xorg/bin/xset/Makefile:1.3
--- src/external/mit/xorg/bin/xset/Makefile:1.2 Wed Aug 3 02:57:23 2011
+++ src/external/mit/xorg/bin/xset/Makefile Mon Mar 17 10:09:18 2014
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2011/08/03 02:57:23 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/17 10:09:18 mrg Exp $
.include
PROG= xset
CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
+CPPFLAGS+= -DPACKAGE_STRING=\"1.2.3\"
LDADD+= -lXmuu -lXt -lSM -lICE -lXxf86misc -lXfontcache -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC} ${LIBXFONTCACHE}
Index: src/external/mit/xorg/bin/xvinfo/Makefile
diff -u src/external/mit/xorg/bin/xvinfo/Makefile:1.2 src/external/mit/xorg/bin/xvinfo/Makefile:1.3
--- src/external/mit/xorg/bin/xvinfo/Makefile:1.2 Thu Mar 22 23:46:27 2012
+++ src/external/mit/xorg/bin/xvinfo/Makefile Mon Mar 17 10:09:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/22 23:46:27 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/17 10:09:18 mrg Exp $
.include
@@ -7,7 +7,9 @@ PROG= xvinfo
LDADD+= -lXv -lXext -lX11
DPADD+= ${LIBXV} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+CPPFLAGS+= -DPACKAGE_STRING=\"1.1.2\"
+
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
CWARNFLAGS.clang+= -Wno-dangling-else
Index: src/external/mit/xorg/bin/xwd/Makefile
diff -u src/external/mit/xorg/bin/xwd/Makefile:1.3 src/external/mit/xorg/bin/xwd/Makefile:1.4
--- src/external/mit/xorg/bin/xwd/Makefile:1.3 Fri May 31 08:02:00 2013
+++ src/external/mit/xorg/bin/xwd/Makefile Mon Mar 17 10:09:18 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:02:00 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/17 10:09:18 mrg Exp $
.include
PROG= xwd
SRCS= xwd.c clientwin.c dsimple.c list.c multiVis.c
-CPPFLAGS+=-I${X11SRCDIR./xlsfonts}
+CPPFLAGS+=-I${X11SRCDIR./xlsfonts} -DXKB
.PATH: ${X11SRCDIR./xlsfonts}
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
CVS commit: src/external/mit/xorg/bin/xmodmap
Module Name:src
Committed By: mrg
Date: Mon Mar 17 10:11:27 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xmodmap: Makefile
Log Message:
merge xmodmap 1.0.8.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xmodmap/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xmodmap/Makefile
diff -u src/external/mit/xorg/bin/xmodmap/Makefile:1.3 src/external/mit/xorg/bin/xmodmap/Makefile:1.4
--- src/external/mit/xorg/bin/xmodmap/Makefile:1.3 Thu May 30 23:42:19 2013
+++ src/external/mit/xorg/bin/xmodmap/Makefile Mon Mar 17 10:11:27 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2013/05/30 23:42:19 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/17 10:11:27 mrg Exp $
.include
PROG= xmodmap
SRCS= xmodmap.c pf.c handle.c exec.c
-CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
LDADD+= -lX11
DPADD+= ${LIBX11}
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src
Committed By: skrll
Date: Mon Mar 17 10:27:46 UTC 2014
Modified Files:
src/sys/arch/arm/s3c2xx0: s3c2xx0reg.h
Log Message:
iTypo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/s3c2xx0/s3c2xx0reg.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/arm/s3c2xx0/s3c2xx0reg.h
diff -u src/sys/arch/arm/s3c2xx0/s3c2xx0reg.h:1.6 src/sys/arch/arm/s3c2xx0/s3c2xx0reg.h:1.7
--- src/sys/arch/arm/s3c2xx0/s3c2xx0reg.h:1.6 Sun Feb 21 06:08:53 2010
+++ src/sys/arch/arm/s3c2xx0/s3c2xx0reg.h Mon Mar 17 10:27:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2xx0reg.h,v 1.6 2010/02/21 06:08:53 bsh Exp $ */
+/* $NetBSD: s3c2xx0reg.h,v 1.7 2014/03/17 10:27:46 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -43,7 +43,7 @@
/*
* S3C2800, 2410 and 2400 have a common built-in UART block. However,
* there are small diffs in bit position of some registers.
- * Following definitions can be foune in s3c{2800,24x0}reg.h for
+ * Following definitions can be found in s3c{2800,24x0}reg.h for
* that reason.
*
* UMCON_AFC(Auto flow control)
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: martin
Date: Mon Mar 17 11:08:11 UTC 2014
Modified Files:
src/tests/lib/libm: t_atan.c t_exp.c
Log Message:
Handle VAX
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/lib/libm/t_atan.c
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_exp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/t_atan.c
diff -u src/tests/lib/libm/t_atan.c:1.14 src/tests/lib/libm/t_atan.c:1.15
--- src/tests/lib/libm/t_atan.c:1.14 Sat Mar 8 17:05:47 2014
+++ src/tests/lib/libm/t_atan.c Mon Mar 17 11:08:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_atan.c,v 1.14 2014/03/08 17:05:47 martin Exp $ */
+/* $NetBSD: t_atan.c,v 1.15 2014/03/17 11:08:11 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -57,11 +57,11 @@ static const struct {
*/
ATF_LIBM_TEST(atan_nan, "Test atan/atanf(NaN) == NaN")
{
-#ifdef __vax__
- atf_tc_skip("no NaN in vax floating point format");
-#else
+#ifdef T_LIBM_NAN
T_LIBM_CHECK_NAN(0, atan, T_LIBM_NAN);
T_LIBM_CHECK_NAN(0, atanf, T_LIBM_NAN);
+#else
+ atf_tc_skip("no NaN on this machine");
#endif
}
Index: src/tests/lib/libm/t_exp.c
diff -u src/tests/lib/libm/t_exp.c:1.6 src/tests/lib/libm/t_exp.c:1.7
--- src/tests/lib/libm/t_exp.c:1.6 Sun Mar 16 22:51:19 2014
+++ src/tests/lib/libm/t_exp.c Mon Mar 17 11:08:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_exp.c,v 1.6 2014/03/16 22:51:19 dsl Exp $ */
+/* $NetBSD: t_exp.c,v 1.7 2014/03/17 11:08:11 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -55,14 +55,22 @@ static const struct {
*/
ATF_LIBM_TEST(exp2_is_nan, "Test exp2(x) == NaN")
{
+#ifdef T_LIBM_NAN
T_LIBM_CHECK_NAN(0, exp2, T_LIBM_NAN);
T_LIBM_CHECK_NAN(0, exp2f, T_LIBM_NAN);
+#else
+ atf_tc_skip("no NaN on this machine");
+#endif
}
ATF_LIBM_TEST(exp2_is_plus_zero, "Test exp2(x) == +0.0")
{
+#ifdef T_LIBM_MINUS_INF
T_LIBM_CHECK_PLUS_ZERO(0, exp2, T_LIBM_MINUS_INF);
T_LIBM_CHECK_PLUS_ZERO(0, exp2f, T_LIBM_MINUS_INF);
+#else
+ atf_tc_skip("no +/-Inf on this machine");
+#endif
}
ATF_LIBM_TEST(exp2_powers, "Test exp2(x) is correct for some integer x")
@@ -79,7 +87,10 @@ ATF_LIBM_TEST(exp2_powers, "Test exp2(x)
{ 100, 0x1p100, 0x1p100 },
{ 125, 0x1p125, 0x1p125 },
{ 126, 0x1p126, 0x1p126 },
+#if __DBL_MAX_EXP__ > 129
{ 127, 0x1p127, 0x1p127 },
+#endif
+#ifdef T_LIBM_PLUS_INF
{ 128, 0x1p128, T_LIBM_PLUS_INF },
{ 129, 0x1p129, T_LIBM_PLUS_INF },
{ 1000, 0x1p1000, T_LIBM_PLUS_INF },
@@ -92,11 +103,13 @@ ATF_LIBM_TEST(exp2_powers, "Test exp2(x)
{ 16383, T_LIBM_PLUS_INF, T_LIBM_PLUS_INF },
{ 16384, T_LIBM_PLUS_INF, T_LIBM_PLUS_INF },
{ 16385, T_LIBM_PLUS_INF, T_LIBM_PLUS_INF },
+#endif
{ -1, 0x1p-1, 0x1p-1 },
{ -2, 0x1p-2, 0x1p-2 },
{ -100, 0x1p-100, 0x1p-100 },
{ -127, 0x1p-127, 0x1p-127 },
{ -128, 0x1p-128, 0x1p-128 },
+#if __LDBL_MIN_EXP__ < -129
{ -300, 0x1p-300, 0.0},
{ -400, 0x1p-400, 0.0},
{-1000, 0x1p-1000, 0.0},
@@ -108,6 +121,7 @@ ATF_LIBM_TEST(exp2_powers, "Test exp2(x)
{-1060, 0x1p-1060, 0.0},
/* This is the smallest result gcc will allow */
{-1074, 0x1p-1074, 0.0},
+#endif
{-1075, 0x0, 0.0},
{-1080, 0x0, 0.0},
{-2000, 0x0, 0.0},
@@ -131,12 +145,14 @@ ATF_LIBM_TEST(exp2_values, "Test exp2(x)
double d_eps;
double f_eps;
} v[] = {
+#if __DBL_MAX_EXP__ > 128
/* The largest double constant */
{ 0x1.fp9, 0x1.ffd3ap1023,
0x1p969, 0.0 },
/* The largest float constant */
{ 0x1.fep6, 0x1.4ep+127, 6e30, 0.0 },
-#ifndef __vax__
+#endif
+#ifdef T_LIBM_PLUS_INF
{ T_LIBM_PLUS_INF, T_LIBM_PLUS_INF, 0.0, 0.0 },
#endif
CVS commit: src/sys/rump/dev/lib/libmd
Module Name:src
Committed By: pooka
Date: Mon Mar 17 11:30:40 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libmd: Makefile
Added Files:
src/sys/rump/dev/lib/libmd: md_component.c
Removed Files:
src/sys/rump/dev/lib/libmd: component.c
Log Message:
rename component.c -> md_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libmd/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/rump/dev/lib/libmd/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libmd/md_component.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/rump/dev/lib/libmd/Makefile
diff -u src/sys/rump/dev/lib/libmd/Makefile:1.1 src/sys/rump/dev/lib/libmd/Makefile:1.2
--- src/sys/rump/dev/lib/libmd/Makefile:1.1 Mon Nov 22 21:20:32 2010
+++ src/sys/rump/dev/lib/libmd/Makefile Mon Mar 17 11:30:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/11/22 21:20:32 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/17 11:30:40 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev
@@ -7,7 +7,7 @@ LIB= rumpdev_md
IOCONF= MD.ioconf
SRCS= md.c
-SRCS+= component.c
+SRCS+= md_component.c
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
Added files:
Index: src/sys/rump/dev/lib/libmd/md_component.c
diff -u /dev/null src/sys/rump/dev/lib/libmd/md_component.c:1.1
--- /dev/null Mon Mar 17 11:30:41 2014
+++ src/sys/rump/dev/lib/libmd/md_component.c Mon Mar 17 11:30:40 2014
@@ -0,0 +1,68 @@
+/* $NetBSD: md_component.c,v 1.1 2014/03/17 11:30:40 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: md_component.c,v 1.1 2014/03/17 11:30:40 pooka Exp $");
+
+#include
+#include
+#include
+#include
+#include
+
+#include "ioconf.c"
+
+#include "rump_private.h"
+#include "rump_dev_private.h"
+#include "rump_vfs_private.h"
+
+extern void mdattach(int); /* XXX */
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+extern const struct bdevsw md_bdevsw;
+extern const struct cdevsw md_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ config_init_component(cfdriver_ioconf_md,
+ cfattach_ioconf_md, cfdata_ioconf_md);
+
+ bmaj = cmaj = NODEVMAJOR;
+ if ((error = devsw_attach("md", &md_bdevsw, &bmaj,
+ &md_cdevsw, &cmaj)) != 0)
+ panic("md devsw attach failed: %d", error);
+
+if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/md0", 'a',
+bmaj, 0, 7)) != 0)
+panic("cannot create cooked md dev nodes: %d", error);
+if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/rmd0", 'a',
+cmaj, 0, 7)) != 0)
+panic("cannot create raw md dev nodes: %d", error);
+
+ rump_pdev_add(mdattach, 0);
+}
CVS commit: src/lib/libc/net
Module Name:src
Committed By: christos
Date: Mon Mar 17 13:24:23 UTC 2014
Modified Files:
src/lib/libc/net: sethostent.c
Log Message:
fix memory leak
XXX: pullup 6
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/net/sethostent.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/libc/net/sethostent.c
diff -u src/lib/libc/net/sethostent.c:1.19 src/lib/libc/net/sethostent.c:1.20
--- src/lib/libc/net/sethostent.c:1.19 Tue Aug 27 05:56:12 2013
+++ src/lib/libc/net/sethostent.c Mon Mar 17 09:24:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sethostent.c,v 1.19 2013/08/27 09:56:12 christos Exp $ */
+/* $NetBSD: sethostent.c,v 1.20 2014/03/17 13:24:23 christos Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)sethostent.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: sethostent.c,v 8.5 1996/09/28 06:51:07 vixie Exp ";
#else
-__RCSID("$NetBSD: sethostent.c,v 1.19 2013/08/27 09:56:12 christos Exp $");
+__RCSID("$NetBSD: sethostent.c,v 1.20 2014/03/17 13:24:23 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -223,6 +223,7 @@ _hf_gethtbyname2(const char *name, int a
if (num == 0) {
*info->he = HOST_NOT_FOUND;
+ free(buf);
return NULL;
}
@@ -247,9 +248,11 @@ _hf_gethtbyname2(const char *name, int a
HENT_SCOPY(hp->h_aliases[i], aliases[i], ptr, len);
hp->h_aliases[anum] = NULL;
+ free(buf);
return hp;
nospc:
*info->he = NETDB_INTERNAL;
+ free(buf);
errno = ENOSPC;
return NULL;
}
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: skrll
Date: Mon Mar 17 15:57:56 UTC 2014
Modified Files:
src/sys/dev/i2c: x1226.c
Log Message:
Fix build.
Hi dh!
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/i2c/x1226.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/i2c/x1226.c
diff -u src/sys/dev/i2c/x1226.c:1.15 src/sys/dev/i2c/x1226.c:1.16
--- src/sys/dev/i2c/x1226.c:1.15 Sun Mar 16 05:20:27 2014
+++ src/sys/dev/i2c/x1226.c Mon Mar 17 15:57:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: x1226.c,v 1.15 2014/03/16 05:20:27 dholland Exp $ */
+/* $NetBSD: x1226.c,v 1.16 2014/03/17 15:57:56 skrll Exp $ */
/*
* Copyright (c) 2003 Shigeyuki Fukushima.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: x1226.c,v 1.15 2014/03/16 05:20:27 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x1226.c,v 1.16 2014/03/17 15:57:56 skrll Exp $");
#include
#include
@@ -77,13 +77,13 @@ const struct cdevsw xrtc_cdevsw = {
.d_close = xrtc_close,
.d_read = xrtc_read,
.d_write = xrtc_write,
- .d_ioctl =
- .d_stop = noioctl,
- .d_tty = nostop,
- .d_poll = notty,
- .d_mmap = nopoll,
- .d_kqfilter = nommap,
- .d_flag = nokqfilter, D_OTHER
+ .d_ioctl = noioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nokqfilter,
+ .d_flag = D_OTHER
};
static int xrtc_clock_read(struct xrtc_softc *, struct clock_ymdhms *);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Mon Mar 17 19:59:42 UTC 2014
Modified Files:
src/sys/dev/usb: umcs.c
Log Message:
Misc cleanup, suggested by Chuck Silvers.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/umcs.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/usb/umcs.c
diff -u src/sys/dev/usb/umcs.c:1.2 src/sys/dev/usb/umcs.c:1.3
--- src/sys/dev/usb/umcs.c:1.2 Sun Mar 16 10:06:40 2014
+++ src/sys/dev/usb/umcs.c Mon Mar 17 19:59:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umcs.c,v 1.2 2014/03/16 10:06:40 martin Exp $ */
+/* $NetBSD: umcs.c,v 1.3 2014/03/17 19:59:42 martin Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
/*-
@@ -41,7 +41,7 @@
*
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.2 2014/03/16 10:06:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.3 2014/03/17 19:59:42 martin Exp $");
#include
#include
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.2
#include
#include
#include
-#include
+#include
#include
#include
@@ -90,8 +90,8 @@ struct umcs7840_softc {
usbd_interface_handle sc_iface; /* the usb interface */
usbd_device_handle sc_udev; /* the usb device */
usbd_pipe_handle sc_intr_pipe; /* interrupt pipe */
- usbd_xfer_handle sc_intr_xfer; /* and preallocated xfer */
uint8_t *sc_intr_buf; /* buffer for interrupt xfer */
+ unsigned int sc_intr_buflen; /* size of buffer */
struct workqueue *sc_change_wq; /* workqueue for status changes */
struct work sc_work; /* work for said workqueue. */
struct umcs7840_softc_oneport sc_ports[UMCS7840_MAX_PORTS];
@@ -205,7 +205,6 @@ umcs7840_attach(device_t parent, device_
struct ucom_attach_args uca;
int error, i, intr_addr;
uint8_t data;
- uint16_t isize;
sc->sc_dev = self;
sc->sc_udev = uaa->device;
@@ -269,7 +268,6 @@ umcs7840_attach(device_t parent, device_
* Set up the interrupt pipe
*/
id = usbd_get_interface_descriptor(sc->sc_iface);
- isize = 0;
intr_addr = -1;
for (i = 0 ; i < id->bNumEndpoints ; i++) {
ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
@@ -277,7 +275,7 @@ umcs7840_attach(device_t parent, device_
if (UE_GET_DIR(ed->bEndpointAddress) != UE_DIR_IN
|| UE_GET_XFERTYPE(ed->bmAttributes) != UE_INTERRUPT)
continue;
- isize = UGETW(ed->wMaxPacketSize);
+ sc->sc_intr_buflen = UGETW(ed->wMaxPacketSize);
intr_addr = ed->bEndpointAddress;
break;
}
@@ -285,22 +283,17 @@ umcs7840_attach(device_t parent, device_
aprint_error_dev(self, "interrupt pipe not found\n");
return;
}
- sc->sc_intr_buf = malloc(isize, M_USBDEV, M_WAITOK);
+ sc->sc_intr_buf = kmem_alloc(sc->sc_intr_buflen, KM_SLEEP);
error = usbd_open_pipe_intr(sc->sc_iface, intr_addr,
USBD_SHORT_XFER_OK, &sc->sc_intr_pipe, sc, sc->sc_intr_buf,
- isize, umcs7840_intr, 100);
+ sc->sc_intr_buflen, umcs7840_intr, 100);
if (error) {
aprint_error_dev(self, "cannot open interrupt pipe "
"(addr %d)\n", intr_addr);
return;
}
- sc->sc_intr_xfer = usbd_alloc_xfer(uaa->device);
- if (sc->sc_intr_xfer == NULL) {
- aprint_error_dev(self, "alloc intr xfer failed\n");
- return;
-}
if (workqueue_create(&sc->sc_change_wq, "umcsq",
umcs7840_change_worker, sc, PRI_NONE, IPL_USB, WQ_MPSAFE)) {
aprint_error_dev(self, "workqueue creation failed\n");
@@ -438,7 +431,9 @@ umcs7840_set_UART_reg(struct umcs7840_so
err = usbd_do_request(sc->sc_udev, &req, NULL);
if (err)
- device_printf(sc->sc_dev, "Writing UART%d register %d failed: %s\n", portno, reg, usbd_errstr(err));
+ aprint_error_dev(sc->sc_dev,
+ "Writing UART %d register %d failed: %s\n",
+ portno, reg, usbd_errstr(err));
return err;
}
@@ -522,6 +517,16 @@ umcs7840_detach(device_t self, int flags
struct umcs7840_softc *sc = device_private(self);
int rv = 0, i;
+ /* detach children */
+ for (i = 0; i < sc->sc_numports; i++) {
+ if (sc->sc_ports[i].sc_port_ucom) {
+ rv = config_detach(sc->sc_ports[i].sc_port_ucom,
+ flags);
+ if (rv)
+break;
+ }
+ }
+
/* close interrupt pipe */
if (sc->sc_intr_pipe != NULL) {
rv = usbd_abort_pipe(sc->sc_intr_pipe);
@@ -532,23 +537,14 @@ umcs7840_detach(device_t self, int flags
rv = usbd_close_pipe(sc->sc_intr_pipe);
if (rv)
aprint_error_dev(sc->sc_dev,
- "close interrupt pipe failed: %s\n",
+ "failed to close interrupt pipe: %s\n",
usbd_errstr(rv));
- free(sc->sc_intr_buf, M_USBDEV);
+ kmem_free(sc->sc_intr_buf, sc->sc_intr_buflen);
sc->sc_intr_pipe = NULL;
}
if (sc->sc_change_wq != NULL)
workqueue_destroy(sc->sc_change_wq);
- for (i = 0; i < sc->sc_numports; i++) {
- if (sc->sc_ports[i].sc_port_ucom) {
- rv = config_detach(sc->sc_ports[i].sc_port_ucom,
- flags);
- if (rv)
-break;
- }
- }
-
usbd_add_drv_event(USB_EVENT_DRIVER
CVS commit: xsrc/external/mit/pixman/dist/pixman
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 20:01:53 UTC 2014 Modified Files: xsrc/external/mit/pixman/dist/pixman: pixman-glyph.c Log Message: avoid using __force_align_arg_pointer__ on non-x86, where it does not exist. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c 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/dist/pixman/pixman-glyph.c diff -u xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c:1.1.1.3 xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c:1.2 --- xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c:1.1.1.3 Mon Mar 17 01:18:22 2014 +++ xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c Mon Mar 17 20:01:53 2014 @@ -391,7 +391,7 @@ box32_intersect (pixman_box32_t *dest, return dest->x2 > dest->x1 && dest->y2 > dest->y1; } -#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) +#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) && defined(__i386__) __attribute__((__force_align_arg_pointer__)) #endif PIXMAN_EXPORT void @@ -633,7 +633,7 @@ out: * - Trim the mask to the destination clip/image? * - Trim composite region based on sources, when the op ignores 0s. */ -#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) +#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) && defined(__i386__) __attribute__((__force_align_arg_pointer__)) #endif PIXMAN_EXPORT void
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Mon Mar 17 21:21:57 UTC 2014
Modified Files:
src/sys/dev/usb: umcs.c
Log Message:
Hack the detach path so we do it without error messages
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/umcs.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/usb/umcs.c
diff -u src/sys/dev/usb/umcs.c:1.3 src/sys/dev/usb/umcs.c:1.4
--- src/sys/dev/usb/umcs.c:1.3 Mon Mar 17 19:59:42 2014
+++ src/sys/dev/usb/umcs.c Mon Mar 17 21:21:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umcs.c,v 1.3 2014/03/17 19:59:42 martin Exp $ */
+/* $NetBSD: umcs.c,v 1.4 2014/03/17 21:21:57 martin Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
/*-
@@ -41,7 +41,7 @@
*
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.3 2014/03/17 19:59:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.4 2014/03/17 21:21:57 martin Exp $");
#include
#include
@@ -517,15 +517,7 @@ umcs7840_detach(device_t self, int flags
struct umcs7840_softc *sc = device_private(self);
int rv = 0, i;
- /* detach children */
- for (i = 0; i < sc->sc_numports; i++) {
- if (sc->sc_ports[i].sc_port_ucom) {
- rv = config_detach(sc->sc_ports[i].sc_port_ucom,
- flags);
- if (rv)
-break;
- }
- }
+ sc->sc_dying = true;
/* close interrupt pipe */
if (sc->sc_intr_pipe != NULL) {
@@ -545,6 +537,16 @@ umcs7840_detach(device_t self, int flags
if (sc->sc_change_wq != NULL)
workqueue_destroy(sc->sc_change_wq);
+ /* detach children */
+ for (i = 0; i < sc->sc_numports; i++) {
+ if (sc->sc_ports[i].sc_port_ucom) {
+ rv = config_detach(sc->sc_ports[i].sc_port_ucom,
+ flags);
+ if (rv)
+break;
+ }
+ }
+
usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,
sc->sc_dev);
@@ -587,6 +589,9 @@ umcs7840_get_status(void *self, int port
uint8_t hw_lsr = 0; /* local line status register */
uint8_t hw_msr = 0; /* local modem status register */
+ if (sc->sc_dying)
+ return;
+
/* Read LSR & MSR */
umcs7840_get_UART_reg(sc, pn, MCS7840_UART_REG_LSR, &hw_lsr);
umcs7840_get_UART_reg(sc, pn, MCS7840_UART_REG_MSR, &hw_msr);
@@ -853,6 +858,9 @@ umcs7840_port_close(void *self, int port
atomic_swap_32(&sc->sc_ports[portno].sc_port_changed, 0);
+ if (sc->sc_dying)
+ return;
+
umcs7840_set_UART_reg(sc, pn, MCS7840_UART_REG_MCR, 0);
umcs7840_set_UART_reg(sc, pn, MCS7840_UART_REG_IER, 0);
@@ -873,14 +881,12 @@ umcs7840_intr(usbd_xfer_handle xfer, usb
int actlen;
int subunit, found;
- if (sc->sc_dying)
+ if (status == USBD_NOT_STARTED || status == USBD_CANCELLED
+ || status == USBD_IOERROR)
return;
found = 0;
if (status != USBD_NORMAL_COMPLETION) {
- if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
- return;
-
aprint_error_dev(sc->sc_dev,
"umcs7840_intr: abnormal status: %s\n",
usbd_errstr(status));
CVS commit: src/usr.sbin/rtsold
Module Name:src
Committed By: christos
Date: Tue Mar 18 00:16:49 UTC 2014
Modified Files:
src/usr.sbin/rtsold: Makefile dump.c if.c probe.c rtsock.c rtsol.c
rtsold.c rtsold.h
Log Message:
KNF, bump warns, fix warnings to print the program name.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/rtsold/Makefile
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/rtsold/dump.c
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/rtsold/if.c \
src/usr.sbin/rtsold/rtsol.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/rtsold/probe.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/rtsold/rtsock.c
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/rtsold/rtsold.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/rtsold/rtsold.h
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/rtsold/Makefile
diff -u src/usr.sbin/rtsold/Makefile:1.14 src/usr.sbin/rtsold/Makefile:1.15
--- src/usr.sbin/rtsold/Makefile:1.14 Wed Apr 22 11:23:08 2009
+++ src/usr.sbin/rtsold/Makefile Mon Mar 17 20:16:49 2014
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2009/04/22 15:23:08 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2014/03/18 00:16:49 christos Exp $
+WARNS?=6
USE_FORT?= yes # network client (local server)
PROG= rtsold
Index: src/usr.sbin/rtsold/dump.c
diff -u src/usr.sbin/rtsold/dump.c:1.9 src/usr.sbin/rtsold/dump.c:1.10
--- src/usr.sbin/rtsold/dump.c:1.9 Sat Apr 11 03:51:59 2009
+++ src/usr.sbin/rtsold/dump.c Mon Mar 17 20:16:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dump.c,v 1.9 2009/04/11 07:51:59 lukem Exp $ */
+/* $NetBSD: dump.c,v 1.10 2014/03/18 00:16:49 christos Exp $ */
/* $KAME: dump.c,v 1.10 2002/05/31 10:10:03 itojun Exp $ */
/*
@@ -48,11 +48,11 @@
static FILE *fp;
-extern struct ifinfo *iflist;
-
-static void dump_interface_status __P((void));
-static const char *sec2str __P((time_t));
-const char *ifstatstr[] = {"IDLE", "DELAY", "PROBE", "DOWN", "TENTATIVE"};
+static void dump_interface_status(void);
+static const char *sec2str(time_t);
+static const char *ifstatstr[] = {
+ "IDLE", "DELAY", "PROBE", "DOWN", "TENTATIVE"
+};
static void
dump_interface_status(void)
@@ -115,32 +115,32 @@ sec2str(time_t total)
char *ep = &result[sizeof(result)];
int n;
- days = total / 3600 / 24;
- hours = (total / 3600) % 24;
- mins = (total / 60) % 60;
- secs = total % 60;
+ days = (int)(total / 3600 / 24);
+ hours = (int)((total / 3600) % 24);
+ mins = (int)((total / 60) % 60);
+ secs = (int)(total % 60);
if (days) {
first = 0;
- n = snprintf(p, ep - p, "%dd", days);
+ n = snprintf(p, (size_t)(ep - p), "%dd", days);
if (n < 0 || n >= ep - p)
return "?";
p += n;
}
if (!first || hours) {
first = 0;
- n = snprintf(p, ep - p, "%dh", hours);
+ n = snprintf(p, (size_t)(ep - p), "%dh", hours);
if (n < 0 || n >= ep - p)
return "?";
p += n;
}
if (!first || mins) {
first = 0;
- n = snprintf(p, ep - p, "%dm", mins);
+ n = snprintf(p, (size_t)(ep - p), "%dm", mins);
if (n < 0 || n >= ep - p)
return "?";
p += n;
}
- snprintf(p, ep - p, "%ds", secs);
- return(result);
+ snprintf(p, (size_t)(ep - p), "%ds", secs);
+ return result;
}
Index: src/usr.sbin/rtsold/if.c
diff -u src/usr.sbin/rtsold/if.c:1.15 src/usr.sbin/rtsold/if.c:1.16
--- src/usr.sbin/rtsold/if.c:1.15 Sat Mar 18 16:41:23 2006
+++ src/usr.sbin/rtsold/if.c Mon Mar 17 20:16:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.15 2006/03/18 21:41:23 dan Exp $ */
+/* $NetBSD: if.c,v 1.16 2014/03/18 00:16:49 christos Exp $ */
/* $KAME: if.c,v 1.18 2002/05/31 10:10:03 itojun Exp $ */
/*
@@ -59,18 +59,17 @@
#include "rtsold.h"
-extern int rssock;
static int ifsock;
-static int get_llflag __P((const char *));
-static void get_rtaddrs __P((int, struct sockaddr *, struct sockaddr **));
+static int get_llflag(const char *);
+static void get_rtaddrs(int, struct sockaddr *, struct sockaddr **);
int
ifinit(void)
{
ifsock = rssock;
- return(0);
+ return 0;
}
int
@@ -81,17 +80,17 @@ interface_up(char *name)
strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
- if (ioctl(ifsock, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
+ if (ioctl(ifsock, SIOCGIFFLAGS, &ifr) < 0) {
warnmsg(LOG_WARNING, __func__, "ioctl(SIOCGIFFLAGS): %s",
strerror(errno));
- return(-1);
+ return -1;
}
if (!(ifr.ifr_flags & IFF_UP)) {
ifr.ifr_flags |= IFF_UP;
- if (ioctl(ifsock, SIOCSIFFLAGS, (caddr_t)&ifr) < 0)
+ if (ioctl(ifsock, SIOCSIFFLAGS, &ifr) < 0)
warnmsg(LOG_ERR, __func__,
"ioctl(SIOCSIFFLAGS): %s", strerror(errno));
- return(-1);
+ return -1;
}
warnmsg(LOG_DEBUG, __func__, "checking if %s is ready...", name);
@@ -105,7 +104,7 @@ interface_up(char *name)
if (!(llflag & IN6_IFF_NOTREADY)) {
warnmsg(LOG_DEBUG, __func__, "%s is ready", name);
- return(0);
+ return 0;
} else {
if (llflag & IN6_IFF_TENTATIVE) {
warnmsg(LOG_DEBUG, __func__, "%s is tentative",
@@ -132,7 +131,7 @@ interfa
CVS commit: othersrc/external/bsd/bsd-pkg-config/dist
Module Name:othersrc
Committed By: agc
Date: Tue Mar 18 00:42:45 UTC 2014
Modified Files:
othersrc/external/bsd/bsd-pkg-config/dist: bsd-pkg-config.sh
Log Message:
Update bsd-pkg-config to version 20140317
Changes from previous version:
+ recurse into other packages found, so that the whole dependency
tree of cflags/libs is displayed
+ also look in system and X11R7 prefixes for pkgconfig files
+ remove duplicates on output in --cflags and --libs* output, but
preserve the order
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh
diff -u othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh:1.2 othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh:1.3
--- othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh:1.2 Sat Feb 23 18:27:03 2013
+++ othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh Tue Mar 18 00:42:45 2014
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bsd-pkg-config.sh,v 1.2 2013/02/23 18:27:03 agc Exp $
+# $NetBSD: bsd-pkg-config.sh,v 1.3 2014/03/18 00:42:45 agc Exp $
# Copyright (c) 2012 Alistair Crooks
# All rights reserved.
@@ -26,21 +26,31 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-prefix=/usr/pkg
-version=20120813
+version=20140317
+
+# find the base of the .pc file
+findbase() {
+ for b in ${pkgbase} ${srcbase} ${xbase}; do
+ if [ -f ${b}/$1.pc ]; then
+ echo ${b}
+ return 0
+ fi
+ done
+ exit 1
+}
# invoked as showvalues "type" package
showvalues() {
- local val=$1
- local pkg=$2
- if [ -f ${base}/${pkg}.pc ]; then
- mf="$(awk -v s="${val}" '
+ b=$(findbase $2)
+ if [ -f ${b}/$2.pc ]; then
+ mf="$(awk -v s="$1" '
/[A-Za-z_0-9]+=.*/ { print }
$1 == s { split($0, a, ":"); print "t=\"" a[2] "\"" }
- END { print "all:\n\t@echo -n ${t}" }' ${base}/${pkg}.pc)"
+ END { print "all:\n\t@echo -n ${t}" }' ${b}/$2.pc)"
echo "${mf}" | make -f -
+ return 0
else
- echo "Package \"${pkg}\" not installed" >&2
+# echo "Package \"${pkg}\" not installed" >&2
exit 1
fi
}
@@ -49,11 +59,12 @@ showvalues() {
showvar() {
local var=$1
local pkg=$2
- if [ -f ${base}/${pkg}.pc ]; then
+ b=$(findbase ${pkg})
+ if [ -f ${b}/${pkg}.pc ]; then
mf="$(awk -v s="${var}" '
/[A-Za-z_0-9]+=.*/ { print }
/[A-Za-z_0-9]+:.*/ { next }
- END { print "all:\n\t@echo -n ${" s "}" }' ${base}/${pkg}.pc)"
+ END { print "all:\n\t@echo -n ${" s "}" }' ${b}/${pkg}.pc)"
echo "${mf}" | make -f -
else
echo "Package \"${pkg}\" not installed" >&2
@@ -81,6 +92,31 @@ expandpkgname() {
esac
}
+# get the requires lines (recursively)
+showreqs() {
+ out=$(showvalues "Requires:" $1)
+ for word in ${out}; do
+ out="${out} $(showreqs ${word})"
+ done
+ echo "${out}"
+}
+
+# show the values for $1 (recursively) for pkg $2
+recursevalues() {
+ out="$(showvalues $1 $2)"
+ requires=$(showreqs $2)
+ for req in ${requires}; do
+ out="${out} $(recursevalues $1 ${req})"
+ done
+ echo ${out}
+}
+
+# remove duplicates in the list (but without reordering)
+rmdups() {
+ echo $(echo "$1" | tr ' ' '\n' | awk '!cnt[$0]++ { m[c++] = $0 } END { for (i = 0 ; i < c ; i++) printf("%s ", m[i]) }')
+}
+
+prefix=/usr/pkg
actions=""
while [ $# -gt 0 ]; do
case "$1" in
@@ -95,26 +131,25 @@ while [ $# -gt 0 ]; do
shift
done
-base=${prefix}/lib/pkgconfig
+pkgbase=${prefix}/lib/pkgconfig
+srcbase=/usr/lib/pkgconfig
+xbase=/usr/X11R7/lib/pkgconfig
for action in ${actions}; do
pkgname=$(expandpkgname "$1") || exit 1
case "${action}" in
--cflags)
- showvalues "Cflags:" ${pkgname}
+ rmdups "$(recursevalues 'Cflags:' ${pkgname})"
;;
--exists)
- if [ -f ${base}/${pkgname}.pc ]; then
- exit 0
- else
- exit 1
- fi
+ b=$(findbase ${pkgname})
+ exit $(test -f ${b}/${pkgname}.pc)
;;
--libs)
- showvalues "Libs:" ${pkgname}
+ rmdups "$(recursevalues 'Libs:' ${pkgname})"
;;
--libs-only-*)
- libs=$(showvalues "Libs:" ${pkgname})
+ libs=$(rmdups "$(recursevalues 'Libs:' ${pkgname})")
for l in ${libs}; do
case "${action}" in
--libs-only-L)
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Tue Mar 18 05:50:06 UTC 2014 Modified Files: src/sys/arch/arm/marvell: files.marvell src/sys/arch/evbarm/conf: files.marvell Log Message: Move defparam opt_mvsoc.h to more appropriate place. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/marvell/files.marvell cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/files.marvell 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/arm/marvell/files.marvell diff -u src/sys/arch/arm/marvell/files.marvell:1.10 src/sys/arch/arm/marvell/files.marvell:1.11 --- src/sys/arch/arm/marvell/files.marvell:1.10 Mon Sep 30 13:06:03 2013 +++ src/sys/arch/arm/marvell/files.marvell Tue Mar 18 05:50:06 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.marvell,v 1.10 2013/09/30 13:06:03 kiyohara Exp $ +# $NetBSD: files.marvell,v 1.11 2014/03/18 05:50:06 matt Exp $ # # Configuration info for Marvell System on Chip support # @@ -13,7 +13,10 @@ file arch/arm/marvell/mvsoc_dma.c file arch/arm/arm32/irq_dispatch.S +# Some SoC(ARMADAXP) reports false DeviceID. defflag opt_mvsoc.hORION KIRKWOOD MV78XX0 ARMADAXP +defparam opt_mvsoc.hMVSOC_INTERREGS_PBASE + MVSOC_FIXUP_DEVID file arch/arm/marvell/mvsoc_intr.c file arch/arm/marvell/orion.c orion file arch/arm/marvell/kirkwood.c kirkwood Index: src/sys/arch/evbarm/conf/files.marvell diff -u src/sys/arch/evbarm/conf/files.marvell:1.4 src/sys/arch/evbarm/conf/files.marvell:1.5 --- src/sys/arch/evbarm/conf/files.marvell:1.4 Sat Mar 15 13:56:19 2014 +++ src/sys/arch/evbarm/conf/files.marvell Tue Mar 18 05:50:06 2014 @@ -1,4 +1,4 @@ -# $NetBSD: files.marvell,v 1.4 2014/03/15 13:56:19 kiyohara Exp $ +# $NetBSD: files.marvell,v 1.5 2014/03/18 05:50:06 matt Exp $ # # Marvell Orion, Discovery Innovation and Kirkwood NASs configuration info # @@ -11,7 +11,3 @@ file arch/evbarm/marvell/marvell_machdep # CPU support and integrated peripherals include "arch/arm/marvell/files.marvell" - -# Some SoC(ARMADAXP) reports false DeviceID. -defparam opt_mvsoc.hMVSOC_INTERREGS_PBASE - MVSOC_FIXUP_DEVID
CVS commit: othersrc/external/bsd/bsd-pkg-config/dist/tests
Module Name:othersrc Committed By: dholland Date: Tue Mar 18 05:59:44 UTC 2014 Added Files: othersrc/external/bsd/bsd-pkg-config/dist/tests: Makefile README.test basetest.better basetest.good basetest.sh package-query-libtuff-4.better package-query-libtuff-4.good package-query-y11.better package-query-y11.good package-query-ykbproto.better package-query-ykbproto.good package-query-yproto.better package-query-yproto.good package-query.sh othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles: libtuff-4.pc y11.pc ykbproto.pc yproto.pc Log Message: Add a test suite. This needs a bit of work to support running the tests from bin/, but not much, and it runs ok (just less tidily) in place. At the moment none of it really works because the bsd-pkg-config script doesn't honor PKG_CONFIG_PATH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ othersrc/external/bsd/bsd-pkg-config/dist/tests/Makefile \ othersrc/external/bsd/bsd-pkg-config/dist/tests/README.test \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/basetest.sh \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-libtuff-4.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-y11.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-y11.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-ykbproto.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-ykbproto.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-yproto.better \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query-yproto.good \ othersrc/external/bsd/bsd-pkg-config/dist/tests/package-query.sh cvs rdiff -u -r0 -r1.1 \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/libtuff-4.pc \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/y11.pc \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/ykbproto.pc \ othersrc/external/bsd/bsd-pkg-config/dist/tests/pcfiles/yproto.pc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: othersrc/external/bsd/bsd-pkg-config/dist/tests/Makefile diff -u /dev/null othersrc/external/bsd/bsd-pkg-config/dist/tests/Makefile:1.1 --- /dev/null Tue Mar 18 05:59:44 2014 +++ othersrc/external/bsd/bsd-pkg-config/dist/tests/Makefile Tue Mar 18 05:59:44 2014 @@ -0,0 +1,47 @@ +PKGCONFIG=../bsd-pkg-config.sh +#PKGCONFIG=/usr/pkg/bin/pkg-config + +ALLTESTS=basetest +PCFILES=libtuff-4 y11 ykbproto yproto + +REFVER.libtuff-4=4.0.1 # less than extant version +REFVER.y11=1.6.1 # greater than extant version +REFVER.ykbproto=1.0.6 # same as extant version +REFVER.yproto=7.0.24 # same as extant version + + + +all: run-tests .WAIT show-diffs + +.for P in $(PCFILES) +ALLTESTS+=package-query-$(P) +package-query-$(P).out: package-query.sh $(PKGCONFIG) + ./package-query.sh $(PKGCONFIG) $(P) $(REFVER.$(P)) > $@ 2>&1 +.endfor + +.for T in $(ALLTESTS) +.if !target($(T).out) +$(T).out: $(T).sh $(PKGCONFIG) + ./$(T).sh $(PKGCONFIG) > $@ 2>&1 +.endif + +$(T).diff: $(T).good $(T).out + diff -u $(T).good $(T).out > $(T).diff || true + +run-tests: $(T).diff +.endfor + +show-diffs: +.for T in $(ALLTESTS) + cat $(T).diff +.endfor + +good: +.for T in $(ALLTESTS) + cp $(T).out $(T).good +.endfor + +clean distclean: + rm -f *.out *.diff + +.PHONY: all run-tests show-diffs good clean distclean Index: othersrc/external/bsd/bsd-pkg-config/dist/tests/README.test diff -u /dev/null othersrc/external/bsd/bsd-pkg-config/dist/tests/README.test:1.1 --- /dev/null Tue Mar 18 05:59:44 2014 +++ othersrc/external/bsd/bsd-pkg-config/dist/tests/README.test Tue Mar 18 05:59:44 2014 @@ -0,0 +1,26 @@ +This is some basic test material taken from the original pkg-config's +man page. + +I've included reference .pc files to work from, and given them +nonstandard names, so the test results will be invariant under +installed package changes. + +The .good files are the output that bsd-pkg-config currently emits; +the .better files are the output that the original pkg-config emits. + +Run "make" to run the tests. If there's any diff output, inspect it +for correctness relative to intended changes you've made (if any), and +either fix things or update the .good files as appropriate. + +Run "make run-tests" to run everything but not spew the diffs to the +screen. + +You can use "make good" to update the .good files from the current +.out files; don't do this without thinking. + +You can run "make clean" to explicitly delete the test output. + +make -j should work but
CVS commit: src/sys/arch/evbarm/armadaxp
Module Name:src
Committed By: matt
Date: Tue Mar 18 06:17:55 UTC 2014
Modified Files:
src/sys/arch/evbarm/armadaxp: armadaxp_machdep.c
Log Message:
Default comfreq to mvTclk if CONSFREQ is not defined.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.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/arch/evbarm/armadaxp/armadaxp_machdep.c
diff -u src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.6 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.7
--- src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.6 Mon Dec 23 04:12:09 2013
+++ src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c Tue Mar 18 06:17:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: armadaxp_machdep.c,v 1.6 2013/12/23 04:12:09 kiyohara Exp $ */
+/* $NetBSD: armadaxp_machdep.c,v 1.7 2014/03/18 06:17:55 matt Exp $ */
/***
Copyright (C) Marvell International Ltd. and its affiliates
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.6 2013/12/23 04:12:09 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.7 2014/03/18 06:17:55 matt Exp $");
#include "opt_machdep.h"
#include "opt_mvsoc.h"
@@ -414,7 +414,7 @@ initarm(void *arg)
#define CONMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */
#endif
#ifndef CONSFREQ
-#define CONSFREQ 25000
+#define CONSFREQ 0
#endif
static const int comcnspeed = CONSPEED;
static const int comcnfreq = CONSFREQ;
@@ -435,7 +435,7 @@ consinit(void)
uint32_t, int);
if (mvuart_cnattach(&mvsoc_bs_tag, comcnaddr, comcnspeed,
- comcnfreq, comcnmode))
+ comcnfreq ? comcnfreq : mvTclk , comcnmode))
panic("Serial console can not be initialized.");
#endif
}
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: matt
Date: Tue Mar 18 06:23:45 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: mk.armadaxp mk.marvell
Log Message:
Don't replicate most of mk.marvell in mk.armadaxp
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.armadaxp
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.marvell
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/evbarm/conf/mk.armadaxp
diff -u src/sys/arch/evbarm/conf/mk.armadaxp:1.2 src/sys/arch/evbarm/conf/mk.armadaxp:1.3
--- src/sys/arch/evbarm/conf/mk.armadaxp:1.2 Wed May 29 23:50:35 2013
+++ src/sys/arch/evbarm/conf/mk.armadaxp Tue Mar 18 06:23:45 2014
@@ -1,26 +1,11 @@
#
-# $NetBSD: mk.armadaxp,v 1.2 2013/05/29 23:50:35 rkujawa Exp $
+# $NetBSD: mk.armadaxp,v 1.3 2014/03/18 06:23:45 matt Exp $
#
SYSTEM_FIRST_OBJ= armadaxp_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/armadaxp/armadaxp_start.S
-_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
-
KERNEL_BASE_PHYS=0x0020
KERNEL_BASE_VIRT=0xc020
-MKUBOOTIMAGEARGS= -A arm -T kernel
-MKUBOOTIMAGEARGS+= -a $(KERNEL_BASE_PHYS)
-MKUBOOTIMAGEARGS+= -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
-MKUBOOTIMAGEARGS_NONE= ${MKUBOOTIMAGEARGS} -C none
-
-SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${OBJCOPY} -S -O binary $@ $@.bin; \
- ${OBJCOPY} -S -O binary $@ $@.bin; \
- echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
- ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
- echo
-
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+.include "${THISARM}/conf/mk.marvell"
Index: src/sys/arch/evbarm/conf/mk.marvell
diff -u src/sys/arch/evbarm/conf/mk.marvell:1.4 src/sys/arch/evbarm/conf/mk.marvell:1.5
--- src/sys/arch/evbarm/conf/mk.marvell:1.4 Fri Aug 10 02:46:51 2012
+++ src/sys/arch/evbarm/conf/mk.marvell Tue Mar 18 06:23:45 2014
@@ -1,7 +1,7 @@
-# $NetBSD: mk.marvell,v 1.4 2012/08/10 02:46:51 matt Exp $
+# $NetBSD: mk.marvell,v 1.5 2014/03/18 06:23:45 matt Exp $
-SYSTEM_FIRST_OBJ= marvell_start.o
-SYSTEM_FIRST_SFILE= ${THISARM}/marvell/marvell_start.S
+SYSTEM_FIRST_OBJ?= marvell_start.o
+SYSTEM_FIRST_SFILE?= ${THISARM}/marvell/marvell_start.S
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: matt Date: Tue Mar 18 06:46:14 UTC 2014 Modified Files: src/sys/arch/arm/marvell: mvsoc_intr.h Log Message: Only include "opt_mvsoc.h" if _INTR_PRIVATE is defined. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/marvell/mvsoc_intr.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/arm/marvell/mvsoc_intr.h diff -u src/sys/arch/arm/marvell/mvsoc_intr.h:1.3 src/sys/arch/arm/marvell/mvsoc_intr.h:1.4 --- src/sys/arch/arm/marvell/mvsoc_intr.h:1.3 Wed Nov 20 12:16:47 2013 +++ src/sys/arch/arm/marvell/mvsoc_intr.h Tue Mar 18 06:46:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsoc_intr.h,v 1.3 2013/11/20 12:16:47 kiyohara Exp $ */ +/* $NetBSD: mvsoc_intr.h,v 1.4 2014/03/18 06:46:14 matt Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved. @@ -28,11 +28,13 @@ #ifndef _MVSOC_INTR_H_ #define _MVSOC_INTR_H_ +#ifdef _INTR_PRIVATE #include "opt_mvsoc.h" #if defined(ARMADAXP) #define __HAVE_PIC_SET_PRIORITY #endif +#endif #define ARM_IRQ_HANDLER _C_LABEL(mvsoc_irq_handler)
