CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: bsh
Date: Thu Mar 10 08:06:27 UTC 2011
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
add MPCore to CPU-ID table
add branch predict bit to arm11_options
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/arm/arm/cpufunc.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/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.102 src/sys/arch/arm/arm/cpufunc.c:1.103
--- src/sys/arch/arm/arm/cpufunc.c:1.102 Thu Mar 10 07:47:14 2011
+++ src/sys/arch/arm/arm/cpufunc.c Thu Mar 10 08:06:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.102 2011/03/10 07:47:14 bsh Exp $ */
+/* $NetBSD: cpufunc.c,v 1.103 2011/03/10 08:06:27 bsh Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.102 2011/03/10 07:47:14 bsh Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.103 2011/03/10 08:06:27 bsh Exp $);
#include opt_compat_netbsd.h
#include opt_cpuoptions.h
@@ -2648,6 +2648,8 @@
{ arm11.cache, BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) },
{ arm11.icache, BIC, OR, CPU_CONTROL_IC_ENABLE },
{ arm11.dcache, BIC, OR, CPU_CONTROL_DC_ENABLE },
+ { cpu.branchpredict, BIC, OR, CPU_CONTROL_BPRD_ENABLE },
+ { arm11.branchpredict, BIC, OR, CPU_CONTROL_BPRD_ENABLE },
{ NULL, IGN, IGN, 0 }
};
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: bsh
Date: Thu Mar 10 08:07:08 UTC 2011
Modified Files:
src/sys/arch/arm/arm32: cpu.c
Log Message:
add MPCore to CPU-ID table
add branch predict bit to arm11_options
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/arm/arm32/cpu.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/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.77 src/sys/arch/arm/arm32/cpu.c:1.78
--- src/sys/arch/arm/arm32/cpu.c:1.77 Sat Oct 2 05:37:58 2010
+++ src/sys/arch/arm/arm32/cpu.c Thu Mar 10 08:07:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.77 2010/10/02 05:37:58 kiyohara Exp $ */
+/* $NetBSD: cpu.c,v 1.78 2011/03/10 08:07:08 bsh Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.77 2010/10/02 05:37:58 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.78 2011/03/10 08:07:08 bsh Exp $);
#include sys/systm.h
#include sys/malloc.h
@@ -412,6 +412,9 @@
{ CPU_ID_ARM1176JS, CPU_CLASS_ARM11J, ARM1176J-S r0,
pN_steppings },
+ { CPU_ID_ARM11MPCORE, CPU_CLASS_ARM11J, ARM11 MPCore,
+ generic_steppings },
+
{ CPU_ID_CORTEXA8R1, CPU_CLASS_CORTEX, Cortex-A8 r1,
pN_steppings },
{ CPU_ID_CORTEXA8R2, CPU_CLASS_CORTEX, Cortex-A8 r2,
CVS commit: [rmind-uvmplock] src/sys/arch/sparc64/dev
Module Name:src Committed By: mrg Date: Thu Mar 10 08:44:45 UTC 2011 Modified Files: src/sys/arch/sparc64/dev [rmind-uvmplock]: psychoreg.h Log Message: fix a typo To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.20.1 src/sys/arch/sparc64/dev/psychoreg.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/sparc64/dev/psychoreg.h diff -u src/sys/arch/sparc64/dev/psychoreg.h:1.14 src/sys/arch/sparc64/dev/psychoreg.h:1.14.20.1 --- src/sys/arch/sparc64/dev/psychoreg.h:1.14 Fri May 30 02:29:37 2008 +++ src/sys/arch/sparc64/dev/psychoreg.h Thu Mar 10 08:44:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: psychoreg.h,v 1.14 2008/05/30 02:29:37 mrg Exp $ */ +/* $NetBSD: psychoreg.h,v 1.14.20.1 2011/03/10 08:44:45 mrg Exp $ */ /* * Copyright (c) 1999 Matthew R. Green @@ -307,7 +307,7 @@ */ /* - * For the physical addresses split into 3 32 bit values, we deocde + * For the physical addresses split into 3 32 bit values, we decode * them like the following (IEEE1275 PCI Bus binding 2.0, 2.2.1.1 * Numerical Representation): *
CVS commit: [rmind-uvmplock] src/sys/arch/sparc64/dev
Module Name:src Committed By: mrg Date: Thu Mar 10 08:45:35 UTC 2011 Modified Files: src/sys/arch/sparc64/dev [rmind-uvmplock]: psychoreg.h Log Message: revert wrong branch commit To generate a diff of this commit: cvs rdiff -u -r1.14.20.1 -r1.14.20.2 src/sys/arch/sparc64/dev/psychoreg.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/sparc64/dev/psychoreg.h diff -u src/sys/arch/sparc64/dev/psychoreg.h:1.14.20.1 src/sys/arch/sparc64/dev/psychoreg.h:1.14.20.2 --- src/sys/arch/sparc64/dev/psychoreg.h:1.14.20.1 Thu Mar 10 08:44:45 2011 +++ src/sys/arch/sparc64/dev/psychoreg.h Thu Mar 10 08:45:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: psychoreg.h,v 1.14.20.1 2011/03/10 08:44:45 mrg Exp $ */ +/* $NetBSD: psychoreg.h,v 1.14.20.2 2011/03/10 08:45:34 mrg Exp $ */ /* * Copyright (c) 1999 Matthew R. Green @@ -307,7 +307,7 @@ */ /* - * For the physical addresses split into 3 32 bit values, we decode + * For the physical addresses split into 3 32 bit values, we deocde * them like the following (IEEE1275 PCI Bus binding 2.0, 2.2.1.1 * Numerical Representation): *
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: mrg Date: Thu Mar 10 08:46:12 UTC 2011 Modified Files: src/sys/arch/sparc64/dev: psychoreg.h Log Message: fix a typo To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc64/dev/psychoreg.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/sparc64/dev/psychoreg.h diff -u src/sys/arch/sparc64/dev/psychoreg.h:1.14 src/sys/arch/sparc64/dev/psychoreg.h:1.15 --- src/sys/arch/sparc64/dev/psychoreg.h:1.14 Fri May 30 02:29:37 2008 +++ src/sys/arch/sparc64/dev/psychoreg.h Thu Mar 10 08:46:12 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: psychoreg.h,v 1.14 2008/05/30 02:29:37 mrg Exp $ */ +/* $NetBSD: psychoreg.h,v 1.15 2011/03/10 08:46:12 mrg Exp $ */ /* * Copyright (c) 1999 Matthew R. Green @@ -307,7 +307,7 @@ */ /* - * For the physical addresses split into 3 32 bit values, we deocde + * For the physical addresses split into 3 32 bit values, we decode * them like the following (IEEE1275 PCI Bus binding 2.0, 2.2.1.1 * Numerical Representation): *
CVS commit: src/lib/librumphijack
Module Name:src Committed By: wiz Date: Thu Mar 10 08:53:04 UTC 2011 Modified Files: src/lib/librumphijack: rumphijack.3 Log Message: Add serial commas. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/librumphijack/rumphijack.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumphijack/rumphijack.3 diff -u src/lib/librumphijack/rumphijack.3:1.10 src/lib/librumphijack/rumphijack.3:1.11 --- src/lib/librumphijack/rumphijack.3:1.10 Wed Mar 9 23:40:44 2011 +++ src/lib/librumphijack/rumphijack.3 Thu Mar 10 08:53:04 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: rumphijack.3,v 1.10 2011/03/09 23:40:44 pooka Exp $ +.\ $NetBSD: rumphijack.3,v 1.11 2011/03/10 08:53:04 wiz Exp $ .\ .\ Copyright (c) 2011 Antti Kantee. All rights reserved. .\ @@ -144,16 +144,16 @@ there is no pathname to make the selection based on. Current possible values are .Dq nfssvc , -.Dq getvfsstat +.Dq getvfsstat , and -.Dq fhcalls. +.Dq fhcalls . They indicate hijacking .Fn nfssvc , -.Fn getvfsstat +.Fn getvfsstat , and all file handle calls, respectively. The file handle calls include .Fn fhopen , -.Fn fhstat +.Fn fhstat , and .Fn fhstatvfs1 . .Pp
CVS commit: src/external/bsd/tmux
Module Name:src
Committed By: jmmv
Date: Thu Mar 10 09:10:41 UTC 2011
Added Files:
src/external/bsd/tmux: README prepare-import.sh
Log Message:
Add instructions and a helper script to import tmux.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/tmux/README \
src/external/bsd/tmux/prepare-import.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/tmux/README
diff -u /dev/null src/external/bsd/tmux/README:1.1
--- /dev/null Thu Mar 10 09:10:41 2011
+++ src/external/bsd/tmux/README Thu Mar 10 09:10:41 2011
@@ -0,0 +1,13 @@
+To update tmux to a new version:
+
+- Use prepare-import.sh to regenerate the dist directory.
+- Use configure from the distfile to generate new config.{h,mk} files.
+- Copy the generated config.h to usr.bin/tmux.
+- Update usr.bin/tmux/Makefile according to config.mk (in particular, the
+ list of files used from compat/ and the required libraries).
+- Update the list of source files in usr.bin/tmux/Makefile with the new
+ dist/*.c listing.
+- cvs import the contents of the new dist directory.
+- Commit the changes to the reachover Makefiles.
+- Update doc/3RDPARTY with the new tmux version.
+- Add a note to doc/CHANGES about the new version.
Index: src/external/bsd/tmux/prepare-import.sh
diff -u /dev/null src/external/bsd/tmux/prepare-import.sh:1.1
--- /dev/null Thu Mar 10 09:10:41 2011
+++ src/external/bsd/tmux/prepare-import.sh Thu Mar 10 09:10:41 2011
@@ -0,0 +1,111 @@
+#! /bin/sh
+# $NetBSD: prepare-import.sh,v 1.1 2011/03/10 09:10:41 jmmv Exp $
+#
+# Use this script to recreate the 'dist' subdirectory from a newly released
+# distfile. The script takes care of unpacking the distfile, removing any
+# files that are not relevant to NetBSD and checking if there are any new
+# files in the new release that need to be addressed.
+#
+# See the README file for general instructions.
+#
+
+set -e
+
+ProgName=${0##*/}
+
+CLEAN_PATTERNS=
+CLEAN_PATTERNS=${CLEAN_PATTERNS} [A-Z]*
+CLEAN_PATTERNS=${CLEAN_PATTERNS} configure*
+
+err() {
+ echo ${ProgName}: ${@} 12
+ exit 1
+}
+
+log() {
+ echo ${ProgName}: ${@}
+}
+
+backup_dist() {
+ if [ -d dist.old ]; then
+ log Removing dist; dist.old exists
+ rm -rf dist
+ else
+ log Backing up dist as dist.old
+ mv dist dist.old
+ fi
+}
+
+extract_distfile() {
+ local distfile=${1}; shift
+ local distname=${1}; shift
+
+ log Extracting ${distfile}
+ tar -xzf ${distfile}
+ [ -d ${distname} ] || err Distfile did not create ${distname}
+ log Renaming ${distname} to dist
+ mv ${distname} dist
+}
+
+get_distname() {
+ local distfile=${1}; shift
+ basename ${distfile} | sed -e 's,\.tar.*,,'
+}
+
+cleanup_dist() {
+ log Removing unnecessary files from dist
+ ( cd dist rm -rf ${CLEAN_PATTERNS} )
+}
+
+extract_version() {
+ local version=$(grep '^VERSION[ \t]*=' dist/Makefile | \
+ cut -d '=' -f 2 | sed -e 's,[ \t]*,,g')
+ log Version is ${version}
+ echo ${version} usr.bin/tmux/version.txt
+}
+
+diff_dirs() {
+ local old_dir=${1}; shift
+ local new_dir=${1}; shift
+
+ local old_list=$(mktemp -t tmux-import.XX)
+ local new_list=$(mktemp -t tmux-import.XX)
+ local diff=$(mktemp -t tmux-import.XX)
+ trap rm -f '${old_list}' '${new_list}' '${diff}'; exit 1 \
+ HUP INT QUIT TERM
+
+ ( cd ${old_dir} find . | sort ${old_list} )
+ ( cd ${new_dir} find . | sort ${new_list} )
+
+ diff -u ${old_list} ${new_list} | grep '^+\.' ${diff} || true
+ if [ -s ${diff} ]; then
+ log New files found
+ diff -u ${old_list} ${new_list} | grep '^+\.'
+ log Check if any files have to be cleaned up and update \
+ the prepare-import.sh script accordingly
+ else
+ log No new files; all good!
+ fi
+
+ rm -f ${old_list} ${new_list} ${diff}
+}
+
+main() {
+ [ ${#} -eq 1 ] || err Must provide a distfile name
+ local distfile=${1}; shift
+
+ [ -f Makefile -a -f prepare-import.sh ] || \
+ err Must be run from the src/external/bsd/tmux subdirectory
+
+ local distname=$(get_distname ${distfile})
+
+ backup_dist
+ extract_distfile ${distfile} ${distname}
+ extract_version
+ cleanup_dist
+ diff_dirs dist.old dist
+ log Don't forget to validate usr.bin/tmux/version.txt and to update \
+ the version in doc/3RDPARTY
+}
+
+main ${@}
CVS commit: src/external/bsd/tmux/dist
Module Name:src Committed By: jmmv Date: Thu Mar 10 09:15:42 UTC 2011 Update of /cvsroot/src/external/bsd/tmux/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2140 Log Message: Initial import of tmux-1.4: tmux is a terminal multiplexer. It enables a number of terminals (or windows) to be accessed and controlled from a single terminal. tmux is intended to be a simple, modern, BSD-licensed alternative to programs such as GNU screen. The import of tmux is intended to replace window(1) in the not-too-distant future. For reference, tmux is also present in the base system of FreeBSD and OpenBSD. Approved by core@. Status: Vendor Tag: TMUX Release Tags: tmux-1-4 N src/external/bsd/tmux/dist/attributes.c N src/external/bsd/tmux/dist/array.h N src/external/bsd/tmux/dist/cmd-bind-key.c N src/external/bsd/tmux/dist/cfg.c N src/external/bsd/tmux/dist/client.c N src/external/bsd/tmux/dist/clock.c N src/external/bsd/tmux/dist/cmd-display-message.c N src/external/bsd/tmux/dist/cmd-attach-session.c N src/external/bsd/tmux/dist/cmd-break-pane.c N src/external/bsd/tmux/dist/cmd-capture-pane.c N src/external/bsd/tmux/dist/cmd-choose-buffer.c N src/external/bsd/tmux/dist/cmd-choose-client.c N src/external/bsd/tmux/dist/cmd-choose-session.c N src/external/bsd/tmux/dist/cmd-choose-window.c N src/external/bsd/tmux/dist/cmd-clear-history.c N src/external/bsd/tmux/dist/cmd-clock-mode.c N src/external/bsd/tmux/dist/cmd-command-prompt.c N src/external/bsd/tmux/dist/cmd-confirm-before.c N src/external/bsd/tmux/dist/cmd-copy-buffer.c N src/external/bsd/tmux/dist/cmd-copy-mode.c N src/external/bsd/tmux/dist/cmd-delete-buffer.c N src/external/bsd/tmux/dist/cmd-detach-client.c N src/external/bsd/tmux/dist/cmd-previous-layout.c N src/external/bsd/tmux/dist/cmd-display-panes.c N src/external/bsd/tmux/dist/cmd-find-window.c N src/external/bsd/tmux/dist/cmd-generic.c N src/external/bsd/tmux/dist/cmd-has-session.c N src/external/bsd/tmux/dist/cmd-if-shell.c N src/external/bsd/tmux/dist/cmd-join-pane.c N src/external/bsd/tmux/dist/cmd-kill-pane.c N src/external/bsd/tmux/dist/cmd-kill-server.c N src/external/bsd/tmux/dist/cmd-kill-session.c N src/external/bsd/tmux/dist/cmd-kill-window.c N src/external/bsd/tmux/dist/cmd-last-pane.c N src/external/bsd/tmux/dist/cmd-last-window.c N src/external/bsd/tmux/dist/cmd-link-window.c N src/external/bsd/tmux/dist/cmd-list-keys.c N src/external/bsd/tmux/dist/cmd-list-buffers.c N src/external/bsd/tmux/dist/cmd-list-clients.c N src/external/bsd/tmux/dist/cmd-list-commands.c N src/external/bsd/tmux/dist/cmd-list-panes.c N src/external/bsd/tmux/dist/cmd-list-sessions.c N src/external/bsd/tmux/dist/cmd-list-windows.c N src/external/bsd/tmux/dist/cmd-list.c N src/external/bsd/tmux/dist/cmd-load-buffer.c N src/external/bsd/tmux/dist/cmd-lock-client.c N src/external/bsd/tmux/dist/cmd-lock-server.c N src/external/bsd/tmux/dist/cmd-lock-session.c N src/external/bsd/tmux/dist/cmd-move-window.c N src/external/bsd/tmux/dist/cmd-new-session.c N src/external/bsd/tmux/dist/cmd-new-window.c N src/external/bsd/tmux/dist/cmd-next-layout.c N src/external/bsd/tmux/dist/cmd-next-window.c N src/external/bsd/tmux/dist/cmd-paste-buffer.c N src/external/bsd/tmux/dist/cmd-pipe-pane.c N src/external/bsd/tmux/dist/cmd.c N src/external/bsd/tmux/dist/cmd-show-window-options.c N src/external/bsd/tmux/dist/cmd-previous-window.c N src/external/bsd/tmux/dist/cmd-refresh-client.c N src/external/bsd/tmux/dist/cmd-rename-session.c N src/external/bsd/tmux/dist/cmd-rename-window.c N src/external/bsd/tmux/dist/cmd-resize-pane.c N src/external/bsd/tmux/dist/cmd-respawn-window.c N src/external/bsd/tmux/dist/cmd-rotate-window.c N src/external/bsd/tmux/dist/cmd-run-shell.c N src/external/bsd/tmux/dist/cmd-save-buffer.c N src/external/bsd/tmux/dist/cmd-select-layout.c N src/external/bsd/tmux/dist/cmd-select-pane.c N src/external/bsd/tmux/dist/cmd-select-window.c N src/external/bsd/tmux/dist/cmd-send-keys.c N src/external/bsd/tmux/dist/cmd-send-prefix.c N src/external/bsd/tmux/dist/cmd-server-info.c N src/external/bsd/tmux/dist/cmd-set-buffer.c N src/external/bsd/tmux/dist/grid.c N src/external/bsd/tmux/dist/cmd-set-environment.c N src/external/bsd/tmux/dist/cmd-set-option.c N src/external/bsd/tmux/dist/cmd-set-window-option.c N src/external/bsd/tmux/dist/cmd-show-buffer.c N src/external/bsd/tmux/dist/cmd-show-environment.c N src/external/bsd/tmux/dist/cmd-show-messages.c N src/external/bsd/tmux/dist/cmd-show-options.c N src/external/bsd/tmux/dist/cmd-source-file.c N src/external/bsd/tmux/dist/cmd-split-window.c N src/external/bsd/tmux/dist/cmd-start-server.c N src/external/bsd/tmux/dist/cmd-string.c N src/external/bsd/tmux/dist/cmd-suspend-client.c N src/external/bsd/tmux/dist/cmd-swap-pane.c N src/external/bsd/tmux/dist/cmd-swap-window.c N src/external/bsd/tmux/dist/cmd-switch-client.c N src/external/bsd/tmux/dist/cmd-unbind-key.c N src/external/bsd/tmux/dist/colour.c N
CVS commit: src/external/bsd/tmux
Module Name:src
Committed By: jmmv
Date: Thu Mar 10 09:18:01 UTC 2011
Added Files:
src/external/bsd/tmux: Makefile
src/external/bsd/tmux/share: Makefile
src/external/bsd/tmux/share/examples: Makefile
src/external/bsd/tmux/share/examples/tmux: Makefile
src/external/bsd/tmux/usr.bin: Makefile
src/external/bsd/tmux/usr.bin/tmux: Makefile config.h version.txt
Log Message:
Add reachover Makefiles for the build of tmux.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/tmux/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/tmux/share/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/tmux/share/examples/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/tmux/share/examples/tmux/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/tmux/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/tmux/usr.bin/tmux/Makefile \
src/external/bsd/tmux/usr.bin/tmux/config.h \
src/external/bsd/tmux/usr.bin/tmux/version.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/tmux/Makefile
diff -u /dev/null src/external/bsd/tmux/Makefile:1.1
--- /dev/null Thu Mar 10 09:18:01 2011
+++ src/external/bsd/tmux/Makefile Thu Mar 10 09:18:00 2011
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2011/03/10 09:18:00 jmmv Exp $
+
+SUBDIR= share usr.bin
+
+.include bsd.subdir.mk
Index: src/external/bsd/tmux/share/Makefile
diff -u /dev/null src/external/bsd/tmux/share/Makefile:1.1
--- /dev/null Thu Mar 10 09:18:01 2011
+++ src/external/bsd/tmux/share/Makefile Thu Mar 10 09:18:00 2011
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2011/03/10 09:18:00 jmmv Exp $
+
+SUBDIR= examples
+
+.include bsd.subdir.mk
Index: src/external/bsd/tmux/share/examples/Makefile
diff -u /dev/null src/external/bsd/tmux/share/examples/Makefile:1.1
--- /dev/null Thu Mar 10 09:18:01 2011
+++ src/external/bsd/tmux/share/examples/Makefile Thu Mar 10 09:18:00 2011
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2011/03/10 09:18:00 jmmv Exp $
+
+SUBDIR= tmux
+
+.include bsd.subdir.mk
Index: src/external/bsd/tmux/share/examples/tmux/Makefile
diff -u /dev/null src/external/bsd/tmux/share/examples/tmux/Makefile:1.1
--- /dev/null Thu Mar 10 09:18:01 2011
+++ src/external/bsd/tmux/share/examples/tmux/Makefile Thu Mar 10 09:18:00 2011
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2011/03/10 09:18:00 jmmv Exp $
+
+.include bsd.own.mk
+
+.if ${MKSHARE} != no
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/tmux/dist
+.PATH: ${SRCDIR}/examples
+
+FILESDIR= /usr/share/examples/tmux
+FILESMODE= 444
+FILES= screen-keys.conf
+.endif
+
+.include bsd.prog.mk
Index: src/external/bsd/tmux/usr.bin/Makefile
diff -u /dev/null src/external/bsd/tmux/usr.bin/Makefile:1.1
--- /dev/null Thu Mar 10 09:18:01 2011
+++ src/external/bsd/tmux/usr.bin/Makefile Thu Mar 10 09:18:00 2011
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2011/03/10 09:18:00 jmmv Exp $
+
+SUBDIR= tmux
+
+.include bsd.subdir.mk
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u /dev/null src/external/bsd/tmux/usr.bin/tmux/Makefile:1.1
--- /dev/null Thu Mar 10 09:18:01 2011
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Thu Mar 10 09:18:01 2011
@@ -0,0 +1,162 @@
+# $NetBSD: Makefile,v 1.1 2011/03/10 09:18:01 jmmv Exp $
+
+.include bsd.own.mk
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/tmux/dist
+.PATH: ${SRCDIR}
+.PATH: ${SRCDIR}/compat
+
+BINDIR= /usr/bin
+PROG= tmux
+MAN= tmux.1
+
+SRCS= attributes.c
+SRCS+= cfg.c
+SRCS+= client.c
+SRCS+= clock.c
+SRCS+= cmd-attach-session.c
+SRCS+= cmd-bind-key.c
+SRCS+= cmd-break-pane.c
+SRCS+= cmd-capture-pane.c
+SRCS+= cmd-choose-buffer.c
+SRCS+= cmd-choose-client.c
+SRCS+= cmd-choose-session.c
+SRCS+= cmd-choose-window.c
+SRCS+= cmd-clear-history.c
+SRCS+= cmd-clock-mode.c
+SRCS+= cmd-command-prompt.c
+SRCS+= cmd-confirm-before.c
+SRCS+= cmd-copy-buffer.c
+SRCS+= cmd-copy-mode.c
+SRCS+= cmd-delete-buffer.c
+SRCS+= cmd-detach-client.c
+SRCS+= cmd-display-message.c
+SRCS+= cmd-display-panes.c
+SRCS+= cmd-find-window.c
+SRCS+= cmd-generic.c
+SRCS+= cmd-has-session.c
+SRCS+= cmd-if-shell.c
+SRCS+= cmd-join-pane.c
+SRCS+= cmd-kill-pane.c
+SRCS+= cmd-kill-server.c
+SRCS+= cmd-kill-session.c
+SRCS+= cmd-kill-window.c
+SRCS+= cmd-last-pane.c
+SRCS+= cmd-last-window.c
+SRCS+= cmd-link-window.c
+SRCS+= cmd-list-buffers.c
+SRCS+= cmd-list-clients.c
+SRCS+= cmd-list-commands.c
+SRCS+= cmd-list-keys.c
+SRCS+= cmd-list-panes.c
+SRCS+= cmd-list-sessions.c
+SRCS+= cmd-list-windows.c
+SRCS+= cmd-list.c
+SRCS+= cmd-load-buffer.c
+SRCS+= cmd-lock-client.c
+SRCS+= cmd-lock-server.c
+SRCS+= cmd-lock-session.c
+SRCS+= cmd-move-window.c
+SRCS+= cmd-new-session.c
+SRCS+= cmd-new-window.c
+SRCS+= cmd-next-layout.c
+SRCS+= cmd-next-window.c
+SRCS+= cmd-paste-buffer.c
+SRCS+= cmd-pipe-pane.c
+SRCS+= cmd-previous-layout.c
+SRCS+= cmd-previous-window.c
+SRCS+= cmd-refresh-client.c
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Thu Mar 10 09:19:15 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: Document tmux. To generate a diff of this commit: cvs rdiff -u -r1.818 -r1.819 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.818 src/doc/3RDPARTY:1.819 --- src/doc/3RDPARTY:1.818 Sat Mar 5 19:56:05 2011 +++ src/doc/3RDPARTY Thu Mar 10 09:19:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.818 2011/03/05 19:56:05 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.819 2011/03/10 09:19:14 jmmv Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1043,6 +1043,19 @@ Use src/gnu/dist/texinfo/texinfo2netbsd for preparing the source tree for the import. +Package: tmux +Version: 1.4 +Current Vers: 1.4 +Maintainer: Nicholas Marriott n...@users.sourceforge.net +Archive site: http://downloads.sourceforge.net/tmux/ +Home page: http://tmux.sourceforge.net/ +Mailing List: tmux-us...@lists.sourceforge.net +Responsible: jmmv +License: BSD +Notes: +See src/external/bsd/tmux/README for instructions on how to import a +new tmux release. + Package: top Version: 3.8beta1 Current Vers: 3.8beta1
CVS commit: src/lib/libterminfo
Module Name:src
Committed By: roy
Date: Thu Mar 10 09:45:32 UTC 2011
Modified Files:
src/lib/libterminfo: tparm.c
Log Message:
Fix an off-by-one error when processing embedded values.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libterminfo/tparm.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/libterminfo/tparm.c
diff -u src/lib/libterminfo/tparm.c:1.2 src/lib/libterminfo/tparm.c:1.3
--- src/lib/libterminfo/tparm.c:1.2 Wed Sep 22 06:10:51 2010
+++ src/lib/libterminfo/tparm.c Thu Mar 10 09:45:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tparm.c,v 1.2 2010/09/22 06:10:51 roy Exp $ */
+/* $NetBSD: tparm.c,v 1.3 2011/03/10 09:45:32 roy Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: tparm.c,v 1.2 2010/09/22 06:10:51 roy Exp $);
+__RCSID($NetBSD: tparm.c,v 1.3 2011/03/10 09:45:32 roy Exp $);
#include assert.h
#include ctype.h
@@ -371,7 +371,7 @@
break;
case '{':
val = 0;
- for (str++; isdigit((unsigned char)*str); str++)
+ for (; isdigit((unsigned char)*str); str++)
val = (val * 10) + (*str - '0');
if (push(val, NULL, stack))
return NULL;
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Thu Mar 10 09:47:32 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
Revert 1.81 and do it in a saner way with an ifdef. Later, when
the naming crisis is resolved, we can probably support rump kernel
quotas from nb5 also.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.82 src/lib/librumphijack/hijack.c:1.83
--- src/lib/librumphijack/hijack.c:1.82 Wed Mar 9 23:26:19 2011
+++ src/lib/librumphijack/hijack.c Thu Mar 10 09:47:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.82 2011/03/09 23:26:19 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.83 2011/03/10 09:47:32 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.82 2011/03/09 23:26:19 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.83 2011/03/10 09:47:32 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -97,7 +97,9 @@
DUALCALL___SYSCTL,
DUALCALL_GETVFSSTAT, DUALCALL_NFSSVC,
DUALCALL_GETFH, DUALCALL_FHOPEN, DUALCALL_FHSTAT, DUALCALL_FHSTATVFS1,
+#if __NetBSD_Prereq__(5,99,48)
DUALCALL_QUOTACTL,
+#endif
DUALCALL__NUM
};
@@ -133,7 +135,6 @@
#define REALMKNOD __mknod50
#define REALFHSTAT __fhstat50
#endif
-
#define REALREAD _sys_read
#define REALPREAD _sys_pread
#define REALPWRITE _sys_pwrite
@@ -173,9 +174,7 @@
enum dualcall scm_callnum;
const char *scm_hostname;
const char *scm_rumpname;
-};
-
-struct sysnames sys_mandatory[] = {
+} syscnames[] = {
{ DUALCALL_SOCKET, __socket30, RSYS_NAME(SOCKET) },
{ DUALCALL_ACCEPT, accept, RSYS_NAME(ACCEPT) },
{ DUALCALL_BIND, bind, RSYS_NAME(BIND) },
@@ -245,23 +244,15 @@
{ DUALCALL_GETVFSSTAT, getvfsstat, RSYS_NAME(GETVFSSTAT) },
{ DUALCALL_NFSSVC, nfssvc, RSYS_NAME(NFSSVC) },
{ DUALCALL_GETFH, S(REALGETFH), RSYS_NAME(GETFH) },
- { DUALCALL_FHOPEN, S(REALFHOPEN), RSYS_NAME(FHOPEN) },
- { DUALCALL_FHSTAT, S(REALFHSTAT), RSYS_NAME(FHSTAT) },
+ { DUALCALL_FHOPEN, S(REALFHOPEN),RSYS_NAME(FHOPEN) },
+ { DUALCALL_FHSTAT, S(REALFHSTAT),RSYS_NAME(FHSTAT) },
{ DUALCALL_FHSTATVFS1, S(REALFHSTATVFS1),RSYS_NAME(FHSTATVFS1) },
-};
-
-struct sysnames sys_optional[] = {
+#if __NetBSD_Prereq__(5,99,48)
{ DUALCALL_QUOTACTL, S(REALQUOTACTL),RSYS_NAME(QUOTACTL) },
+#endif
};
#undef S
-static int
-nolibcstub(void)
-{
-
- return ENOSYS;
-}
-
struct bothsys {
void *bs_host;
void *bs_rump;
@@ -713,8 +704,6 @@
rcinit(void)
{
char buf[1024];
- struct sysnames *sysvec;
- size_t totalsys;
unsigned i, j;
host_fork = dlsym(RTLD_NEXT, fork);
@@ -727,38 +716,27 @@
* is a bit of a strech, but it might work.
*/
- totalsys = __arraycount(sys_mandatory) + __arraycount(sys_optional);
for (i = 0; i DUALCALL__NUM; i++) {
/* build runtime O(1) access */
-
- sysvec = sys_mandatory;
- for (j = 0; j __arraycount(sys_mandatory); j++) {
- if (sys_mandatory[j].scm_callnum == i)
-goto found;
- }
- sysvec = sys_optional;
- for (j = 0; j __arraycount(sys_optional); j++, j++) {
- if (sys_optional[j].scm_callnum == i)
-goto found;
+ for (j = 0; j __arraycount(syscnames); j++) {
+ if (syscnames[j].scm_callnum == i)
+break;
}
- errx(1, rumphijack error: syscall pos %d missing, i);
- found:
+ if (j == __arraycount(syscnames))
+ errx(1, rumphijack error: syscall pos %d missing, i);
+
syscalls[i].bs_host = dlsym(RTLD_NEXT,
- sysvec[j].scm_hostname);
- if (syscalls[i].bs_host == NULL) {
- if (sysvec == sys_optional)
-syscalls[i].bs_host = nolibcstub;
- else
-errx(1, hostcall %s not found!,
-sysvec[j].scm_hostname);
- }
+ syscnames[j].scm_hostname);
+ if (syscalls[i].bs_host == NULL)
+ errx(1, hostcall %s not found!,
+ syscnames[j].scm_hostname);
syscalls[i].bs_rump = dlsym(RTLD_NEXT,
- sysvec[j].scm_rumpname);
+ syscnames[j].scm_rumpname);
if (syscalls[i].bs_rump == NULL)
errx(1, rumpcall %s not found!,
- sysvec[j].scm_rumpname);
+ syscnames[j].scm_rumpname);
}
if (rumpclient_init() == -1)
@@ -2194,10 +2172,12 @@
(const char *, int), \
(path, flags))
+#if __NetBSD_Prereq__(5,99,48)
PATHCALL(int, REALQUOTACTL, DUALCALL_QUOTACTL,\
(const char *path, struct plistref *p),\
(const char *, struct plistref *),\
(path, p))
+#endif
PATHCALL(int, REALGETFH, DUALCALL_GETFH,\
(const char *path, void *fhp, size_t *fh_size), \
CVS commit: src/gnu/dist/gdb6/gdb
Module Name:src Committed By: skrll Date: Thu Mar 10 10:06:33 UTC 2011 Modified Files: src/gnu/dist/gdb6/gdb: hppa-tdep.c Log Message: Rename some registers to reflect reality. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/gnu/dist/gdb6/gdb/hppa-tdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/gdb6/gdb/hppa-tdep.c diff -u src/gnu/dist/gdb6/gdb/hppa-tdep.c:1.1.1.2 src/gnu/dist/gdb6/gdb/hppa-tdep.c:1.2 --- src/gnu/dist/gdb6/gdb/hppa-tdep.c:1.1.1.2 Sun Jul 2 20:14:10 2006 +++ src/gnu/dist/gdb6/gdb/hppa-tdep.c Thu Mar 10 10:06:33 2011 @@ -603,7 +603,7 @@ sr5,sr6, sr7,cr0, cr8,cr9, ccr,cr12, cr13, cr24,cr25, cr26, -mpsfu_high,mpsfu_low,mpsfu_ovflo,pad, +cr27, cr28,cr29, cr30, fpsr,fpe1, fpe2, fpe3, fpe4, fpe5,fpe6, fpe7, fr4, fr4R, fr5,fr5R,
CVS commit: src/usr.bin/shmif_dumpbus
Module Name:src
Committed By: pooka
Date: Thu Mar 10 10:11:25 UTC 2011
Modified Files:
src/usr.bin/shmif_dumpbus: shmif_dumpbus.c
Log Message:
Add some asserts to make sure the bus offset isn't beyond what we
mapped. (I had a very interesting time last night trying to figure
out what was going when things apparently got compiled with a 64bit
time_t on nb5. this caused only 4k of the bus file to be mapped...)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/shmif_dumpbus/shmif_dumpbus.c
diff -u src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.2 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.3
--- src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.2 Wed Mar 9 12:56:08 2011
+++ src/usr.bin/shmif_dumpbus/shmif_dumpbus.c Thu Mar 10 10:11:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: shmif_dumpbus.c,v 1.2 2011/03/09 12:56:08 pooka Exp $ */
+/* $NetBSD: shmif_dumpbus.c,v 1.3 2011/03/10 10:11:25 pooka Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -158,21 +158,26 @@
uint32_t oldoff;
bool wrap;
+ assert(curbus sb.st_size);
+
wrap = false;
oldoff = curbus;
curbus = shmif_busread(bmem, sp, oldoff, sizeof(sp), wrap);
if (wrap)
bonus = 0;
- if (sp.sp_len == 0)
+ assert(curbus sb.st_size);
+
+ if (sp.sp_len == 0) {
continue;
+ }
if (pfd != STDOUT_FILENO)
printf(packet %d, offset 0x%04x, length 0x%04x,
ts %d/%06d\n, i++, curbus,
sp.sp_len, sp.sp_sec, sp.sp_usec);
- if (!pcapfile || sp.sp_len == 0) {
+ if (!pcapfile) {
curbus = shmif_busread(bmem,
buf, curbus, sp.sp_len, wrap);
if (wrap)
@@ -184,6 +189,7 @@
packhdr.caplen = packhdr.len = sp.sp_len;
packhdr.ts.tv_sec = sp.sp_sec;
packhdr.ts.tv_usec = sp.sp_usec;
+ assert(sp.sp_len = BUFSIZE);
if (write(pfd, packhdr, sizeof(packhdr)) != sizeof(packhdr))
err(1, error writing packethdr);
CVS commit: src/lib/libterminfo
Module Name:src
Committed By: roy
Date: Thu Mar 10 10:17:19 UTC 2011
Modified Files:
src/lib/libterminfo: termcap.c terminfo.5.in
Log Message:
Add support for translating the following termcap commands into terminfo:
%B %D %r %2 %3 %d %+ % %.
Fixes PR bin/44692.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libterminfo/termcap.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libterminfo/terminfo.5.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/termcap.c
diff -u src/lib/libterminfo/termcap.c:1.11 src/lib/libterminfo/termcap.c:1.12
--- src/lib/libterminfo/termcap.c:1.11 Mon Mar 7 00:27:51 2011
+++ src/lib/libterminfo/termcap.c Thu Mar 10 10:17:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: termcap.c,v 1.11 2011/03/07 00:27:51 christos Exp $ */
+/* $NetBSD: termcap.c,v 1.12 2011/03/10 10:17:19 roy Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: termcap.c,v 1.11 2011/03/07 00:27:51 christos Exp $);
+__RCSID($NetBSD: termcap.c,v 1.12 2011/03/10 10:17:19 roy Exp $);
#include assert.h
#include ctype.h
@@ -226,14 +226,61 @@
return key;
}
-/* We don't currently map % %B %D
- * That means no conversion for regent100, hz1500, act4, act5, mime terms. */
+/* Convert a termcap character into terminfo equivalents */
+static int
+printchar(char **dst, const char **src)
+{
+ unsigned char v;
+ int l;
+
+ l = 4;
+ v = (unsigned char) *++(*src);
+ if (v == '\\') {
+ v = (unsigned char) *++(*src);
+ switch (v) {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ v = 0;
+ while (isdigit((unsigned char) **src))
+v = 8 * v + ((unsigned char) *(*src)++ - '0');
+ (*src)--;
+ break;
+ case '\0':
+ v = '\\';
+ break;
+ }
+ } else if (v == '^')
+ v = (unsigned char) (*++(*src) 0x1f);
+ *(*dst)++ = '%';
+ if (isgraph(v) v != ',' v != '\'' v != '\\' v != ':') {
+ *(*dst)++ = '\'';
+ *(*dst)++ = v;
+ *(*dst)++ = '\'';
+ } else {
+ *(*dst)++ = '{';
+ if (v 99) {
+ *(*dst)++ = '0'+ v / 100;
+ l++;
+ }
+ if (v 9) {
+ *(*dst)++ = '0' + ((int) (v / 10)) % 10;
+ l++;
+ }
+ *(*dst)++ = '0' + v % 10;
+ *(*dst)++ = '}';
+ }
+ return l;
+}
+
+/* Convert termcap commands into terminfo commands */
static char *
strval(const char *val)
{
char *info, *ip, c;
const char *ps, *pe;
- int p;
+ int p, nop;
size_t len, l;
len = 1024; /* no single string should be bigger */
@@ -257,7 +304,7 @@
} else
ps = pe = NULL;
- l = 0;
+ l = nop = 0;
p = 1;
for (; *val != '\0'; val++) {
if (l + 2 len)
@@ -273,27 +320,124 @@
l++;
continue;
}
- switch (c = *(++val)) {
- case 'd':
- if (l + 6 len)
+ switch (c = *++(val)) {
+ case 'B':
+ if (l + 30 len)
goto elen;
*ip++ = '%';
*ip++ = 'p';
*ip++ = '0' + p;
+ strcpy(ip, %{10}%/%{16}%*%p);
+ ip += 16;
+ *ip++ = '0' + p;
+ strcpy(ip, %{10}%m%+);
+ ip += 9;
+ l += 29;
+ nop = 1;
+ continue;
+ case 'D':
+ if (l + 15 len)
+goto elen;
*ip++ = '%';
- *ip++ = 'd';
- l += 5;
- /* FALLTHROUGH */
+ *ip++ = 'p';
+ *ip++ = '0' + p;
+ *ip++ = '%';
+ *ip++ = 'p';
+ *ip++ = '0' + p;
+ strcpy(ip, %{2}%*%-);
+ ip += 8;
+ l += 14;
+ nop = 1;
+ continue;
case 'r':
- p = 3 - p;
+ /* non op as switched below */
+ break;
+ case '2': /* FALLTHROUGH */
+ case '3': /* FALLTHROUGH */
+ case 'd':
+ if (l + 7 len)
+goto elen;
+ if (nop == 0) {
+*ip++ = '%';
+*ip++ = 'p';
+*ip++ = '0' + p;
+l += 3;
+ } else
+nop = 0;
+ *ip++ = '%';
+ if (c != 'd') {
+*ip++ = c;
+l++;
+ }
+ *ip++ = 'd';
+ l += 2;
+ break;
+ case '+':
+ if (l + 13 len)
+goto elen;
+ if (nop == 0) {
+*ip++ = '%';
+*ip++ = 'p';
+*ip++ = '0' + p;
+l += 3;
+ } else
+nop = 0;
+ l += printchar(ip, val);
+ *ip++ = '%';
+ *ip++ = c;
+ *ip++ = '%';
+ *ip++ = 'c';
+ l += 7;
+ break;
+ case '':
+ if (l + 29 len)
+goto elen;
+ *ip++ = '%';
+ *ip++ = 'p';
+ *ip++ = '0' + p;
+ *ip++ = '%';
+ *ip++ = 'p';
+ *ip++ = '0' + p;
+ *ip++ = '%';
+ *ip++ = '?';
+ l += printchar(ip, val);
+ *ip++ = '%';
+ *ip++ = '';
+ *ip++ = '%';
+ *ip++ = 't';
+ l += printchar(ip, val);
+ *ip++ = '%';
+ *ip++ = '+';
+ *ip++ = '%';
+ *ip++ = ';';
+ l += 16;
+ nop = 1;
+ continue;
+ case '.':
+ if (l + 6 len)
+goto elen;
+ if (nop == 0) {
+*ip++ = '%';
+*ip++ = 'p';
+*ip++ = '0' + p;
+l += 3;
+ } else
+nop = 0;
+ *ip++ = '%';
+ *ip++ = 'c';
+ l += 2;
break;
default:
/* Hope it matches a terminfo command. */
*ip++ = '%';
*ip++ = c;
l += 2;
+ if (c == 'i')
+continue;
break;
}
+ /* Swap p1 and p2 */
+ p = 3 - p;
}
/* \E\ is valid termcap.
Index: src/lib/libterminfo/terminfo.5.in
diff -u
CVS commit: src/lib/libterminfo
Module Name:src
Committed By: roy
Date: Thu Mar 10 10:46:34 UTC 2011
Modified Files:
src/lib/libterminfo: tparm.c
Log Message:
Fix two other off-by-one errors when processing %P and %g commands.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/tparm.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/libterminfo/tparm.c
diff -u src/lib/libterminfo/tparm.c:1.3 src/lib/libterminfo/tparm.c:1.4
--- src/lib/libterminfo/tparm.c:1.3 Thu Mar 10 09:45:32 2011
+++ src/lib/libterminfo/tparm.c Thu Mar 10 10:46:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tparm.c,v 1.3 2011/03/10 09:45:32 roy Exp $ */
+/* $NetBSD: tparm.c,v 1.4 2011/03/10 10:46:33 roy Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: tparm.c,v 1.3 2011/03/10 09:45:32 roy Exp $);
+__RCSID($NetBSD: tparm.c,v 1.4 2011/03/10 10:46:33 roy Exp $);
#include assert.h
#include ctype.h
@@ -338,14 +338,12 @@
case 'P':
if (pop(val, NULL, stack))
return NULL;
- str++;
if (*str = 'a' *str = 'z')
dnums[*str - 'a'] = val;
else if (*str = 'A' *str = 'Z')
term-_snums[*str - 'A'] = val;
break;
case 'g':
- str++;
if (*str = 'a' *str = 'z') {
if (push(dnums[*str - 'a'], NULL, stack))
return NULL;
CVS commit: src/tests/usr.bin
Module Name:src
Committed By: pooka
Date: Thu Mar 10 11:13:33 UTC 2011
Modified Files:
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/shmif_dumpbus: Makefile d_pcap.out d_pkthdrs.out
shmbus.bz2.uue t_basic.sh
Log Message:
add tests for shmif_dumpbus(1)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/shmif_dumpbus/Makefile \
src/tests/usr.bin/shmif_dumpbus/d_pcap.out \
src/tests/usr.bin/shmif_dumpbus/d_pkthdrs.out \
src/tests/usr.bin/shmif_dumpbus/shmbus.bz2.uue \
src/tests/usr.bin/shmif_dumpbus/t_basic.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.1 src/tests/usr.bin/Makefile:1.2
--- src/tests/usr.bin/Makefile:1.1 Thu Feb 3 17:21:17 2011
+++ src/tests/usr.bin/Makefile Thu Mar 10 11:13:33 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2011/02/03 17:21:17 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/10 11:13:33 pooka Exp $
#
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/usr.bin
-TESTS_SUBDIRS+= rump_server
+TESTS_SUBDIRS+= rump_server shmif_dumpbus
.include bsd.test.mk
Added files:
Index: src/tests/usr.bin/shmif_dumpbus/Makefile
diff -u /dev/null src/tests/usr.bin/shmif_dumpbus/Makefile:1.1
--- /dev/null Thu Mar 10 11:13:33 2011
+++ src/tests/usr.bin/shmif_dumpbus/Makefile Thu Mar 10 11:13:33 2011
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2011/03/10 11:13:33 pooka Exp $
+#
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/usr.bin/shmif_dumpbus
+
+TESTS_SH= t_basic
+
+.include bsd.test.mk
Index: src/tests/usr.bin/shmif_dumpbus/d_pcap.out
diff -u /dev/null src/tests/usr.bin/shmif_dumpbus/d_pcap.out:1.1
--- /dev/null Thu Mar 10 11:13:33 2011
+++ src/tests/usr.bin/shmif_dumpbus/d_pcap.out Thu Mar 10 11:13:33 2011
@@ -0,0 +1,150 @@
+01:02:04.280004 IP 181.181.181.180 181.181.181.181: ICMP echo request, id 30783, seq 86, length 64
+01:02:07.050004 IP 181.181.181.181 181.181.181.180: ICMP echo reply, id 30783, seq 86, length 64
+01:02:07.260004 IP 181.181.181.181 181.181.181.180: ICMP echo request, id 30801, seq 3, length 1008
+01:02:04.490004 IP 181.181.181.180 181.181.181.181: ICMP echo reply, id 30801, seq 3, length 1008
+01:02:05.280004 IP 181.181.181.180 181.181.181.181: ICMP echo request, id 30783, seq 87, length 64
+01:02:08.050004 IP 181.181.181.181 181.181.181.180: ICMP echo reply, id 30783, seq 87, length 64
+01:02:08.260004 IP 181.181.181.181 181.181.181.180: ICMP echo request, id 30801, seq 4, length 1008
+01:02:05.490004 IP 181.181.181.180 181.181.181.181: ICMP echo reply, id 30801, seq 4, length 1008
+01:02:06.280004 IP 181.181.181.180 181.181.181.181: ICMP echo request, id 30783, seq 88, length 64
+01:02:09.050004 IP 181.181.181.181 181.181.181.180: ICMP echo reply, id 30783, seq 88, length 64
+01:02:09.260004 IP 181.181.181.181 181.181.181.180: ICMP echo request, id 30801, seq 5, length 1008
+01:02:06.490004 IP 181.181.181.180 181.181.181.181: ICMP echo reply, id 30801, seq 5, length 1008
+01:02:07.280004 IP 181.181.181.180 181.181.181.181: ICMP echo request, id 30783, seq 89, length 64
+01:02:10.050004 IP 181.181.181.181 181.181.181.180: ICMP echo reply, id 30783, seq 89, length 64
+01:02:10.260004 IP 181.181.181.181 181.181.181.180: ICMP echo request, id 30801, seq 6, length 1008
+01:02:07.490004 IP 181.181.181.180 181.181.181.181: ICMP echo reply, id 30801, seq 6, length 1008
+01:02:08.280004 IP 181.181.181.180 181.181.181.181: ICMP echo request, id 30783, seq 90, length 64
+01:02:11.050004 IP 181.181.181.181 181.181.181.180: ICMP echo reply, id 30783, seq 90, length 64
+01:02:11.260004 IP 181.181.181.181 181.181.181.180: ICMP echo request, id 30801, seq 7, length 1008
+01:02:08.54 IP 181.181.181.180 181.181.181.181: ICMP echo reply, id 30801, seq 7, length 1008
+01:02:09.280004 IP 181.181.181.180 181.181.181.181: ICMP echo request, id 30783, seq 91, length 64
+01:02:12.050004 IP 181.181.181.181 181.181.181.180: ICMP echo reply, id 30783, seq 91, length 64
+01:02:12.260004 IP 181.181.181.181 181.181.181.180: ICMP echo request, id 30801, seq 8, length 1008
+01:02:09.490004 IP 181.181.181.180 181.181.181.181: ICMP echo reply, id 30801, seq 8, length 1008
+01:02:10.280004 IP 181.181.181.180 181.181.181.181: ICMP echo request, id 30783, seq 92, length 64
+01:02:13.050004 IP 181.181.181.181 181.181.181.180: ICMP echo reply, id 30783, seq 92, length 64
+01:02:13.260004 IP 181.181.181.181 181.181.181.180: ICMP echo request, id 30801, seq 9, length 1008
+01:02:10.490004 IP 181.181.181.180 181.181.181.181: ICMP echo reply, id 30801, seq 9, length 1008
+01:02:11.280004 IP 181.181.181.180 181.181.181.181: ICMP echo request, id 30783, seq 93, length 64
+01:02:14.040004 IP 181.181.181.181 181.181.181.180: ICMP echo reply, id 30783, seq 93,
CVS commit: src
Module Name:src Committed By: pooka Date: Thu Mar 10 11:16:03 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Log Message: shmif_dumpbus tests To generate a diff of this commit: cvs rdiff -u -r1.263 -r1.264 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.31 -r1.32 src/etc/mtree/NetBSD.dist.tests 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.263 src/distrib/sets/lists/tests/mi:1.264 --- src/distrib/sets/lists/tests/mi:1.263 Wed Mar 9 23:10:05 2011 +++ src/distrib/sets/lists/tests/mi Thu Mar 10 11:16:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.263 2011/03/09 23:10:05 joerg Exp $ +# $NetBSD: mi,v 1.264 2011/03/10 11:16:03 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2089,6 +2089,13 @@ ./usr/tests/usr.bin/rump_server tests-util-tests ./usr/tests/usr.bin/rump_server/Atffile tests-util-tests atf ./usr/tests/usr.bin/rump_server/t_disk tests-util-tests atf +./usr/tests/usr.bintests-util-tests +./usr/tests/usr.bin/shmif_dumpbus tests-util-tests +./usr/tests/usr.bin/shmif_dumpbus/Atffile tests-util-tests atf +./usr/tests/usr.bin/shmif_dumpbus/d_pcap.out tests-util-tests atf +./usr/tests/usr.bin/shmif_dumpbus/d_pkthdrs.out tests-util-tests atf +./usr/tests/usr.bin/shmif_dumpbus/shmbus.bz2.uue tests-util-tests atf +./usr/tests/usr.bin/shmif_dumpbus/t_basic tests-util-tests atf ./usr/tests/usr.sbintests-util-tests ./usr/tests/usr.sbin/Atffile tests-sbin-tests atf ./usr/tests/usr.sbin/traceroute tests-util-tests Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.31 src/etc/mtree/NetBSD.dist.tests:1.32 --- src/etc/mtree/NetBSD.dist.tests:1.31 Wed Mar 9 23:10:06 2011 +++ src/etc/mtree/NetBSD.dist.tests Thu Mar 10 11:16:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.31 2011/03/09 23:10:06 joerg Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.32 2011/03/10 11:16:03 pooka Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -225,6 +225,7 @@ ./usr/tests/toolchain/cc ./usr/tests/usr.bin ./usr/tests/usr.bin/rump_server +./usr/tests/usr.bin/shmif_dumpbus ./usr/tests/usr.sbin ./usr/tests/usr.sbin/traceroute ./usr/tests/util
CVS commit: src/libexec/ld.elf_so/arch/hppa
Module Name:src Committed By: skrll Date: Thu Mar 10 12:53:42 UTC 2011 Modified Files: src/libexec/ld.elf_so/arch/hppa: hppa_reloc.c rtld_start.S Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c cvs rdiff -u -r1.9 -r1.10 src/libexec/ld.elf_so/arch/hppa/rtld_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c diff -u src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.34 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.35 --- src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.34 Fri Sep 24 11:41:46 2010 +++ src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c Thu Mar 10 12:53:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hppa_reloc.c,v 1.34 2010/09/24 11:41:46 skrll Exp $ */ +/* $NetBSD: hppa_reloc.c,v 1.35 2011/03/10 12:53:42 skrll Exp $ */ /*- * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: hppa_reloc.c,v 1.34 2010/09/24 11:41:46 skrll Exp $); +__RCSID($NetBSD: hppa_reloc.c,v 1.35 2011/03/10 12:53:42 skrll Exp $); #endif /* not lint */ #include stdlib.h @@ -177,7 +177,7 @@ case DT_PLTGOT: pltgot = (Elf_Addr *) (relocbase + dynp-d_un.d_ptr); -break; + break; } } relalim = (const Elf_Rela *)((const char *)relafirst + relasz); @@ -230,11 +230,11 @@ plabel = hppa_plabel_pre[hppa_plabel_pre_next++]; - plabel-hppa_plabel_pc = (Elf_Addr) + plabel-hppa_plabel_pc = (Elf_Addr) (relocbase + sym-st_value + rela-r_addend); - plabel-hppa_plabel_sl = (Elf_Addr)pltgot; + plabel-hppa_plabel_sl = (Elf_Addr)pltgot; - SLIST_INSERT_HEAD(hppa_plabel_list, plabel, hppa_plabel_next); + SLIST_INSERT_HEAD(hppa_plabel_list, plabel, hppa_plabel_next); *((Elf_Addr *)where) = (Elf_Addr)(RTLD_MAKE_PLABEL(plabel)); } Index: src/libexec/ld.elf_so/arch/hppa/rtld_start.S diff -u src/libexec/ld.elf_so/arch/hppa/rtld_start.S:1.9 src/libexec/ld.elf_so/arch/hppa/rtld_start.S:1.10 --- src/libexec/ld.elf_so/arch/hppa/rtld_start.S:1.9 Thu Sep 30 19:32:40 2010 +++ src/libexec/ld.elf_so/arch/hppa/rtld_start.S Thu Mar 10 12:53:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld_start.S,v 1.9 2010/09/30 19:32:40 skrll Exp $ */ +/* $NetBSD: rtld_start.S,v 1.10 2011/03/10 12:53:42 skrll Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ * twice later: once to call _rtld, and again to transfer to the * program's entry point. */ -stw %arg0, HPPA_FRAME_ARG(0)(%r3) + stw %arg0, HPPA_FRAME_ARG(0)(%r3) /* * We can't move to C until we relocate at least the
CVS commit: src
Module Name:src Committed By: jmmv Date: Thu Mar 10 13:16:59 UTC 2011 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/misc: mi src/etc/mtree: NetBSD.dist.base src/external/bsd: Makefile Log Message: Enable the build of tmux and add the necessary directory and file entries. To generate a diff of this commit: cvs rdiff -u -r1.924 -r1.925 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1300 -r1.1301 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/misc/mi cvs rdiff -u -r1.77 -r1.78 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.28 -r1.29 src/external/bsd/Makefile 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/base/mi diff -u src/distrib/sets/lists/base/mi:1.924 src/distrib/sets/lists/base/mi:1.925 --- src/distrib/sets/lists/base/mi:1.924 Sun Mar 6 17:08:10 2011 +++ src/distrib/sets/lists/base/mi Thu Mar 10 13:16:57 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.924 2011/03/06 17:08:10 bouyer Exp $ +# $NetBSD: mi,v 1.925 2011/03/10 13:16:57 jmmv Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -657,6 +657,7 @@ ./usr/bin/tic base-util-bin ./usr/bin/time base-util-bin ./usr/bin/tip base-util-bin +./usr/bin/tmux base-util-bin ./usr/bin/tn3270base-obsolete obsolete ./usr/bin/top base-util-bin ./usr/bin/touch base-util-bin Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1300 src/distrib/sets/lists/man/mi:1.1301 --- src/distrib/sets/lists/man/mi:1.1300 Sun Mar 6 17:08:11 2011 +++ src/distrib/sets/lists/man/mi Thu Mar 10 13:16:57 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1300 2011/03/06 17:08:11 bouyer Exp $ +# $NetBSD: mi,v 1.1301 2011/03/10 13:16:57 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -512,6 +512,7 @@ ./usr/share/man/cat1/tic.0 man-util-catman .cat ./usr/share/man/cat1/time.0 man-util-catman .cat ./usr/share/man/cat1/tip.0 man-util-catman .cat +./usr/share/man/cat1/tmux.0 man-util-catman .cat ./usr/share/man/cat1/tn3270.0 man-obsolete obsolete ./usr/share/man/cat1/top.0 man-util-catman .cat ./usr/share/man/cat1/touch.0 man-util-catman .cat @@ -3345,6 +3346,7 @@ ./usr/share/man/html1/tic.html man-util-htmlman html ./usr/share/man/html1/time.html man-util-htmlman html ./usr/share/man/html1/tip.html man-util-htmlman html +./usr/share/man/html1/tmux.html man-util-htmlman html ./usr/share/man/html1/tn3270.html man-obsolete obsolete ./usr/share/man/html1/top.html man-util-htmlman html ./usr/share/man/html1/touch.html man-util-htmlman html @@ -5835,6 +5837,7 @@ ./usr/share/man/man1/time.1 man-util-man .man ./usr/share/man/man1/tic.1 man-util-man .man ./usr/share/man/man1/tip.1 man-util-man .man +./usr/share/man/man1/tmux.1 man-util-man .man ./usr/share/man/man1/tn3270.1 man-obsolete obsolete ./usr/share/man/man1/top.1 man-util-man .man ./usr/share/man/man1/touch.1 man-util-man .man Index: src/distrib/sets/lists/misc/mi diff -u src/distrib/sets/lists/misc/mi:1.173 src/distrib/sets/lists/misc/mi:1.174 --- src/distrib/sets/lists/misc/mi:1.173 Wed Mar 2 22:25:54 2011 +++ src/distrib/sets/lists/misc/mi Thu Mar 10 13:16:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.173 2011/03/02 22:25:54 tron Exp $ +# $NetBSD: mi,v 1.174 2011/03/10 13:16:58 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -911,6 +911,8 @@ ./usr/share/examples/supfiles/sup2.fr.netbsd.org misc-sup-examples share ./usr/share/examples/syslogd/all.debug misc-sysutil-examples share ./usr/share/examples/syslogd/all.newsyslog.conf misc-sysutil-examples share +./usr/share/examples/tmux misc-tmux-examples share +./usr/share/examples/tmux/screen-keys.conf misc-tmux-examples share ./usr/share/examples/usermgmt misc-obsolete obsolete ./usr/share/examples/usermgmt/.cshrc misc-obsolete obsolete ./usr/share/examples/usermgmt/.login misc-obsolete obsolete Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.77 src/etc/mtree/NetBSD.dist.base:1.78 --- src/etc/mtree/NetBSD.dist.base:1.77 Sun Feb 20 19:23:19 2011 +++ src/etc/mtree/NetBSD.dist.base Thu Mar 10 13:16:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.77 2011/02/20 19:23:19 christos Exp $ +# $NetBSD: NetBSD.dist.base,v 1.78 2011/03/10 13:16:58 jmmv Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -340,6 +340,7 @@ ./usr/share/examples/smbfs ./usr/share/examples/supfiles ./usr/share/examples/syslogd +./usr/share/examples/tmux ./usr/share/examples/wsmoused ./usr/share/games ./usr/share/games/atc Index: src/external/bsd/Makefile diff -u
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Thu Mar 10 13:17:35 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Note the import of tmux, version 1.4. To generate a diff of this commit: cvs rdiff -u -r1.1518 -r1.1519 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1518 src/doc/CHANGES:1.1519 --- src/doc/CHANGES:1.1518 Sun Mar 6 17:12:36 2011 +++ src/doc/CHANGES Thu Mar 10 13:17:35 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1518 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1519 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -884,3 +884,4 @@ See repquota(8) and quotactl(8) for a way to migrate limits from QUOTA to QUOTA2. [bouyer 20110306] + tmux(1): First import of tmux (version 1.4). [jmmv 20110310]
CVS commit: src/sys/rump/net/lib/libshmif
Module Name:src
Committed By: pooka
Date: Thu Mar 10 13:20:54 UTC 2011
Modified Files:
src/sys/rump/net/lib/libshmif: if_shmem.c
Log Message:
Pass packet up if it's *for* us, not if it's from someone else.
This fixes a rather curious forwarding/redirect/etc. storm which
happened when there were 2 shmif kernels on the same shmbus with
ip forwarding set on. (at least it stress-tested other code ;)
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/rump/net/lib/libshmif/if_shmem.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/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.33 src/sys/rump/net/lib/libshmif/if_shmem.c:1.34
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.33 Mon Dec 6 10:48:18 2010
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Thu Mar 10 13:20:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_shmem.c,v 1.33 2010/12/06 10:48:18 pooka Exp $ */
+/* $NetBSD: if_shmem.c,v 1.34 2011/03/10 13:20:54 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.33 2010/12/06 10:48:18 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.34 2011/03/10 13:20:54 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -697,9 +697,10 @@
m-m_len = m-m_pkthdr.len = sp.sp_len;
m-m_pkthdr.rcvif = ifp;
- /* if it's from us, don't pass up and reuse storage space */
+ /* if it's for us, pass up. otherwise, reuse storage space */
eth = mtod(m, struct ether_header *);
- if (memcmp(eth-ether_shost, sc-sc_myaddr, 6) != 0) {
+ if (memcmp(eth-ether_dhost, sc-sc_myaddr, 6) == 0 ||
+ memcmp(eth-ether_dhost, etherbroadcastaddr, 6) == 0) {
KERNEL_LOCK(1, NULL);
ifp-if_input(ifp, m);
KERNEL_UNLOCK_ONE(NULL);
CVS commit: src/usr.bin/window
Module Name:src Committed By: jmmv Date: Thu Mar 10 13:23:41 UTC 2011 Modified Files: src/usr.bin/window: window.1 Log Message: Note that window(1) will go away after netbsd-6 is branched. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.bin/window/window.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/window/window.1 diff -u src/usr.bin/window/window.1:1.20 src/usr.bin/window/window.1:1.21 --- src/usr.bin/window/window.1:1.20 Fri Apr 23 22:04:37 2010 +++ src/usr.bin/window/window.1 Thu Mar 10 13:23:41 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: window.1,v 1.20 2010/04/23 22:04:37 joerg Exp $ +.\ $NetBSD: window.1,v 1.21 2011/03/10 13:23:41 jmmv Exp $ .\ .\ Copyright (c) 1985, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)window.1 8.2 (Berkeley) 12/30/93 .\ -.Dd June 25, 2009 +.Dd March 10, 2011 .Dt WINDOW 1 .Os .Sh NAME @@ -51,6 +51,21 @@ .Tn ASCII terminals. .Pp +Please note that +.Nm +is scheduled for removal on +.Nx 7.0 . +This is the last +.Nx +release that provides +.Nm . +Use +.Xr tmux 1 +instead or install the +.Sq misc/window +package from +.Xr pkgsrc 7 . +.Pp A window is a rectangular portion of the physical terminal screen associated with a set of processes. Its size and position can be changed by the user at any time. @@ -963,6 +978,8 @@ .Ed .Sh DIAGNOSTICS Should be self explanatory. +.Sh SEE ALSO +.Xr tmux 1 .Sh HISTORY The .Nm
CVS commit: src/sys/rump/net/lib/libshmif
Module Name:src
Committed By: pooka
Date: Thu Mar 10 13:27:03 UTC 2011
Modified Files:
src/sys/rump/net/lib/libshmif: if_shmem.c
Log Message:
Support bpf. shmif_dumpbus(1) can be used for much the same effect,
but sometimes it's just more convenient to run tcpdump live.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/rump/net/lib/libshmif/if_shmem.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/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.34 src/sys/rump/net/lib/libshmif/if_shmem.c:1.35
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.34 Thu Mar 10 13:20:54 2011
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Thu Mar 10 13:27:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_shmem.c,v 1.34 2011/03/10 13:20:54 pooka Exp $ */
+/* $NetBSD: if_shmem.c,v 1.35 2011/03/10 13:27:03 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.34 2011/03/10 13:20:54 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.35 2011/03/10 13:27:03 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -38,6 +38,7 @@
#include sys/lock.h
#include sys/vmem.h
+#include net/bpf.h
#include net/if.h
#include net/if_ether.h
@@ -517,6 +518,8 @@
sp.sp_sec = tv.tv_sec;
sp.sp_usec = tv.tv_usec;
+ bpf_mtap(ifp, m0);
+
shmif_lockbus(busmem);
KASSERT(busmem-shm_magic == SHMIF_MAGIC);
busmem-shm_last = shmif_nextpktoff(busmem, busmem-shm_last);
@@ -702,6 +705,7 @@
if (memcmp(eth-ether_dhost, sc-sc_myaddr, 6) == 0 ||
memcmp(eth-ether_dhost, etherbroadcastaddr, 6) == 0) {
KERNEL_LOCK(1, NULL);
+ bpf_mtap(ifp, m);
ifp-if_input(ifp, m);
KERNEL_UNLOCK_ONE(NULL);
m = NULL;
CVS commit: src/lib/libterminfo
Module Name:src
Committed By: roy
Date: Thu Mar 10 13:39:27 UTC 2011
Modified Files:
src/lib/libterminfo: tparm.c
Log Message:
Do our best to process invalid terminfo strings instead of just
returning NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libterminfo/tparm.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/libterminfo/tparm.c
diff -u src/lib/libterminfo/tparm.c:1.4 src/lib/libterminfo/tparm.c:1.5
--- src/lib/libterminfo/tparm.c:1.4 Thu Mar 10 10:46:33 2011
+++ src/lib/libterminfo/tparm.c Thu Mar 10 13:39:26 2011
@@ -1,7 +1,7 @@
-/* $NetBSD: tparm.c,v 1.4 2011/03/10 10:46:33 roy Exp $ */
+/* $NetBSD: tparm.c,v 1.5 2011/03/10 13:39:26 roy Exp $ */
/*
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Roy Marples.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: tparm.c,v 1.4 2011/03/10 10:46:33 roy Exp $);
+__RCSID($NetBSD: tparm.c,v 1.5 2011/03/10 13:39:26 roy Exp $);
#include assert.h
#include ctype.h
@@ -70,6 +70,10 @@
pop(long *num, char **string, TPSTACK *stack)
{
if (stack-offset == 0) {
+ if (num)
+ *num = 0;
+ if (string)
+ *string = NULL;
errno = E2BIG;
return -1;
}
@@ -184,7 +188,7 @@
c = *sp++;
if (c '1' || c '9') {
errno = EINVAL;
- return NULL;
+ continue;
}
l = c - '0';
if (l max)
@@ -288,14 +292,12 @@
/* Handle commands */
switch (c) {
case 'c':
- if (pop(val, NULL, stack))
- return NULL;
+ pop(val, NULL, stack);
if (ochar(term, (unsigned char)val) == 0)
return NULL;
break;
case 's':
- if (pop(NULL, ostr, stack))
-return NULL;
+ pop(NULL, ostr, stack);
if (ostr != NULL) {
l = strlen(ostr);
if (l (size_t)olen)
@@ -308,8 +310,7 @@
}
break;
case 'l':
- if (pop(NULL, ostr, stack))
-return NULL;
+ pop(NULL, ostr, stack);
if (ostr == NULL)
l = 0;
else
@@ -321,23 +322,19 @@
case 'o': /* FALLTHROUGH */
case 'x': /* FALLTHROUGH */
case 'X':
- if (pop(val, NULL, stack))
-return NULL;
+ pop(val, NULL, stack);
if (onum(term, fmt, val, olen) == 0)
return NULL;
break;
case 'p':
- if (*str '1' || *str '9') {
-errno = EINVAL;
-return NULL;
- }
+ if (*str '1' || *str '9')
+break;
l = *str++ - '1';
if (push(params[l].num, params[l].string, stack))
return NULL;
break;
case 'P':
- if (pop(val, NULL, stack))
-return NULL;
+ pop(val, NULL, stack);
if (*str = 'a' *str = 'z')
dnums[*str - 'a'] = val;
else if (*str = 'A' *str = 'Z')
@@ -391,9 +388,8 @@
case '=': /* FALLTHROUGH */
case '': /* FALLTHROUGH */
case '':
- if (pop(val, NULL, stack) ||
- pop(val2, NULL, stack))
-return NULL;
+ pop(val, NULL, stack);
+ pop(val2, NULL, stack);
switch (c) {
case '+':
val = val + val2;
@@ -440,8 +436,7 @@
break;
case '!':
case '~':
- if (pop(val, NULL, stack))
-return NULL;
+ pop(val, NULL, stack);
switch (*str) {
case '!':
val = !val;
@@ -456,8 +451,7 @@
case '?': /* if */
break;
case 't': /* then */
- if (pop(val, NULL, stack))
-return NULL;
+ pop(val, NULL, stack);
if (val != 0) {
l = 0;
for (; *str != '\0'; str++) {
CVS commit: src/tests/lib/librumphijack
Module Name:src Committed By: pooka Date: Thu Mar 10 13:42:34 UTC 2011 Modified Files: src/tests/lib/librumphijack: t_tcpip.sh Log Message: * remove juiblex from nfsd startup (i was using -DDEBUG nfsd yesterday) * some minor nits To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/lib/librumphijack/t_tcpip.sh 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/librumphijack/t_tcpip.sh diff -u src/tests/lib/librumphijack/t_tcpip.sh:1.6 src/tests/lib/librumphijack/t_tcpip.sh:1.7 --- src/tests/lib/librumphijack/t_tcpip.sh:1.6 Wed Mar 9 21:25:59 2011 +++ src/tests/lib/librumphijack/t_tcpip.sh Thu Mar 10 13:42:33 2011 @@ -1,4 +1,4 @@ -# $NetBSD: t_tcpip.sh,v 1.6 2011/03/09 21:25:59 pooka Exp $ +# $NetBSD: t_tcpip.sh,v 1.7 2011/03/10 13:42:33 pooka Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -198,10 +198,14 @@ # finally, le nfschuck export RUMPHIJACK='blanket=/var/run,socket=all,vfs=all' - atf_check -s exit:0 nfsd -tu + atf_check -s exit:0 nfsd -tu + # # now, time for the client server and associated madness. + # + export RUMP_SERVER=unix://clientsock + unset RUMPHIJACK unset LD_PRELOAD # at least the kernel server is easier @@ -214,7 +218,6 @@ atf_check -s exit:0 rump.ifconfig shmif0 inet 10.1.1.100 export LD_PRELOAD=/usr/lib/librumphijack.so - unset RUMPHIJACK atf_check -s exit:0 mkdir /rump/mnt atf_check -s exit:0 mount_nfs 10.1.1.1:/export /rump/mnt
CVS commit: src/tests/rump
Module Name:src
Committed By: pooka
Date: Thu Mar 10 14:09:47 UTC 2011
Modified Files:
src/tests/rump: Makefile
Added Files:
src/tests/rump/rumpnet: Makefile t_shmif.sh
Log Message:
Add a test checks that 16 rump kernels on one shmif bus can ping
each other.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/rump/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/rump/rumpnet/Makefile \
src/tests/rump/rumpnet/t_shmif.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/rump/Makefile
diff -u src/tests/rump/Makefile:1.5 src/tests/rump/Makefile:1.6
--- src/tests/rump/Makefile:1.5 Tue Jul 13 21:13:29 2010
+++ src/tests/rump/Makefile Thu Mar 10 14:09:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/07/13 21:13:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2011/03/10 14:09:46 pooka Exp $
#
.include bsd.own.mk
@@ -6,6 +6,6 @@
TESTSDIR= ${TESTSBASE}/rump
SUBDIR= kernspace
-TESTS_SUBDIRS= .WAIT rumpkern rumpvfs modautoload
+TESTS_SUBDIRS= .WAIT rumpkern rumpnet rumpvfs modautoload
.include bsd.test.mk
Added files:
Index: src/tests/rump/rumpnet/Makefile
diff -u /dev/null src/tests/rump/rumpnet/Makefile:1.1
--- /dev/null Thu Mar 10 14:09:47 2011
+++ src/tests/rump/rumpnet/Makefile Thu Mar 10 14:09:46 2011
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2011/03/10 14:09:46 pooka Exp $
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/rump/rumpnet
+
+TESTS_SH= t_shmif
+
+.include bsd.test.mk
Index: src/tests/rump/rumpnet/t_shmif.sh
diff -u /dev/null src/tests/rump/rumpnet/t_shmif.sh:1.1
--- /dev/null Thu Mar 10 14:09:47 2011
+++ src/tests/rump/rumpnet/t_shmif.sh Thu Mar 10 14:09:46 2011
@@ -0,0 +1,78 @@
+# $NetBSD: t_shmif.sh,v 1.1 2011/03/10 14:09:46 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+atf_test_case crossping cleanup
+
+crossping_head()
+{
+ atf_set descr start 16 rump kernels on one shmif bus and crossping
+}
+
+startserver()
+{
+
+ export RUMP_SERVER=unix://sock${1}
+ atf_check -s exit:0 rump_server -lrumpnet -lrumpnet_net \
+ -lrumpnet_netinet -lrumpnet_shmif ${RUMP_SERVER}
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus
+ atf_check -s exit:0 rump.ifconfig shmif0 inet 1.1.1.${1}
+}
+
+pingothers()
+{
+
+}
+
+crossping_body()
+{
+
+ for x in `jot 16` ; do startserver $x ; done
+ for x in `jot 16`
+ do
+ export RUMP_SERVER=unix://sock${x}
+ for y in `jot 16`
+ do
+ [ ${y} -eq ${x} ] continue
+ atf_check -s exit:0 -o ignore -e ignore \
+ rump.ping -c 1 1.1.1.${y}
+ done
+ done
+}
+
+crossping_cleanup()
+{
+
+ for x in `jot 16` ; do RUMP_SERVER=unix://sock${x} rump.halt ; done
+ :
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case crossping
+}
CVS commit: src
Module Name:src Committed By: pooka Date: Thu Mar 10 14:11:19 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Log Message: rumpnet tests To generate a diff of this commit: cvs rdiff -u -r1.264 -r1.265 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.32 -r1.33 src/etc/mtree/NetBSD.dist.tests 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.264 src/distrib/sets/lists/tests/mi:1.265 --- src/distrib/sets/lists/tests/mi:1.264 Thu Mar 10 11:16:03 2011 +++ src/distrib/sets/lists/tests/mi Thu Mar 10 14:11:18 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.264 2011/03/10 11:16:03 pooka Exp $ +# $NetBSD: mi,v 1.265 2011/03/10 14:11:18 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2045,6 +2045,9 @@ ./usr/tests/rump/rumpkern/h_client/h_stresscli tests-rump-tests atf ./usr/tests/rump/rumpkern/h_server tests-rump-tests ./usr/tests/rump/rumpkern/h_server/h_simpleserver tests-rump-tests atf +./usr/tests/rump/rumpnet tests-rump-tests +./usr/tests/rump/rumpnet/Atffile tests-rump-tests atf +./usr/tests/rump/rumpnet/t_shmif tests-rump-tests atf ./usr/tests/rump/rumpvfs tests-rump-tests ./usr/tests/rump/rumpvfs/Atffile tests-rump-tests atf ./usr/tests/rump/rumpvfs/t_basic tests-rump-tests atf Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.32 src/etc/mtree/NetBSD.dist.tests:1.33 --- src/etc/mtree/NetBSD.dist.tests:1.32 Thu Mar 10 11:16:03 2011 +++ src/etc/mtree/NetBSD.dist.tests Thu Mar 10 14:11:18 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.32 2011/03/10 11:16:03 pooka Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.33 2011/03/10 14:11:18 pooka Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -213,6 +213,7 @@ ./usr/tests/rump/rumpkern ./usr/tests/rump/rumpkern/h_client ./usr/tests/rump/rumpkern/h_server +./usr/tests/rump/rumpnet ./usr/tests/rump/rumpvfs ./usr/tests/sbin ./usr/tests/sbin/fsck_ffs
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Thu Mar 10 14:27:32 UTC 2011
Modified Files:
src/libexec/ld.elf_so: README.TLS rtld.h tls.c
Log Message:
Fix prototype for __tls_get_addr. Add a generic implementation of it
using __tls_get_addr. Update TLS notes.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/libexec/ld.elf_so/README.TLS \
src/libexec/ld.elf_so/tls.c
cvs rdiff -u -r1.101 -r1.102 src/libexec/ld.elf_so/rtld.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/README.TLS
diff -u src/libexec/ld.elf_so/README.TLS:1.1 src/libexec/ld.elf_so/README.TLS:1.2
--- src/libexec/ld.elf_so/README.TLS:1.1 Wed Mar 9 23:10:07 2011
+++ src/libexec/ld.elf_so/README.TLS Thu Mar 10 14:27:31 2011
@@ -3,11 +3,7 @@
(1) Declare TLS variant in machine/types.h by defining either
__HAVE_TLS_VARIANT_I or __HAVE_TLS_VARIANT_II.
-(2) crt0.o has to call _rtld_tls_static_setup() if _DYNAMIC == NULL.
-This part is already done if the new src/lib/csu/arch layout is used
-by the architecture.
-
-(3) _lwp_makecontext has to set the reserved register or kernel transfer
+(2) _lwp_makecontext has to set the reserved register or kernel transfer
variable in uc_mcontext to the provided value of 'private'.
This is not possible on the VAX as there is no free space in ucontext_t.
@@ -15,38 +11,21 @@
everything using ucontext_t. Debug support depends on getting the data from
ucontext_t, so the second option is possibly required.
-(4) _lwp_setprivate(2) has to update the same register as
+(3) _lwp_setprivate(2) has to update the same register as
_lwp_makecontext. cpu_lwp_setprivate has to call _lwp_setprivate(2) to
reflect the kernel view. cpu_switch has to update the mapping.
_lwp_setprivate is used for the initial thread, all other threads
created by libpthread use _lwp_makecontext for this purpose.
-(5) Provide __tls_get_addr and possible other MD functions for dynamic
+(4) Provide __tls_get_addr and possible other MD functions for dynamic
TLS offset computation. If such alternative entry points exist (currently
only i386), also add a weak reference to 0 in src/lib/libc/tls/tls.c.
-The generic implementation is:
-
-#include sys/cdefs.h
-#include sys/tls.h
-#include lwp.h
-
-/* Weak entry is overriden by ld.elf_so for dynamic linkage */
-weak_alias(__tls_get_addr, __libc__tls_get_addr)
-
-void *
-__libc__tls_get_addr(size_t idx[2])
-{
- struct tls_tcb *tcb;
-
- tcb = _lwp_getprivate();
- return _rtld_tls_get_addr(tcb, idx[0], idx[1]);
-}
-
-XXX Document optimisations based idx[0]
+The generic implementation can be found in tls.c and is used with
+__HAVE_COMMON___TLS_GET_ADDR. It depends on ___lwp_getprivate_fast.
-(6) Implement the necessary relocation records in mdreloc.c. There are
+(5) Implement the necessary relocation records in mdreloc.c. There are
typically three relocation types found in dynamic binaries:
(a) R_TYPE(TLS_DTPOFF): Offset inside the module. The common TLS code
@@ -73,7 +52,7 @@
e.g. starting offset is counting down from the TCB.
-(7) Implement _lwp_getprivate_fast() in machine/mcontext.h and set
+(6) Implement _lwp_getprivate_fast() in machine/mcontext.h and set
__HAVE___LWP_GETPRIVATE_FAST.
(8) Test using src/tests/lib/libc/tls. Make sure with objdump -R that
Index: src/libexec/ld.elf_so/tls.c
diff -u src/libexec/ld.elf_so/tls.c:1.1 src/libexec/ld.elf_so/tls.c:1.2
--- src/libexec/ld.elf_so/tls.c:1.1 Wed Mar 9 23:10:07 2011
+++ src/libexec/ld.elf_so/tls.c Thu Mar 10 14:27:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.1 2011/03/09 23:10:07 joerg Exp $ */
+/* $NetBSD: tls.c,v 1.2 2011/03/10 14:27:31 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,9 +29,10 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: tls.c,v 1.1 2011/03/09 23:10:07 joerg Exp $);
+__RCSID($NetBSD: tls.c,v 1.2 2011/03/10 14:27:31 joerg Exp $);
#include sys/param.h
+#include sys/ucontext.h
#include lwp.h
#include string.h
#include rtld.h
@@ -232,4 +233,28 @@
return;
}
+#ifdef __HAVE_COMMON___TLS_GET_ADDR
+/*
+ * The fast path is access to an already allocated DTV entry.
+ * This checks the current limit and the entry without needing any
+ * locking. Entries are only freed on dlclose() and it is an application
+ * bug if code of the module is still running at that point.
+ */
+void *
+__tls_get_addr(void *arg_)
+{
+ size_t *arg = (size_t *)arg_;
+ void **dtv;
+ struct tls_tcb *tcb = __lwp_getprivate_fast();
+ size_t idx = arg[0], offset = arg[1];
+
+ dtv = tcb-tcb_dtv;
+
+ if (__predict_true(idx DTV_MAX_INDEX(dtv) dtv[idx] != NULL))
+ return (uint8_t *)dtv[idx] + offset;
+
+ return _rtld_tls_get_addr(tcb, idx, offset);
+}
+#endif
+
#endif /* __HAVE_TLS_VARIANT_I || __HAVE_TLS_VARIANT_II */
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.101
CVS commit: src/tests/lib/libc/tls
Module Name:src
Committed By: skrll
Date: Thu Mar 10 14:31:07 UTC 2011
Modified Files:
src/tests/lib/libc/tls: Makefile
Log Message:
Deal with all objdir methods.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/tls/Makefile
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/libc/tls/Makefile
diff -u src/tests/lib/libc/tls/Makefile:1.1 src/tests/lib/libc/tls/Makefile:1.2
--- src/tests/lib/libc/tls/Makefile:1.1 Wed Mar 9 23:10:07 2011
+++ src/tests/lib/libc/tls/Makefile Thu Mar 10 14:31:07 2011
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2011/03/09 23:10:07 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/10 14:31:07 skrll Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/lib/libc/tls
SUBDIR+= dso
+DSODIR!= cd ${.CURDIR}/../tls_dso ${PRINTOBJDIR}
+
TESTS_C+= t_tls_static t_tls_dynamic t_tls_dlopen
SRCS.t_tls_static= t_tls_static.c t_tls_static_helper.c
LDADD.t_tls_static+= -lpthread -static
LDADD.t_tls_dynamic+= -lpthread \
- -Wl,-rpath,${TESTSDIR} -L../tls_dso -lh_tls_dynamic
+ -Wl,-rpath,${TESTSDIR} -L${DSODIR} -lh_tls_dynamic
LDADD.t_tls_dlopen+= -lpthread -Wl,-rpath,${TESTSDIR} -Wl,-export-dynamic
.include bsd.test.mk
CVS commit: src/libexec/httpd
Module Name:src Committed By: reed Date: Thu Mar 10 14:37:17 UTC 2011 Modified Files: src/libexec/httpd: bozohttpd.8 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/libexec/httpd/bozohttpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/bozohttpd.8 diff -u src/libexec/httpd/bozohttpd.8:1.24 src/libexec/httpd/bozohttpd.8:1.25 --- src/libexec/httpd/bozohttpd.8:1.24 Tue Sep 21 07:05:28 2010 +++ src/libexec/httpd/bozohttpd.8 Thu Mar 10 14:37:16 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: bozohttpd.8,v 1.24 2010/09/21 07:05:28 wiz Exp $ +.\ $NetBSD: bozohttpd.8,v 1.25 2011/03/10 14:37:16 reed Exp $ .\ .\ $eterna: bozohttpd.8,v 1.99 2010/09/20 22:26:28 mrg Exp $ .\ @@ -440,7 +440,7 @@ with PHP, one must use the .Fl C option to specify a CGI handler for a particular file type. -Typically this, this will be like: +Typically this will be like: .Bd -literal httpd -C .php /usr/pkg/bin/php /var/www .Ed
CVS commit: src/libexec/httpd
Module Name:src
Committed By: reed
Date: Thu Mar 10 14:39:40 UTC 2011
Modified Files:
src/libexec/httpd: dir-index-bozo.c
Log Message:
A filename with a colon in it made it appear to be the URI scheme
to various web browsers. So follow RFC 3986 4.2 and prepend ./
to the filename in the generated index hyperlink.
Okayed by mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/libexec/httpd/dir-index-bozo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/dir-index-bozo.c
diff -u src/libexec/httpd/dir-index-bozo.c:1.11 src/libexec/httpd/dir-index-bozo.c:1.12
--- src/libexec/httpd/dir-index-bozo.c:1.11 Mon Sep 20 23:11:38 2010
+++ src/libexec/httpd/dir-index-bozo.c Thu Mar 10 14:39:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dir-index-bozo.c,v 1.11 2010/09/20 23:11:38 mrg Exp $ */
+/* $NetBSD: dir-index-bozo.c,v 1.12 2011/03/10 14:39:40 reed Exp $ */
/* $eterna: dir-index-bozo.c,v 1.18 2010/09/20 22:26:29 mrg Exp $ */
@@ -145,6 +145,10 @@
} else if (S_ISDIR(sb.st_mode)) {
bozo_printf(httpd, a href=\%s/\, name);
l += bozo_printf(httpd, %s/, name);
+ } else if (strchr(name, ':') != NULL) {
+ /* RFC 3986 4.2 */
+ bozo_printf(httpd, a href=\./%s\, name);
+ l += bozo_printf(httpd, %s, name);
} else {
bozo_printf(httpd, a href=\%s\, name);
l += bozo_printf(httpd, %s, name);
CVS commit: src/tests/usr.bin/shmif_dumpbus
Module Name:src
Committed By: pooka
Date: Thu Mar 10 14:49:17 UTC 2011
Modified Files:
src/tests/usr.bin/shmif_dumpbus: Makefile
Log Message:
remember to install test data files too. thanks, Paul.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/shmif_dumpbus/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/shmif_dumpbus/Makefile
diff -u src/tests/usr.bin/shmif_dumpbus/Makefile:1.1 src/tests/usr.bin/shmif_dumpbus/Makefile:1.2
--- src/tests/usr.bin/shmif_dumpbus/Makefile:1.1 Thu Mar 10 11:13:33 2011
+++ src/tests/usr.bin/shmif_dumpbus/Makefile Thu Mar 10 14:49:17 2011
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2011/03/10 11:13:33 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2011/03/10 14:49:17 pooka Exp $
#
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/usr.bin/shmif_dumpbus
+FILESDIR= ${TESTSDIR}
TESTS_SH= t_basic
+FILES+= d_pcap.out d_pkthdrs.out shmbus.bz2.uue
+
.include bsd.test.mk
CVS commit: src/gnu/usr.bin/gcc4/arch/hppa
Module Name:src Committed By: skrll Date: Thu Mar 10 15:15:26 UTC 2011 Modified Files: src/gnu/usr.bin/gcc4/arch/hppa: auto-host.h Log Message: Re-run mknative to pick up TLS support.. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/gnu/usr.bin/gcc4/arch/hppa/auto-host.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/gcc4/arch/hppa/auto-host.h diff -u src/gnu/usr.bin/gcc4/arch/hppa/auto-host.h:1.7 src/gnu/usr.bin/gcc4/arch/hppa/auto-host.h:1.8 --- src/gnu/usr.bin/gcc4/arch/hppa/auto-host.h:1.7 Sat May 8 03:00:12 2010 +++ src/gnu/usr.bin/gcc4/arch/hppa/auto-host.h Thu Mar 10 15:15:26 2011 @@ -272,7 +272,7 @@ /* Define if your assembler supports thread-local storage. */ #ifndef USED_FOR_TARGET -/* #undef HAVE_AS_TLS */ +#define HAVE_AS_TLS 1 #endif
CVS commit: src/sys/arch/newsmips/newsmips
Module Name:src
Committed By: tsutsui
Date: Thu Mar 10 15:40:36 UTC 2011
Modified Files:
src/sys/arch/newsmips/newsmips: news3400.c news5000.c
Log Message:
Set correct struct clockframe .intr value for hardclock(9).
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/newsmips/newsmips/news3400.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/newsmips/newsmips/news5000.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/newsmips/newsmips/news3400.c
diff -u src/sys/arch/newsmips/newsmips/news3400.c:1.21 src/sys/arch/newsmips/newsmips/news3400.c:1.22
--- src/sys/arch/newsmips/newsmips/news3400.c:1.21 Wed Mar 9 13:21:36 2011
+++ src/sys/arch/newsmips/newsmips/news3400.c Thu Mar 10 15:40:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: news3400.c,v 1.21 2011/03/09 13:21:36 tsutsui Exp $ */
+/* $NetBSD: news3400.c,v 1.22 2011/03/10 15:40:36 tsutsui Exp $ */
/*-
* Copyright (C) 1999 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: news3400.c,v 1.21 2011/03/09 13:21:36 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: news3400.c,v 1.22 2011/03/10 15:40:36 tsutsui Exp $);
#define __INTR_PRIVATE
#include sys/param.h
@@ -102,7 +102,7 @@
struct clockframe cf = {
.pc = pc,
.sr = status,
- .intr = (curcpu()-ci_idepth 0),
+ .intr = (curcpu()-ci_idepth 1),
};
hardclock(cf);
intrcnt[HARDCLOCK_INTR]++;
Index: src/sys/arch/newsmips/newsmips/news5000.c
diff -u src/sys/arch/newsmips/newsmips/news5000.c:1.19 src/sys/arch/newsmips/newsmips/news5000.c:1.20
--- src/sys/arch/newsmips/newsmips/news5000.c:1.19 Wed Mar 9 13:21:36 2011
+++ src/sys/arch/newsmips/newsmips/news5000.c Thu Mar 10 15:40:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: news5000.c,v 1.19 2011/03/09 13:21:36 tsutsui Exp $ */
+/* $NetBSD: news5000.c,v 1.20 2011/03/10 15:40:36 tsutsui Exp $ */
/*-
* Copyright (C) 1999 SHIMIZU Ryo. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: news5000.c,v 1.19 2011/03/09 13:21:36 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: news5000.c,v 1.20 2011/03/10 15:40:36 tsutsui Exp $);
#define __INTR_PRIVATE
#include sys/param.h
@@ -89,7 +89,6 @@
static int l2cnt = 0;
#endif
uint32_t int2stat;
- struct clockframe cf;
int2stat = *(volatile uint32_t *)NEWS5000_INTST2;
@@ -105,11 +104,12 @@
#endif
if (int2stat NEWS5000_INT2_TIMER0) {
+struct clockframe cf = {
+ .pc = pc,
+ .sr = status,
+ .intr = (curcpu()-ci_idepth 1),
+};
*(volatile uint32_t *)NEWS5000_TIMER0 = 1;
-
-cf.pc = pc;
-cf.sr = status;
-
hardclock(cf);
intrcnt[HARDCLOCK_INTR]++;
}
CVS commit: src/distrib/sets/lists/tests
Module Name:src
Committed By: njoly
Date: Thu Mar 10 16:27:03 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
Log Message:
+libh_tls_{dlopen,dynamic}.so.1.debug
To generate a diff of this commit:
cvs rdiff -u -r1.265 -r1.266 src/distrib/sets/lists/tests/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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.265 src/distrib/sets/lists/tests/mi:1.266
--- src/distrib/sets/lists/tests/mi:1.265 Thu Mar 10 14:11:18 2011
+++ src/distrib/sets/lists/tests/mi Thu Mar 10 16:27:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.265 2011/03/10 14:11:18 pooka Exp $
+# $NetBSD: mi,v 1.266 2011/03/10 16:27:03 njoly Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -421,6 +421,8 @@
./usr/libdata/debug/usr/tests/lib/libc/sys/t_cerror.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigqueue.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/tlstests-lib-debug
+./usr/libdata/debug/usr/tests/lib/libc/tls/libh_tls_dlopen.so.1.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/tls/libh_tls_dynamic.so.1.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_dlopen.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_dynamic.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_static.debug tests-lib-debug debug,atf
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: njoly Date: Thu Mar 10 16:50:11 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: +tmux.debug To generate a diff of this commit: cvs rdiff -u -r1.1595 -r1.1596 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1595 src/distrib/sets/lists/comp/mi:1.1596 --- src/distrib/sets/lists/comp/mi:1.1595 Wed Mar 9 23:10:05 2011 +++ src/distrib/sets/lists/comp/mi Thu Mar 10 16:50:10 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1595 2011/03/09 23:10:05 joerg Exp $ +# $NetBSD: mi,v 1.1596 2011/03/10 16:50:10 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3422,6 +3422,7 @@ ./usr/libdata/debug/usr/bin/tic.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/time.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/tip.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/tmux.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/tn3270.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/top.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/touch.debug comp-util-debug debug
CVS commit: src/sys/arch/ews4800mips/ews4800mips
Module Name:src
Committed By: tsutsui
Date: Thu Mar 10 17:05:41 UTC 2011
Modified Files:
src/sys/arch/ews4800mips/ews4800mips: tr2_intr.c tr2a_intr.c
Log Message:
Set correct struct clockframe .intr value for hardclock(9).
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.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/ews4800mips/ews4800mips/tr2_intr.c
diff -u src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c:1.11 src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c:1.12
--- src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c:1.11 Sun Feb 20 07:55:20 2011
+++ src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c Thu Mar 10 17:05:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tr2_intr.c,v 1.11 2011/02/20 07:55:20 matt Exp $ */
+/* $NetBSD: tr2_intr.c,v 1.12 2011/03/10 17:05:41 tsutsui Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tr2_intr.c,v 1.11 2011/02/20 07:55:20 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: tr2_intr.c,v 1.12 2011/03/10 17:05:41 tsutsui Exp $);
#define __INTR_PRIVATE
#include sys/param.h
@@ -154,7 +154,7 @@
if (ipending MIPS_INT_MASK_5) { /* CLOCK */
cf.pc = pc;
cf.sr = status;
- cf.intr = (curcpu()-ci_idepth 0);
+ cf.intr = (curcpu()-ci_idepth 1);
*PICNIC_INT5_STATUS_REG = 0;
r = *PICNIC_INT5_STATUS_REG;
Index: src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c
diff -u src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c:1.14 src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c:1.15
--- src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c:1.14 Thu Feb 24 14:40:43 2011
+++ src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c Thu Mar 10 17:05:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tr2a_intr.c,v 1.14 2011/02/24 14:40:43 tsutsui Exp $ */
+/* $NetBSD: tr2a_intr.c,v 1.15 2011/03/10 17:05:41 tsutsui Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tr2a_intr.c,v 1.14 2011/02/24 14:40:43 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: tr2a_intr.c,v 1.15 2011/03/10 17:05:41 tsutsui Exp $);
#define __INTR_PRIVATE
#include sys/param.h
@@ -183,7 +183,7 @@
if ((ipending MIPS_INT_MASK_5) (intc_cause INTC_INT5)) {
cf.pc = pc;
cf.sr = status;
- cf.intr = (curcpu()-ci_idepth 0);
+ cf.intr = (curcpu()-ci_idepth 1);
tr2a_wbflush();
*INTC_CLEAR_REG = 0x7c;
*INTC_STATUS_REG;
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Thu Mar 10 17:09:17 UTC 2011 Modified Files: src/share/man/man4: lmc.4 Log Message: Fix xref to tcpdump, from Anon Ymous. Use Fx/Nx/Ox while here. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/lmc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/lmc.4 diff -u src/share/man/man4/lmc.4:1.17 src/share/man/man4/lmc.4:1.18 --- src/share/man/man4/lmc.4:1.17 Wed Oct 14 23:32:42 2009 +++ src/share/man/man4/lmc.4 Thu Mar 10 17:09:17 2011 @@ -53,7 +53,7 @@ .\ * PLEASE DO NOT UN-IFDEF THIS FILE! * .\ * * * * * * * * * * * * * * * * * * * * * .\ -.\ $NetBSD: lmc.4,v 1.17 2009/10/14 23:32:42 joerg Exp $ +.\ $NetBSD: lmc.4,v 1.18 2011/03/10 17:09:17 wiz Exp $ .\ .Dd April 11, 2006 .Dt LMC 4 @@ -97,9 +97,9 @@ The .Nm driver works with -.Tn FreeBSD , -.Tn NetBSD , -.Tn OpenBSD , +.Fx , +.Nx , +.Ox , .Tn BSD/OS , and .Tn Linux @@ -535,7 +535,7 @@ bring up a link between two machines, then run .Xr ping 8 and -.Xr tcpdump 1 : +.Xr tcpdump 8 : .Bd -unfilled -offset indent -compact .Ic ping 10.0.0.1 .Ed @@ -639,7 +639,6 @@ supported. .\ .Sh SEE ALSO -.Xr tcpdump 1 , .Xr ioctl 2 , .Xr bpf 4 , .Xr de 4 ,
CVS commit: src/external/bsd/libpcap/dist
Module Name:src Committed By: wiz Date: Thu Mar 10 17:11:17 UTC 2011 Modified Files: src/external/bsd/libpcap/dist: pcap.3pcap.in pcap_dump_open.3pcap.in pcap_open_offline.3pcap.in Log Message: It's tcpdump(8), not (1). From Anon Ymous. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/libpcap/dist/pcap.3pcap.in \ src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in \ src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libpcap/dist/pcap.3pcap.in diff -u src/external/bsd/libpcap/dist/pcap.3pcap.in:1.1.1.2 src/external/bsd/libpcap/dist/pcap.3pcap.in:1.2 --- src/external/bsd/libpcap/dist/pcap.3pcap.in:1.1.1.2 Sun Dec 5 01:27:19 2010 +++ src/external/bsd/libpcap/dist/pcap.3pcap.in Thu Mar 10 17:11:17 2011 @@ -363,7 +363,7 @@ script or some other configuration script to check whether the libpcap 1.0 APIs are available and use them only if they are. .SH SEE ALSO -autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8), +autoconf(1), tcpdump(8), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8), usermod(1M) .SH AUTHORS The original authors of libpcap are: Index: src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in diff -u src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in:1.1.1.2 src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in:1.2 --- src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in:1.1.1.2 Sun Dec 5 01:27:21 2010 +++ src/external/bsd/libpcap/dist/pcap_dump_open.3pcap.in Thu Mar 10 17:11:17 2011 @@ -40,7 +40,7 @@ .I fname specifies the name of the file to open. The file will have the same format as those used by -.BR tcpdump (1) +.BR tcpdump (8) and .BR tcpslice (1). The name - in a synonym Index: src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in diff -u src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in:1.1.1.2 src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in:1.2 --- src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in:1.1.1.2 Sun Dec 5 01:27:22 2010 +++ src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in Thu Mar 10 17:11:17 2011 @@ -47,7 +47,7 @@ format as described in .BR pcap-savefile (@MAN_FILE_FORMATS@), which is the file format used by, among other programs, -.BR tcpdump (1) +.BR tcpdump (8) and .BR tcpslice (1), or can have the pcap-ng file format, although not all pcap-ng files can
CVS commit: src/sys/arch/pmax/pmax
Module Name:src Committed By: tsutsui Date: Thu Mar 10 17:13:13 UTC 2011 Modified Files: src/sys/arch/pmax/pmax: dec_3max.c dec_3min.c Log Message: Set correct struct clockframe .intr value for hardclock(9). To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/pmax/pmax/dec_3max.c cvs rdiff -u -r1.68 -r1.69 src/sys/arch/pmax/pmax/dec_3min.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/pmax/pmax/dec_3max.c diff -u src/sys/arch/pmax/pmax/dec_3max.c:1.52 src/sys/arch/pmax/pmax/dec_3max.c:1.53 --- src/sys/arch/pmax/pmax/dec_3max.c:1.52 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/dec_3max.c Thu Mar 10 17:13:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3max.c,v 1.52 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: dec_3max.c,v 1.53 2011/03/10 17:13:13 tsutsui Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -70,7 +70,7 @@ #define __INTR_PRIVATE #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dec_3max.c,v 1.52 2011/02/20 07:50:25 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: dec_3max.c,v 1.53 2011/03/10 17:13:13 tsutsui Exp $); #include dzkbd.h @@ -271,6 +271,7 @@ r(MIPS_PHYS_TO_KSEG1(KN02_SYS_CLOCK))); cf.pc = pc; cf.sr = status; + cf.intr = (curcpu()-ci_idepth 1); hardclock(cf); pmax_clock_evcnt.ev_count++; Index: src/sys/arch/pmax/pmax/dec_3min.c diff -u src/sys/arch/pmax/pmax/dec_3min.c:1.68 src/sys/arch/pmax/pmax/dec_3min.c:1.69 --- src/sys/arch/pmax/pmax/dec_3min.c:1.68 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/dec_3min.c Thu Mar 10 17:13:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3min.c,v 1.68 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: dec_3min.c,v 1.69 2011/03/10 17:13:13 tsutsui Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -70,7 +70,7 @@ #define __INTR_PRIVATE #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dec_3min.c,v 1.68 2011/02/20 07:50:25 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: dec_3min.c,v 1.69 2011/03/10 17:13:13 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -369,6 +369,7 @@ cf.pc = pc; cf.sr = status; +cf.intr = (curcpu()-ci_idepth 1); hardclock(cf); pmax_clock_evcnt.ev_count++; }
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Thu Mar 10 17:22:17 UTC 2011 Modified Files: src/libexec/ld.elf_so: README.TLS Log Message: Add source reference for _lwp_makecontext and __HAVE___LWP_GETPRIVATE_FAST. Fix enumeration. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/libexec/ld.elf_so/README.TLS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/README.TLS diff -u src/libexec/ld.elf_so/README.TLS:1.2 src/libexec/ld.elf_so/README.TLS:1.3 --- src/libexec/ld.elf_so/README.TLS:1.2 Thu Mar 10 14:27:31 2011 +++ src/libexec/ld.elf_so/README.TLS Thu Mar 10 17:22:17 2011 @@ -4,7 +4,8 @@ __HAVE_TLS_VARIANT_I or __HAVE_TLS_VARIANT_II. (2) _lwp_makecontext has to set the reserved register or kernel transfer -variable in uc_mcontext to the provided value of 'private'. +variable in uc_mcontext to the provided value of 'private'. See +src/lib/libc/arch/$PLATFORM/gen/_lwp.c. This is not possible on the VAX as there is no free space in ucontext_t. This requires either a special version of _lwp_create or versioning @@ -53,8 +54,8 @@ e.g. starting offset is counting down from the TCB. (6) Implement _lwp_getprivate_fast() in machine/mcontext.h and set -__HAVE___LWP_GETPRIVATE_FAST. +__HAVE___LWP_GETPRIVATE_FAST in machine/types.h. -(8) Test using src/tests/lib/libc/tls. Make sure with objdump -R that +(7) Test using src/tests/lib/libc/tls. Make sure with objdump -R that t_tls_dynamic has two TPOFF relocations and h_tls_dlopen.so.1 and libh_tls_dynamic.so.1 have both two DTPMOD and DTPOFF relocations.
CVS commit: src/sys/arch/emips/emips
Module Name:src Committed By: tsutsui Date: Thu Mar 10 17:22:51 UTC 2011 Modified Files: src/sys/arch/emips/emips: interrupt.c Log Message: Set correct struct clockframe .intr value for hardclock(9). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/emips/interrupt.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/emips/emips/interrupt.c diff -u src/sys/arch/emips/emips/interrupt.c:1.2 src/sys/arch/emips/emips/interrupt.c:1.3 --- src/sys/arch/emips/emips/interrupt.c:1.2 Tue Feb 22 08:20:20 2011 +++ src/sys/arch/emips/emips/interrupt.c Thu Mar 10 17:22:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: interrupt.c,v 1.2 2011/02/22 08:20:20 matt Exp $ */ +/* $NetBSD: interrupt.c,v 1.3 2011/03/10 17:22:51 tsutsui Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.2 2011/02/22 08:20:20 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.3 2011/03/10 17:22:51 tsutsui Exp $); #include sys/param.h #include sys/device.h @@ -127,6 +127,7 @@ cf.pc = pc; cf.sr = status; + cf.intr = (curcpu()-ci_idepth 1); ipending = TheAic-IrqStatus;
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src Committed By: tsutsui Date: Thu Mar 10 17:27:43 UTC 2011 Modified Files: src/sys/arch/hpcmips/vr: rtc.c Log Message: Set correct struct clockframe .intr value for hardclock(9). To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcmips/vr/rtc.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/hpcmips/vr/rtc.c diff -u src/sys/arch/hpcmips/vr/rtc.c:1.26 src/sys/arch/hpcmips/vr/rtc.c:1.27 --- src/sys/arch/hpcmips/vr/rtc.c:1.26 Sat Dec 12 14:44:08 2009 +++ src/sys/arch/hpcmips/vr/rtc.c Thu Mar 10 17:27:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rtc.c,v 1.26 2009/12/12 14:44:08 tsutsui Exp $ */ +/* $NetBSD: rtc.c,v 1.27 2011/03/10 17:27:43 tsutsui Exp $ */ /*- * Copyright (c) 1999 Shin Takemura. All rights reserved. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.26 2009/12/12 14:44:08 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.27 2011/03/10 17:27:43 tsutsui Exp $); #include opt_vr41xx.h @@ -44,6 +44,7 @@ #include sys/systm.h #include sys/timetc.h #include sys/device.h +#include sys/cpu.h #include machine/sysconf.h #include machine/bus.h @@ -230,6 +231,7 @@ bus_space_write_2(sc-sc_iot, sc-sc_ioh, RTCINT_REG_W, RTCINT_ALL); cf.pc = pc; cf.sr = statusReg; + cf.intr = (curcpu()-ci_idepth 1); hardclock(cf); return 0;
CVS commit: src/sys/arch/mipsco/mipsco
Module Name:src Committed By: tsutsui Date: Thu Mar 10 17:30:12 UTC 2011 Modified Files: src/sys/arch/mipsco/mipsco: mips_3x30.c Log Message: Set correct struct clockframe .intr value for hardclock(9). To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mipsco/mipsco/mips_3x30.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/mipsco/mipsco/mips_3x30.c diff -u src/sys/arch/mipsco/mipsco/mips_3x30.c:1.13 src/sys/arch/mipsco/mipsco/mips_3x30.c:1.14 --- src/sys/arch/mipsco/mipsco/mips_3x30.c:1.13 Sun Feb 20 07:56:16 2011 +++ src/sys/arch/mipsco/mipsco/mips_3x30.c Thu Mar 10 17:30:12 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mips_3x30.c,v 1.13 2011/02/20 07:56:16 matt Exp $ */ +/* $NetBSD: mips_3x30.c,v 1.14 2011/03/10 17:30:12 tsutsui Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #define __INTR_PRIVATE #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mips_3x30.c,v 1.13 2011/02/20 07:56:16 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mips_3x30.c,v 1.14 2011/03/10 17:30:12 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -89,7 +89,7 @@ cf.pc = pc; cf.sr = status; - cf.intr = (curcpu()-ci_idepth 0); + cf.intr = (curcpu()-ci_idepth 1); rambo_clkintr(cf); }
CVS commit: src/sys/arch/sgimips/dev
Module Name:src Committed By: tsutsui Date: Thu Mar 10 17:32:46 UTC 2011 Modified Files: src/sys/arch/sgimips/dev: int.c Log Message: Set correct struct clockframe .intr value for hardclock(9). To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sgimips/dev/int.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/sgimips/dev/int.c diff -u src/sys/arch/sgimips/dev/int.c:1.22 src/sys/arch/sgimips/dev/int.c:1.23 --- src/sys/arch/sgimips/dev/int.c:1.22 Sun Feb 20 07:59:50 2011 +++ src/sys/arch/sgimips/dev/int.c Thu Mar 10 17:32:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: int.c,v 1.22 2011/02/20 07:59:50 matt Exp $ */ +/* $NetBSD: int.c,v 1.23 2011/03/10 17:32:46 tsutsui Exp $ */ /* * Copyright (c) 2009 Stephen M. Rumble @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: int.c,v 1.22 2011/02/20 07:59:50 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: int.c,v 1.23 2011/03/10 17:32:46 tsutsui Exp $); #define __INTR_PRIVATE #include opt_cputype.h @@ -639,6 +639,7 @@ cf.pc = pc; cf.sr = status; + cf.intr = (curcpu()-ci_idepth 1); hardclock(cf);
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Thu Mar 10 17:38:30 UTC 2011 Modified Files: src/libexec/ld.elf_so: README.TLS Log Message: Add some clarifications To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/libexec/ld.elf_so/README.TLS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/README.TLS diff -u src/libexec/ld.elf_so/README.TLS:1.3 src/libexec/ld.elf_so/README.TLS:1.4 --- src/libexec/ld.elf_so/README.TLS:1.3 Thu Mar 10 17:22:17 2011 +++ src/libexec/ld.elf_so/README.TLS Thu Mar 10 17:38:30 2011 @@ -13,8 +13,13 @@ ucontext_t, so the second option is possibly required. (3) _lwp_setprivate(2) has to update the same register as -_lwp_makecontext. cpu_lwp_setprivate has to call _lwp_setprivate(2) to -reflect the kernel view. cpu_switch has to update the mapping. +_lwp_makecontext uses for the private area pointer. Normally +cpu_lwp_setprivate is provided by MD to reflect the kernel view and +enabled by defining __HAVE_CPU_LWP_SETPRIVATE in machine/types.h. +cpu_setmcontext is responsible for keeping the MI l_private field +synchronised by calling lwp_setprivate as needed. + +cpu_switchto has to update the mapping. _lwp_setprivate is used for the initial thread, all other threads created by libpthread use _lwp_makecontext for this purpose. @@ -24,7 +29,8 @@ only i386), also add a weak reference to 0 in src/lib/libc/tls/tls.c. The generic implementation can be found in tls.c and is used with -__HAVE_COMMON___TLS_GET_ADDR. It depends on ___lwp_getprivate_fast. +__HAVE_COMMON___TLS_GET_ADDR. It depends on ___lwp_getprivate_fast +(see below). (5) Implement the necessary relocation records in mdreloc.c. There are typically three relocation types found in dynamic binaries:
CVS commit: src/sys/arch/mips/sibyte/dev
Module Name:src Committed By: tsutsui Date: Thu Mar 10 17:40:50 UTC 2011 Modified Files: src/sys/arch/mips/sibyte/dev: sbtimer.c Log Message: Set correct struct clockframe .intr value for hardclock(9). To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mips/sibyte/dev/sbtimer.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/mips/sibyte/dev/sbtimer.c diff -u src/sys/arch/mips/sibyte/dev/sbtimer.c:1.18 src/sys/arch/mips/sibyte/dev/sbtimer.c:1.19 --- src/sys/arch/mips/sibyte/dev/sbtimer.c:1.18 Sun Feb 20 07:47:39 2011 +++ src/sys/arch/mips/sibyte/dev/sbtimer.c Thu Mar 10 17:40:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sbtimer.c,v 1.18 2011/02/20 07:47:39 matt Exp $ */ +/* $NetBSD: sbtimer.c,v 1.19 2011/03/10 17:40:50 tsutsui Exp $ */ /* * Copyright 2000, 2001 @@ -33,12 +33,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sbtimer.c,v 1.18 2011/02/20 07:47:39 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: sbtimer.c,v 1.19 2011/03/10 17:40:50 tsutsui Exp $); #include sys/param.h #include sys/device.h #include sys/systm.h #include sys/kernel.h +#include sys/cpu.h #include mips/locore.h @@ -175,6 +176,7 @@ cf.pc = pc; cf.sr = status; + cf.intr = (curcpu()-ci_idepth 1); hardclock(cf);
CVS commit: src/sys/arch/emips/stand/common
Module Name:src Committed By: pooka Date: Thu Mar 10 18:18:01 UTC 2011 Modified Files: src/sys/arch/emips/stand/common: start.S Log Message: Use NESTED_NOPROFILE instead of VECTOR, since VECTOR grew a .org directive for some reason. from sandrof (i didn't test booting, will wait for autobuild to do the work for me) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/emips/stand/common/start.S 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/emips/stand/common/start.S diff -u src/sys/arch/emips/stand/common/start.S:1.1 src/sys/arch/emips/stand/common/start.S:1.2 --- src/sys/arch/emips/stand/common/start.S:1.1 Wed Jan 26 01:18:54 2011 +++ src/sys/arch/emips/stand/common/start.S Thu Mar 10 18:18:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: start.S,v 1.1 2011/01/26 01:18:54 pooka Exp $ */ +/* $NetBSD: start.S,v 1.2 2011/03/10 18:18:00 pooka Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -99,8 +99,7 @@ * But to test interrupts should be enough */ .org 0x0080 -VECTOR(ExceptionHandler,0) - .frame sp,SIZEOF_CXTINFO,$31 +NESTED_NOPROFILE(ExceptionHandler,SIZEOF_CXTINFO,$31) la k1, UserInterruptHandler lw k1,0(k1) bnek1,zero,Dispatch @@ -216,7 +215,7 @@ rfe .set at -VECTOR_END(ExceptionHandler) +END(ExceptionHandler) .org 0x0200 EXPORT(real_start)
CVS commit: src/sys/rump/fs/lib/libzfs
Module Name:src
Committed By: pooka
Date: Thu Mar 10 19:24:38 UTC 2011
Modified Files:
src/sys/rump/fs/lib/libzfs: Makefile
Added Files:
src/sys/rump/fs/lib/libzfs: component.c
Log Message:
autocreate /dev/zfs. requested by riz
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/fs/lib/libzfs/Makefile
cvs rdiff -u -r0 -r1.4 src/sys/rump/fs/lib/libzfs/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/fs/lib/libzfs/Makefile
diff -u src/sys/rump/fs/lib/libzfs/Makefile:1.2 src/sys/rump/fs/lib/libzfs/Makefile:1.3
--- src/sys/rump/fs/lib/libzfs/Makefile:1.2 Fri Jan 21 13:11:04 2011
+++ src/sys/rump/fs/lib/libzfs/Makefile Thu Mar 10 19:24:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/01/21 13:11:04 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/10 19:24:37 pooka Exp $
#
S!= cd ${.PARSEDIR}/../../../../;pwd
@@ -11,6 +11,7 @@
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs\
-I${RUMPTOP}/librump/rumpdev
+SRCS+= component.c
.include bsd.lib.mk
.include bsd.klinks.mk
Added files:
Index: src/sys/rump/fs/lib/libzfs/component.c
diff -u /dev/null src/sys/rump/fs/lib/libzfs/component.c:1.4
--- /dev/null Thu Mar 10 19:24:38 2011
+++ src/sys/rump/fs/lib/libzfs/component.c Thu Mar 10 19:24:37 2011
@@ -0,0 +1,56 @@
+/* $NetBSD: component.c,v 1.4 2011/03/10 19:24:37 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 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 sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: component.c,v 1.4 2011/03/10 19:24:37 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+RUMP_COMPONENT(RUMP_COMPONENT_VFS)
+{
+ extern const struct bdevsw zfs_bdevsw;
+ extern const struct cdevsw zfs_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach(zfs, zfs_bdevsw, bmaj,
+ zfs_cdevsw, cmaj)) != 0 error != EEXIST)
+ panic(cannot attach zfs: %d, error);
+
+ if ((error = rump_vfs_makeonedevnode(S_IFCHR,
+ /dev/zfs, cmaj, 0)) != 0)
+ panic(cannot create cooked cgd dev nodes: %d, error);
+}
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: pooka Date: Thu Mar 10 19:32:40 UTC 2011 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_znode.c Log Message: pass in correct variable, the old code can't possibly be correct. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.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_znode.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.9 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.10 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.9 Wed Jul 21 17:52:09 2010 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Thu Mar 10 19:32:39 2011 @@ -485,7 +485,7 @@ vp = ZTOV(sharezp); error = getnewvnode(VT_ZFS, zfsvfs-z_parent-z_vfs, - zfs_vnodeop_p, zp-z_vnode); + zfs_vnodeop_p, sharezp-z_vnode); vp-v_type = VDIR; VERIFY(0 == zfs_acl_ids_create(sharezp, IS_ROOT_NODE, vattr,
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: pooka Date: Thu Mar 10 19:35:24 UTC 2011 Modified Files: src/external/cddl/osnet/sys/kern: misc.c Log Message: adjust some pretty likely broken assertion (stksize is hardcoded from caller, but not used here). now zpool doesn't cause a kernel crash anymore. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/misc.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/sys/kern/misc.c diff -u src/external/cddl/osnet/sys/kern/misc.c:1.2 src/external/cddl/osnet/sys/kern/misc.c:1.3 --- src/external/cddl/osnet/sys/kern/misc.c:1.2 Sun Feb 28 14:45:47 2010 +++ src/external/cddl/osnet/sys/kern/misc.c Thu Mar 10 19:35:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.2 2010/02/28 14:45:47 haad Exp $ */ +/* $NetBSD: misc.c,v 1.3 2011/03/10 19:35:24 pooka Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -90,7 +90,8 @@ int error; lwp_t *thr; - ASSERT(stk == NULL stksize == 0 len == 0); + //ASSERT(stk == NULL stksize == 0 len == 0); + ASSERT(stk == NULL len == 0); ASSERT(state == TS_RUN); error = kthread_create(pri, KTHREAD_MPSAFE, NULL,
CVS commit: src/tests/fs
Module Name:src
Committed By: pooka
Date: Thu Mar 10 20:02:27 UTC 2011
Modified Files:
src/tests/fs: Makefile
Added Files:
src/tests/fs/zfs: Makefile t_zpool.sh
Log Message:
Add one simple test case which checks that zpool create results in
a mounted file system. Then run away as quickly as possible.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/tests/fs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/zfs/Makefile src/tests/fs/zfs/t_zpool.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/Makefile
diff -u src/tests/fs/Makefile:1.20 src/tests/fs/Makefile:1.21
--- src/tests/fs/Makefile:1.20 Fri Feb 18 13:07:54 2011
+++ src/tests/fs/Makefile Thu Mar 10 20:02:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/02/18 13:07:54 pooka Exp $
+# $NetBSD: Makefile,v 1.21 2011/03/10 20:02:26 pooka Exp $
.include bsd.own.mk
@@ -10,6 +10,10 @@
TESTS_SUBDIRS+= tmpfs umapfs union
TESTS_SUBDIRS+= vfs
+.if ${MKZFS} != no
+TESTS_SUBDIRS+= zfs
+.endif
+
FILES= h_funcs.subr
FILESDIR= ${TESTSDIR}
Added files:
Index: src/tests/fs/zfs/Makefile
diff -u /dev/null src/tests/fs/zfs/Makefile:1.1
--- /dev/null Thu Mar 10 20:02:27 2011
+++ src/tests/fs/zfs/Makefile Thu Mar 10 20:02:27 2011
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2011/03/10 20:02:27 pooka Exp $
+#
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/fs/zfs
+
+TESTS_SH= t_zpool
+
+.include bsd.test.mk
Index: src/tests/fs/zfs/t_zpool.sh
diff -u /dev/null src/tests/fs/zfs/t_zpool.sh:1.1
--- /dev/null Thu Mar 10 20:02:27 2011
+++ src/tests/fs/zfs/t_zpool.sh Thu Mar 10 20:02:27 2011
@@ -0,0 +1,66 @@
+# $NetBSD: t_zpool.sh,v 1.1 2011/03/10 20:02:27 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+server='rump_server -lrumpvfs -lrumpkern_solaris -lrumpfs_zfs -lrumpdev -lrumpdev_rnd -d key=/dk,hostpath=zfs.img,size=100m'
+
+export RUMP_SERVER=unix://zsuck
+
+atf_test_case create cleanup
+create_head()
+{
+ atf_set descr basic zpool create
+}
+
+IFS=' '
+exmount='rumpfs on / type rumpfs (local)
+jippo on /jippo type zfs (local)
+'
+
+create_body()
+{
+
+ atf_check -s exit:0 -o ignore -e ignore ${server} ${RUMP_SERVER}
+
+ export LD_PRELOAD=/usr/lib/librumphijack.so
+ export RUMPHIJACK=blanket=/dev/zfs:/dk:/jippo
+ atf_check -s exit:0 zpool create jippo /dk
+
+ export RUMPHIJACK=vfs=all
+ atf_check -s exit:0 -o inline:${exmount} mount
+}
+
+create_cleanup()
+{
+
+ rump.halt
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case create
+}
CVS commit: src/etc/mtree
Module Name:src Committed By: pooka Date: Thu Mar 10 20:03:40 UTC 2011 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: tests/fs/zfs To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.33 src/etc/mtree/NetBSD.dist.tests:1.34 --- src/etc/mtree/NetBSD.dist.tests:1.33 Thu Mar 10 14:11:18 2011 +++ src/etc/mtree/NetBSD.dist.tests Thu Mar 10 20:03:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.33 2011/03/10 14:11:18 pooka Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.34 2011/03/10 20:03:40 pooka Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -143,6 +143,7 @@ ./usr/tests/fs/umapfs ./usr/tests/fs/union ./usr/tests/fs/vfs +./usr/tests/fs/zfs ./usr/tests/games ./usr/tests/include ./usr/tests/include/sys
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Thu Mar 10 20:04:46 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: +tp To generate a diff of this commit: cvs rdiff -u -r1.266 -r1.267 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.266 src/distrib/sets/lists/tests/mi:1.267 --- src/distrib/sets/lists/tests/mi:1.266 Thu Mar 10 16:27:03 2011 +++ src/distrib/sets/lists/tests/mi Thu Mar 10 20:04:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.266 2011/03/10 16:27:03 njoly Exp $ +# $NetBSD: mi,v 1.267 2011/03/10 20:04:46 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1311,6 +1311,9 @@ ./usr/tests/fs/vfs/t_unpriv tests-fs-tests atf ./usr/tests/fs/vfs/t_vfsops tests-fs-tests atf ./usr/tests/fs/vfs/t_vnops tests-fs-tests atf +./usr/tests/fs/zfstests-fs-tests +./usr/tests/fs/zfs/Atffile tests-fs-tests atf,zfs +./usr/tests/fs/zfs/t_zpool tests-fs-tests atf,zfs ./usr/tests/gamestests-games-tests ./usr/tests/games/Atffile tests-games-tests ./usr/tests/games/t_factor tests-games-tests
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: phx
Date: Thu Mar 10 21:11:50 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/altboot: brdsetup.c globals.h pci.c
pciide.c stg.c
Log Message:
Make sure the device class is IDE (class 0, subclass 1), before checking
the PCI interface for native/legacy mode. Different subclasses are always
assumed being in native mode. That makes the Acard IDE controller work.
New macros for PCI interface, revision and class.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sandpoint/stand/altboot/brdsetup.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sandpoint/stand/altboot/globals.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/stand/altboot/pci.c \
src/sys/arch/sandpoint/stand/altboot/pciide.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sandpoint/stand/altboot/stg.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/sandpoint/stand/altboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.7 src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.8
--- src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.7 Sun Mar 6 18:22:13 2011
+++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c Thu Mar 10 21:11:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.7 2011/03/06 18:22:13 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.8 2011/03/10 21:11:49 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -211,7 +211,7 @@
/* VIA 686B southbridge at dev 22 */
brdtype = BRD_ENCOREPP1;
}
- else if ((pcicfgread(dev11, PCI_CLASS_REG) 16) == PCI_CLASS_ETH) {
+ else if (PCI_CLASS(pcicfgread(dev11, PCI_CLASS_REG)) == PCI_CLASS_ETH) {
/* ADMtek AN985 (tlp) or RealTek 8169S (re) at dev 11 */
brdtype = BRD_KUROBOX;
}
Index: src/sys/arch/sandpoint/stand/altboot/globals.h
diff -u src/sys/arch/sandpoint/stand/altboot/globals.h:1.8 src/sys/arch/sandpoint/stand/altboot/globals.h:1.9
--- src/sys/arch/sandpoint/stand/altboot/globals.h:1.8 Sun Mar 6 18:22:13 2011
+++ src/sys/arch/sandpoint/stand/altboot/globals.h Thu Mar 10 21:11:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: globals.h,v 1.8 2011/03/06 18:22:13 phx Exp $ */
+/* $NetBSD: globals.h,v 1.9 2011/03/10 21:11:49 phx Exp $ */
#ifdef DEBUG
#define DPRINTF(x) printf x
@@ -80,12 +80,16 @@
void pcicfgwrite(unsigned, int, unsigned);
#define PCI_ID_REG 0x00
-#define PCI_COMMAND_STATUS_REG 0x04
#define PCI_VENDOR(id) ((id) 0x)
#define PCI_PRODUCT(id) (((id) 16) 0x)
#define PCI_VENDOR_INVALID 0x
#define PCI_DEVICE(v,p) ((v) | ((p) 16))
+#define PCI_COMMAND_STATUS_REG 0x04
#define PCI_CLASS_REG 0x08
+#define PCI_CLASS(v) (((v) 16) 0x)
+#define PCI_SUBCLASS(v) (((v) 16) 0xff)
+#define PCI_INTERFACE(v) (((v) 0xff00) 8)
+#define PCI_REVISION(v) ((v) 0xff)
#define PCI_CLASS_PPB 0x0604
#define PCI_CLASS_ETH 0x0200
#define PCI_CLASS_SCSI 0x0100
Index: src/sys/arch/sandpoint/stand/altboot/pci.c
diff -u src/sys/arch/sandpoint/stand/altboot/pci.c:1.4 src/sys/arch/sandpoint/stand/altboot/pci.c:1.5
--- src/sys/arch/sandpoint/stand/altboot/pci.c:1.4 Mon Feb 14 06:21:29 2011
+++ src/sys/arch/sandpoint/stand/altboot/pci.c Thu Mar 10 21:11:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.c,v 1.4 2011/02/14 06:21:29 nisimura Exp $ */
+/* $NetBSD: pci.c,v 1.5 2011/03/10 21:11:49 phx Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -190,25 +190,26 @@
/* 0x00 */
#ifdef DEBUG
printf(%02d:%02d:%02d:, bus, dev, func);
- val = cfgread(bus, dev, func, 0x00);
+ val = cfgread(bus, dev, func, PCI_ID_REG);
printf( chip %04x.%04x, val 0x, val16);
val = cfgread(bus, dev, func, 0x2c);
printf( card %04x.%04x, val 0x, val16);
- val = cfgread(bus, dev, func, 0x08);
+ val = cfgread(bus, dev, func, PCI_CLASS_REG);
printf( rev %02x class %02x.%02x.%02x,
- val 0xff, (val24), (val16) 0xff, (val8) 0xff);
- val = cfgread(bus, dev, func, 0x0c);
+ PCI_REVISION(val), (val24), (val16) 0xff,
+ PCI_INTERFACE(val));
+ val = cfgread(bus, dev, func, PCI_BHLC_REG);
printf( hdr %02x\n, (val16) 0xff);
#endif
/* 0x04 */
- val = cfgread(bus, dev, func, 0x04);
+ val = cfgread(bus, dev, func, PCI_COMMAND_STATUS_REG);
val |= 0x0107; /* enable IO,MEM,MASTER,SERR */
cfgwrite(bus, dev, func, 0x04, val);
/* 0x0c */
val = 0x80 8 | 0x08 /* 32B cache line */;
- cfgwrite(bus, dev, func, 0x0c, val);
+ cfgwrite(bus, dev, func, PCI_BHLC_REG, val);
/* 0x3c */
val = cfgread(bus, dev, func, 0x3c) ~0xff;
@@ -217,13 +218,13 @@
/* skip legacy mode IDE controller BAR assignment */
val = cfgread(bus, dev, func, PCI_CLASS_REG);
- if ((val 16) == PCI_CLASS_IDE ((val 8) 0x05) == 0)
+ if (PCI_CLASS(val) == PCI_CLASS_IDE (PCI_INTERFACE(val) 0x05) == 0)
return 0;
memassign(bus, dev, func);
/* descending toward PCI-PCI bridge */
- if ((cfgread(bus, dev, func, 0x08) 16) == PCI_CLASS_PPB)
CVS commit: src/sys/rump/fs/lib/libzfs
Module Name:src Committed By: wiz Date: Thu Mar 10 22:11:05 UTC 2011 Modified Files: src/sys/rump/fs/lib/libzfs: component.c Log Message: When panicing, at least tell the _real_ reason. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/fs/lib/libzfs/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/fs/lib/libzfs/component.c diff -u src/sys/rump/fs/lib/libzfs/component.c:1.4 src/sys/rump/fs/lib/libzfs/component.c:1.5 --- src/sys/rump/fs/lib/libzfs/component.c:1.4 Thu Mar 10 19:24:37 2011 +++ src/sys/rump/fs/lib/libzfs/component.c Thu Mar 10 22:11:05 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: component.c,v 1.4 2011/03/10 19:24:37 pooka Exp $ */ +/* $NetBSD: component.c,v 1.5 2011/03/10 22:11:05 wiz Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: component.c,v 1.4 2011/03/10 19:24:37 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: component.c,v 1.5 2011/03/10 22:11:05 wiz Exp $); #include sys/param.h #include sys/conf.h @@ -52,5 +52,5 @@ if ((error = rump_vfs_makeonedevnode(S_IFCHR, /dev/zfs, cmaj, 0)) != 0) - panic(cannot create cooked cgd dev nodes: %d, error); + panic(cannot create zfs dev nodes: %d, error); }
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Thu Mar 10 23:02:56 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
Use rumphijack_dlsym() to figure out where __sysctl() is during
init. Otherwise powerpc dlsym() DTWT and returns NULL.
(now i have no idea why dlsym() it works from rcinit(), but i'll
opt to not care)
Hah, only took 15min to debug that crap this time around. I'm
quickly approaching zero-time with it.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.83 src/lib/librumphijack/hijack.c:1.84
--- src/lib/librumphijack/hijack.c:1.83 Thu Mar 10 09:47:32 2011
+++ src/lib/librumphijack/hijack.c Thu Mar 10 23:02:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.83 2011/03/10 09:47:32 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.84 2011/03/10 23:02:56 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.83 2011/03/10 09:47:32 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.84 2011/03/10 23:02:56 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -1870,7 +1870,7 @@
op___sysctl = GETSYSCALL(host, __SYSCTL);
/* we haven't inited yet */
if (__predict_false(op___sysctl == NULL)) {
- op___sysctl = dlsym(RTLD_NEXT, __sysctl);
+ op___sysctl = rumphijack_dlsym(RTLD_NEXT, __sysctl);
}
}
CVS commit: src/sys/arch/arm
Module Name:src Committed By: bsh Date: Fri Mar 11 03:16:14 UTC 2011 Modified Files: src/sys/arch/arm/gemini: files.gemini src/sys/arch/arm/imx: files.imx31 files.imx51 src/sys/arch/arm/omap: files.omap2 src/sys/arch/arm/pic: files.pic pic.c Added Files: src/sys/arch/arm/pic: pic_splfuncs.c Log Message: split arch/arm/pic/pic.c so that we can implement more efficient version of splfoo() while using pic framework. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/gemini/files.gemini cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/files.imx31 cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/files.imx51 cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/files.omap2 cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/pic/files.pic cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/pic/pic.c cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/pic/pic_splfuncs.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/arm/gemini/files.gemini diff -u src/sys/arch/arm/gemini/files.gemini:1.10 src/sys/arch/arm/gemini/files.gemini:1.11 --- src/sys/arch/arm/gemini/files.gemini:1.10 Sun Dec 14 01:57:02 2008 +++ src/sys/arch/arm/gemini/files.gemini Fri Mar 11 03:16:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.gemini,v 1.10 2008/12/14 01:57:02 matt Exp $ +# $NetBSD: files.gemini,v 1.11 2011/03/11 03:16:13 bsh Exp $ # # Configuration info for GEMINI CPU support # Based on omap/files.omap2 @@ -38,7 +38,7 @@ ##file arch/arm/gemini/gemini_nobyteacc_io.S obio # GEMINI interrupt controller -device geminiicu: pic +device geminiicu: pic, pic_splfuncs attach geminiicu at obio with geminiicu file arch/arm/gemini/gemini_icu.c geminiicu needs-flag Index: src/sys/arch/arm/imx/files.imx31 diff -u src/sys/arch/arm/imx/files.imx31:1.6 src/sys/arch/arm/imx/files.imx31:1.7 --- src/sys/arch/arm/imx/files.imx31:1.6 Mon Nov 15 18:19:19 2010 +++ src/sys/arch/arm/imx/files.imx31 Fri Mar 11 03:16:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.imx31,v 1.6 2010/11/15 18:19:19 bsh Exp $ +# $NetBSD: files.imx31,v 1.7 2011/03/11 03:16:13 bsh Exp $ # # Configuration info for the Freescale i.MX31 # @@ -23,7 +23,7 @@ # iMX AdVanced Interrupt Controller include arch/arm/pic/files.pic -device avic: pic +device avic: pic, pic_splfuncs attach avic at ahb file arch/arm/imx/imx31_icu.c avic needs-flag file arch/arm/arm32/irq_dispatch.S Index: src/sys/arch/arm/imx/files.imx51 diff -u src/sys/arch/arm/imx/files.imx51:1.2 src/sys/arch/arm/imx/files.imx51:1.3 --- src/sys/arch/arm/imx/files.imx51:1.2 Tue Nov 30 13:05:27 2010 +++ src/sys/arch/arm/imx/files.imx51 Fri Mar 11 03:16:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.imx51,v 1.2 2010/11/30 13:05:27 bsh Exp $ +# $NetBSD: files.imx51,v 1.3 2011/03/11 03:16:13 bsh Exp $ # # Configuration info for the Freescale i.MX51 # @@ -18,7 +18,7 @@ # iMX51 TrustZone Interrupt Controller include arch/arm/pic/files.pic -device tzic: pic +device tzic: pic, pic_splfuncs attach tzic at axi file arch/arm/imx/imx51_tzic.c tzic needs-flag file arch/arm/arm32/irq_dispatch.S Index: src/sys/arch/arm/omap/files.omap2 diff -u src/sys/arch/arm/omap/files.omap2:1.7 src/sys/arch/arm/omap/files.omap2:1.8 --- src/sys/arch/arm/omap/files.omap2:1.7 Sat Feb 26 18:07:18 2011 +++ src/sys/arch/arm/omap/files.omap2 Fri Mar 11 03:16:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.omap2,v 1.7 2011/02/26 18:07:18 ahoka Exp $ +# $NetBSD: files.omap2,v 1.8 2011/03/11 03:16:13 bsh Exp $ # # Configuration info for Texas Instruments OMAP2/OMAP3 CPU support # Based on xscale/files.pxa2x0 @@ -32,7 +32,7 @@ file arch/arm/xscale/pxa2x0_a4x_io.S obio # OMAP2 interrupt controller -device omapicu: pic +device omapicu: pic, pic_splfuncs attach omapicu at obio with omap2icu file arch/arm/omap/omap2_icu.c (omap2 | omap3) omapicu file arch/arm/omap/omap2430_intr.c omap2 !omapicu Index: src/sys/arch/arm/pic/files.pic diff -u src/sys/arch/arm/pic/files.pic:1.2 src/sys/arch/arm/pic/files.pic:1.3 --- src/sys/arch/arm/pic/files.pic:1.2 Sun Apr 27 18:58:45 2008 +++ src/sys/arch/arm/pic/files.pic Fri Mar 11 03:16:14 2011 @@ -1,7 +1,9 @@ -# $NetBSD: files.pic,v 1.2 2008/04/27 18:58:45 matt Exp $ +# $NetBSD: files.pic,v 1.3 2011/03/11 03:16:14 bsh Exp $ # # Configuration info for the common PIC code. # define pic +define pic_splfuncs file arch/arm/pic/pic.c pic +file arch/arm/pic/pic_splfuncs.c pic pic_splfuncs Index: src/sys/arch/arm/pic/pic.c diff -u src/sys/arch/arm/pic/pic.c:1.7 src/sys/arch/arm/pic/pic.c:1.8 --- src/sys/arch/arm/pic/pic.c:1.7 Tue Feb 1 21:44:27 2011 +++ src/sys/arch/arm/pic/pic.c Fri Mar 11 03:16:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pic.c,v 1.7 2011/02/01 21:44:27 jakllsch Exp $ */ +/* $NetBSD: pic.c,v 1.8 2011/03/11 03:16:14 bsh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH
CVS commit: src/sys/arch/arm/mpcore
Module Name:src
Committed By: bsh
Date: Fri Mar 11 03:26:37 UTC 2011
Added Files:
src/sys/arch/arm/mpcore: dic.c dic_intr.h dicreg.h
Log Message:
DIC: ARM11 MPCore's Distributed Interrupt Controller.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/mpcore/dic.c \
src/sys/arch/arm/mpcore/dic_intr.h src/sys/arch/arm/mpcore/dicreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/arm/mpcore/dic.c
diff -u /dev/null src/sys/arch/arm/mpcore/dic.c:1.1
--- /dev/null Fri Mar 11 03:26:37 2011
+++ src/sys/arch/arm/mpcore/dic.c Fri Mar 11 03:26:37 2011
@@ -0,0 +1,357 @@
+/* $NetBSD: dic.c,v 1.1 2011/03/11 03:26:37 bsh Exp $ */
+
+/*
+ * Copyright (c) 2010, 2011 Genetec Corporation. All rights reserved.
+ * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
+ * 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 GENETEC CORPORATION ``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 GENETEC CORPORATION
+ * 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 sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: dic.c,v 1.1 2011/03/11 03:26:37 bsh Exp $);
+
+#define _INTR_PRIVATE /* for arm/pic/picvar.h */
+
+#include locators.h
+#include opt_dic.h
+
+#include sys/param.h
+#include sys/evcnt.h
+#include sys/device.h
+#include sys/atomic.h
+
+#include machine/intr.h
+#include machine/bus.h
+
+#include uvm/uvm_extern.h
+
+#include arm/cpu.h
+#include arm/armreg.h
+#include arm/cpufunc.h
+#include arm/pic/picvar.h
+
+#include arm/mpcore/mpcorevar.h
+#include arm/mpcore/mpcorereg.h
+#include arm/mpcore/dicreg.h
+
+#include machine/autoconf.h
+#include machine/bus.h
+
+/*
+ * 0 is the highest priority.
+ */
+#define HW_TO_SW_IPL(ipl) (IPL_HIGH - (ipl))
+#define SW_TO_HW_IPL(ipl) (IPL_HIGH - (ipl))
+
+struct dic_softc {
+ device_t sc_dev;
+ struct pic_softc sc_pic;
+ bus_space_tag_t sc_iot;
+ bus_space_handle_t sc_cii_ioh;
+ volatile uint32_t *sc_cii_vaddr; /* CPU interface */
+ bus_space_handle_t sc_gid_ioh;
+ volatile uint32_t *sc_gid_vaddr; /* Global distributor */
+ int sc_nsrcs;
+// uint32_t sc_enabled_mask[4];
+};
+
+#define PIC_TO_SOFTC(pic) \
+ ((struct dic_softc *)((char *)(pic) - \
+ offsetof(struct dic_softc, sc_pic)))
+
+
+static int dic_match(device_t, cfdata_t, void *);
+static void dic_attach(device_t, device_t, void *);
+
+static void dic_unblock_irqs(struct pic_softc *, size_t, uint32_t);
+static void dic_block_irqs(struct pic_softc *, size_t, uint32_t);
+static void dic_establish_irq(struct pic_softc *, struct intrsource *);
+
+#define DIC_READ(sc, offset) \
+ (*((sc)-sc_gid_vaddr + (offset) / sizeof (uint32_t)))
+#define DIC_WRITE(sc, offset, val) \
+ (*((sc)-sc_gid_vaddr + (offset) / sizeof (uint32_t)) = (val))
+
+#define CII_READ(sc, offset) \
+ (*((sc)-sc_cii_vaddr + (offset) / sizeof (uint32_t)))
+#define CII_WRITE(sc, offset, val) \
+ (*((sc)-sc_cii_vaddr + (offset) / sizeof (uint32_t)) = (val))
+
+const struct pic_ops dic_pic_ops = {
+ .pic_unblock_irqs = dic_unblock_irqs,
+ .pic_block_irqs = dic_block_irqs,
+ .pic_establish_irq = dic_establish_irq,
+ .pic_source_name = NULL
+};
+
+
+CFATTACH_DECL_NEW(dic, sizeof(struct dic_softc),
+dic_match, dic_attach, NULL, NULL);
+
+struct dic_softc *dic_softc;
+
+static int
+dic_match(device_t parent, cfdata_t cf, void *aux)
+{
+ if (strcmp(cf-cf_name, dic) == 0)
+ return 1;
+
+ return 0;
+}
+
+
+static void
+dic_attach(device_t parent, device_t self, void *aux)
+{
+ struct dic_softc *dic = device_private(self);
+ struct pmr_attach_args * const pa = aux;
+ uint32_t typ;
+
+ aprint_normal(: Distributed Interrupt Controller\n);
+ aprint_naive(\n);
+
+ dic-sc_dev = self;
+ dic-sc_iot = pa-pa_iot;
+
+ dic_softc = dic;
+
+ if (bus_space_subregion(dic-sc_iot, pa-pa_ioh,
+ MPCORE_PMR_CII, MPCORE_PMR_CII_SIZE,
+
