CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: kamil
Date: Wed Jun 12 04:20:18 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_disk.c
Log Message:
Fix build with -Wgnu-designator in the ZFS code
struct buf buf = { b_bcount: MAXPHYS }; is a legacy style designator
extension and this raised a compiler error reported by a.rin@mix.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.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/vdev_disk.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.10 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.11
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.10 Tue Jun 11 09:04:37 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Wed Jun 12 04:20:18 2019
@@ -224,7 +224,7 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
dvd->vd_maxphys = (pdk ? disk_maxphys(pdk) : MACHINE_MAXPHYS);
*/
{
- struct buf buf = { b_bcount: MAXPHYS };
+ struct buf buf = { .b_bcount = MAXPHYS };
const char *dev_name;
dev_name = devsw_blk2name(major(vp->v_rdev));
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: kamil
Date: Wed Jun 12 04:20:18 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_disk.c
Log Message:
Fix build with -Wgnu-designator in the ZFS code
struct buf buf = { b_bcount: MAXPHYS }; is a legacy style designator
extension and this raised a compiler error reported by a.rin@mix.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: mrg Date: Wed Jun 12 04:10:26 UTC 2019 Modified Files: src/share/misc: inter.phone Log Message: update this to as much reality of 2019 as i can find on the web. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/share/misc/inter.phone Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/embedded/files
Module Name:src
Committed By: mrg
Date: Wed Jun 12 03:06:49 UTC 2019
Modified Files:
src/distrib/utils/embedded/files: creds_msdos
Log Message:
various cleanups inspired by reviews:
- clean up variable usage
- be explicit that $ssh_userkeys is global
- don't assig id output to a variable not used
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/files/creds_msdos
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/files/creds_msdos
diff -u src/distrib/utils/embedded/files/creds_msdos:1.2 src/distrib/utils/embedded/files/creds_msdos:1.3
--- src/distrib/utils/embedded/files/creds_msdos:1.2 Wed Jun 12 00:28:56 2019
+++ src/distrib/utils/embedded/files/creds_msdos Wed Jun 12 03:06:48 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: creds_msdos,v 1.2 2019/06/12 00:28:56 mrg Exp $
+# $NetBSD: creds_msdos,v 1.3 2019/06/12 03:06:48 mrg Exp $
#
# Copyright (c) 2019 Matthew R. Green
# All rights reserved.
@@ -46,35 +46,35 @@ $_rc_subr_loaded . /etc/rc.subr
name="creds_msdos"
start_cmd="creds_msdos_start"
stop_cmd=":"
-fstab_file=/etc/fstab
fail() {
echo "$@" 1>&2
exit 1
}
+# This uses $ssh_userkeys global
sshkey_setup() {
local user="$1"
local group="wheel"
# don't create existing users
- id=$(id -u $user 2>/dev/null)
- if [ $? -ne 0 ]; then
- useradd -m -G "${group}" "$user" || fail "Useradd failed."
+ if ! id -u "${user}" > /dev/null 2>&1; then
+ useradd -m -G "${group}" "${user}" || fail "Useradd failed."
fi
- eval sshdir=~"${user}/.ssh"
- eval mkdir -p -m 755 "${sshdir}" || fail "mkdir ~/.ssh failed."
- chown "${user}" "${sshdir}"
- eval userkeys="${sshdir}/authorized_keys"
+ eval ssh_userdir=~"${user}/.ssh"
+ mkdir -p -m 755 "${ssh_userdir}" || fail "mkdir ~/.ssh failed."
+ chmod 755 "${ssh_userdir}"
+ chown "${user}" "${ssh_userdir}"
+
+ ssh_userkeys="${ssh_userdir}/authorized_keys"
}
sshkey_finish() {
local user="$1"
- local userkeys="$2"
- chmod 644 "${userkeys}"
- chown "${user}" "${userkeys}"
+ chmod 644 "${ssh_userkeys}"
+ chown "${user}" "${ssh_userkeys}"
}
do_sshkeyfile() {
@@ -85,28 +85,28 @@ do_sshkeyfile() {
return
fi
- sshkey_setup "$user"
+ sshkey_setup "${user}"
# check entry is not present
while read type keydata name; do
- if fgrep -q "${keydata}" "${userkeys}" 2>/dev/null; then
+ if fgrep -q "${keydata}" "${ssh_userkeys}" 2>/dev/null; then
continue
fi
- echo "${type} ${keydata} ${name}" >> "${userkeys}"
+ echo "${type} ${keydata} ${name}" >> "${ssh_userkeys}"
done < "${newkeys}"
- sshkey_finish "$user" "${userkeys}"
+ sshkey_finish "${user}"
}
do_sshkey() {
local user="$1"
local newkey="$2"
- sshkey_setup "$user"
+ sshkey_setup "${user}"
- echo "${newkey}" >> "${userkeys}"
+ echo "${newkey}" >> "${ssh_userkeys}"
- sshkey_finish "$user" "${userkeys}"
+ sshkey_finish "${user}"
}
do_useraddpwhash() {
@@ -115,8 +115,7 @@ do_useraddpwhash() {
local group="wheel"
# don't add to existing users
- id=$(id -u "${user}" 2>/dev/null)
- if [ $? -eq 0 ]; then
+ if id -u "${user}" > /dev/null 2>&1; then
return
fi
@@ -133,48 +132,49 @@ do_useradd() {
creds_msdos_start()
{
+ local fstab_file=/etc/fstab
+
if [ -z "${creds_msdos_partition}" ]; then
echo "Not looking for credientials on msdos"
- return;
+ return
fi
- check_fs=
while read junk1 mp fstype junk2; do
if [ "${mp}" != "${creds_msdos_partition}" ]; then
continue
fi
if [ "${fstype}" != "msdos" ]; then
echo "Not checking for creds on ${creds_msdos_partition}: not an msdos file system"
- return;
+ return
fi
break
done < "${fstab_file}"
- delete_creds=no
- creds_file="${creds_msdos_partition}/creds.txt"
+ local delete_creds=no
+ local creds_file="${creds_msdos_partition}/creds.txt"
if [ -f "${creds_file}" ]; then
- while read type user arg1; do
+ while read type user args; do
# strip cr
- arg1=$(echo "$arg1" | tr -d '\015')
+ local clean_args=$(echo "$args" | tr -d '\015')
case "$type" in
\#*|'')
continue
;;
sshkeyfile)
echo "Added user ${user} via ssh key file method."
-do_sshkeyfile "${user}" "${arg1}"
+do_sshkeyfile "${user}" "${clean_args}"
;;
sshkey)
echo "Added user ${user} via ssh key string method."
-do_sshkey "${user}" "${arg1}"
+do_sshkey "${user}" "${clean_args}"
;;
useraddpwhash)
echo "Added user ${user} via password hash method."
-do_useraddpwhash "${user}" "${arg1}"
+do_useraddpwhash "${user}" "${clean_args}"
;;
useradd)
echo "Added user ${user} via password method, shredding credentials file."
-do_useradd "${user}" "${arg1}"
+do_useradd "${user}" "${clean_args}"
delete_creds=yes
;;
*)
CVS commit: src/distrib/utils/embedded/files
Module Name:src Committed By: mrg Date: Wed Jun 12 03:06:49 UTC 2019 Modified Files: src/distrib/utils/embedded/files: creds_msdos Log Message: various cleanups inspired by reviews: - clean up variable usage - be explicit that $ssh_userkeys is global - don't assig id output to a variable not used To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/files/creds_msdos Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Jun 12 01:54:12 UTC 2019 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Print ICH/PCH's NVM version. To generate a diff of this commit: cvs rdiff -u -r1.640 -r1.641 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Jun 12 01:54:12 UTC 2019 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Print ICH/PCH's NVM version. To generate a diff of this commit: cvs rdiff -u -r1.640 -r1.641 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.640 src/sys/dev/pci/if_wm.c:1.641 --- src/sys/dev/pci/if_wm.c:1.640 Fri Jun 7 04:39:15 2019 +++ src/sys/dev/pci/if_wm.c Wed Jun 12 01:54:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.640 2019/06/07 04:39:15 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.641 2019/06/12 01:54:11 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.640 2019/06/07 04:39:15 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.641 2019/06/12 01:54:11 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -13475,6 +13475,15 @@ wm_nvm_version(struct wm_softc *sc) * 82574L 0x1080 1.8.0? (the spec update notes about 2.1.4) * 0x2013 2.1.3? * 82583 0x10a0 1.10.0? (document says it's default value) + * ICH8+82567 0x0040 0.4.0? + * ICH9+82566 0x1040 1.4.0? + *ICH10+82567 0x0043 0.4.3? + * PCH+82577 0x00c1 0.12.1? + * PCH2+82579 0x00d3 0.13.3? + * 0x00d4 0.13.4? + * LPT+I218 0x0023 0.2.3? + * SPT+I219 0x0084 0.8.4? + * CNP+I219 0x0054 0.5.4? */ /* @@ -13495,6 +13504,18 @@ wm_nvm_version(struct wm_softc *sc) check_optionrom = true; have_build = true; break; + case WM_T_ICH8: + case WM_T_ICH9: + case WM_T_ICH10: + case WM_T_PCH: + case WM_T_PCH2: + case WM_T_PCH_LPT: + case WM_T_PCH_SPT: + case WM_T_PCH_CNP: + check_version = true; + have_build = true; + have_uid = false; + break; case WM_T_82575: case WM_T_82576: case WM_T_82580:
CVS commit: src/sys/netipsec
Module Name:src
Committed By: christos
Date: Wed Jun 12 01:32:30 UTC 2019
Modified Files:
src/sys/netipsec: key.c
Log Message:
Fix double free: key_setsaval() free's newsav by calling key_freesaval()
and key_api_update() calls key_delsav() when key_setsaval() fails which
calls key_freesaval() again...
To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.261 src/sys/netipsec/key.c:1.262
--- src/sys/netipsec/key.c:1.261 Sat Jan 26 21:08:48 2019
+++ src/sys/netipsec/key.c Tue Jun 11 21:32:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.261 2019/01/27 02:08:48 pgoyette Exp $ */
+/* $NetBSD: key.c,v 1.262 2019/06/12 01:32:30 christos Exp $ */
/* $FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.261 2019/01/27 02:08:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.262 2019/06/12 01:32:30 christos Exp $");
/*
* This code is referred to RFC 2367
@@ -5753,7 +5753,7 @@ key_api_update(struct socket *so, struct
error = key_setsaval(newsav, m, mhp);
if (error) {
- key_delsav(newsav);
+ kmem_free(newsav, sizeof(*newsav));
goto error;
}
CVS commit: src/sys/netipsec
Module Name:src Committed By: christos Date: Wed Jun 12 01:32:30 UTC 2019 Modified Files: src/sys/netipsec: key.c Log Message: Fix double free: key_setsaval() free's newsav by calling key_freesaval() and key_api_update() calls key_delsav() when key_setsaval() fails which calls key_freesaval() again... To generate a diff of this commit: cvs rdiff -u -r1.261 -r1.262 src/sys/netipsec/key.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/embedded/files
Module Name:src
Committed By: mrg
Date: Wed Jun 12 00:28:56 UTC 2019
Modified Files:
src/distrib/utils/embedded/files: creds_msdos
Log Message:
explicitly strip carriage return so that non-unix text files work.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/files/creds_msdos
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/files/creds_msdos
diff -u src/distrib/utils/embedded/files/creds_msdos:1.1 src/distrib/utils/embedded/files/creds_msdos:1.2
--- src/distrib/utils/embedded/files/creds_msdos:1.1 Tue Jun 11 10:50:57 2019
+++ src/distrib/utils/embedded/files/creds_msdos Wed Jun 12 00:28:56 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: creds_msdos,v 1.1 2019/06/11 10:50:57 mrg Exp $
+# $NetBSD: creds_msdos,v 1.2 2019/06/12 00:28:56 mrg Exp $
#
# Copyright (c) 2019 Matthew R. Green
# All rights reserved.
@@ -154,6 +154,8 @@ creds_msdos_start()
if [ -f "${creds_file}" ]; then
while read type user arg1; do
+ # strip cr
+ arg1=$(echo "$arg1" | tr -d '\015')
case "$type" in
\#*|'')
continue
CVS commit: src/distrib/utils/embedded/files
Module Name:src Committed By: mrg Date: Wed Jun 12 00:28:56 UTC 2019 Modified Files: src/distrib/utils/embedded/files: creds_msdos Log Message: explicitly strip carriage return so that non-unix text files work. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/files/creds_msdos Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: kamil Date: Wed Jun 12 00:05:48 UTC 2019 Modified Files: src/lib/libc/gen: posix_spawn.3 Log Message: Document that posix_spawn(3) uses a dedicated syscall vfork+exec operations are done in one go. This is important information for programs that wrap posix_spawn(3). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libc/gen/posix_spawn.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/libc/gen/posix_spawn.3 diff -u src/lib/libc/gen/posix_spawn.3:1.8 src/lib/libc/gen/posix_spawn.3:1.9 --- src/lib/libc/gen/posix_spawn.3:1.8 Tue Jun 11 12:49:21 2019 +++ src/lib/libc/gen/posix_spawn.3 Wed Jun 12 00:05:48 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: posix_spawn.3,v 1.8 2019/06/11 12:49:21 wiz Exp $ +.\" $NetBSD: posix_spawn.3,v 1.9 2019/06/12 00:05:48 kamil Exp $ .\" .\" Copyright (c) 2008 Ed Schouten .\" All rights reserved. @@ -315,6 +315,11 @@ had been called by the child process to This implementation does not run .Xr pthread_atfork 3 callbacks. +The +.Xr vfork 2 +and +.Xr exec 3 +operations are implemented as a single syscall. .Sh RETURN VALUES Upon successful completion, .Fn posix_spawn
CVS commit: src/lib/libc/gen
Module Name:src Committed By: kamil Date: Wed Jun 12 00:05:48 UTC 2019 Modified Files: src/lib/libc/gen: posix_spawn.3 Log Message: Document that posix_spawn(3) uses a dedicated syscall vfork+exec operations are done in one go. This is important information for programs that wrap posix_spawn(3). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libc/gen/posix_spawn.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: kamil
Date: Tue Jun 11 23:30:05 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c
Log Message:
Add new PTRACE_POSIX_SPAWN tests in ptrace(3)
Add test:
- eventmask_preserved_posix_spawn
- fork9..fork16
- vfork9..vfork16
- posix_spawn1..16
New tests verify semantics of PTRACE_POSIX_SPAWN.
All tests pass.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/tests/lib/libc/sys/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.124 src/tests/lib/libc/sys/t_ptrace_wait.c:1.125
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.124 Mon Jun 10 22:16:06 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Tue Jun 11 23:30:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.124 2019/06/10 22:16:06 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.125 2019/06/11 23:30:05 kamil Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.124 2019/06/10 22:16:06 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.125 2019/06/11 23:30:05 kamil Exp $");
#include
#include
@@ -2947,6 +2947,8 @@ eventmask_preserved(int event)
ptrace(PT_SET_EVENT_MASK, child, _event, len) != -1);
SYSCALL_REQUIRE(
ptrace(PT_GET_EVENT_MASK, child, _event, len) != -1);
+ DPRINTF("set_event=%#x get_event=%#x\n", set_event.pe_set_event,
+ get_event.pe_set_event);
ATF_REQUIRE(memcmp(_event, _event, len) == 0);
DPRINTF("Before resuming the child process where it left off and "
@@ -2982,15 +2984,16 @@ EVENTMASK_PRESERVED(eventmask_preserved_
EVENTMASK_PRESERVED(eventmask_preserved_vfork_done, PTRACE_VFORK_DONE)
EVENTMASK_PRESERVED(eventmask_preserved_lwp_create, PTRACE_LWP_CREATE)
EVENTMASK_PRESERVED(eventmask_preserved_lwp_exit, PTRACE_LWP_EXIT)
+EVENTMASK_PRESERVED(eventmask_preserved_posix_spawn, PTRACE_POSIX_SPAWN)
///
static void
-fork_body(pid_t (*fn)(void), bool spawn, bool trackfork, bool trackvfork,
+fork_body(const char *fn, bool trackspawn, bool trackfork, bool trackvfork,
bool trackvforkdone)
{
const int exitval = 5;
- const int exitval2 = 15;
+ const int exitval2 = 0; /* This matched exit status from /bin/echo */
const int sigval = SIGSTOP;
pid_t child, child2 = 0, wpid;
#if defined(TWAIT_HAVE_STATUS)
@@ -3003,9 +3006,6 @@ fork_body(pid_t (*fn)(void), bool spawn,
char * const arg[] = { __UNCONST("/bin/echo"), NULL };
- if (spawn)
- atf_tc_skip("posix_spawn() is not supported");
-
DPRINTF("Before forking process PID=%d\n", getpid());
SYSCALL_REQUIRE((child = fork()) != -1);
if (child == 0) {
@@ -3015,11 +3015,15 @@ fork_body(pid_t (*fn)(void), bool spawn,
DPRINTF("Before raising %s from child\n", strsignal(sigval));
FORKEE_ASSERT(raise(sigval) == 0);
- if (spawn) {
+ if (strcmp(fn, "spawn") == 0) {
FORKEE_ASSERT_EQ(posix_spawn(,
arg[0], NULL, NULL, arg, NULL), 0);
- } else if (fn == fork || fn == vfork) {
- FORKEE_ASSERT((child2 = (fn)()) != -1);
+ } else {
+ if (strcmp(fn, "fork") == 0) {
+FORKEE_ASSERT((child2 = fork()) != -1);
+ } else if (strcmp(fn, "vfork") == 0) {
+FORKEE_ASSERT((child2 = vfork()) != -1);
+ }
if (child2 == 0)
_exit(exitval2);
@@ -3039,11 +3043,14 @@ fork_body(pid_t (*fn)(void), bool spawn,
validate_status_stopped(status, sigval);
- DPRINTF("Set 0%s%s%s in EVENT_MASK for the child %d\n",
+ DPRINTF("Set 0%s%s%s%s in EVENT_MASK for the child %d\n",
+ trackspawn ? "|PTRACE_POSIX_SPAWN" : "",
trackfork ? "|PTRACE_FORK" : "",
trackvfork ? "|PTRACE_VFORK" : "",
trackvforkdone ? "|PTRACE_VFORK_DONE" : "", child);
event.pe_set_event = 0;
+ if (trackspawn)
+ event.pe_set_event |= PTRACE_POSIX_SPAWN;
if (trackfork)
event.pe_set_event |= PTRACE_FORK;
if (trackvfork)
@@ -3057,7 +3064,9 @@ fork_body(pid_t (*fn)(void), bool spawn,
SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
#if defined(TWAIT_HAVE_PID)
- if ((trackfork && fn == fork) || (trackvfork && fn == vfork)) {
+ if ((trackspawn && strcmp(fn, "spawn") == 0) ||
+ (trackfork && strcmp(fn, "fork") == 0) ||
+ (trackvfork && strcmp(fn, "vfork") == 0)) {
DPRINTF("Before calling %s() for the child %d\n", TWAIT_FNAME,
child);
TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0),
@@ -3067,11 +3076,16 @@ fork_body(pid_t (*fn)(void), bool spawn,
SYSCALL_REQUIRE(
ptrace(PT_GET_PROCESS_STATE, child, , slen) != -1);
- if (trackfork && fn == fork) {
+ if (trackspawn && strcmp(fn, "spawn") == 0) {
+ ATF_REQUIRE_EQ(
+ state.pe_report_event & PTRACE_POSIX_SPAWN,
+ PTRACE_POSIX_SPAWN);
+ }
+ if (trackfork &&
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: kamil Date: Tue Jun 11 23:30:05 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.c Log Message: Add new PTRACE_POSIX_SPAWN tests in ptrace(3) Add test: - eventmask_preserved_posix_spawn - fork9..fork16 - vfork9..vfork16 - posix_spawn1..16 New tests verify semantics of PTRACE_POSIX_SPAWN. All tests pass. To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/tests/lib/libc/sys/t_ptrace_wait.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: kamil Date: Tue Jun 11 23:27:47 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Document PTRACE_POSIX_SPAWN in man-page To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/lib/libc/sys/ptrace.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: kamil Date: Tue Jun 11 23:27:47 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Document PTRACE_POSIX_SPAWN in man-page To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/lib/libc/sys/ptrace.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/ptrace.2 diff -u src/lib/libc/sys/ptrace.2:1.70 src/lib/libc/sys/ptrace.2:1.71 --- src/lib/libc/sys/ptrace.2:1.70 Sat May 25 04:25:14 2019 +++ src/lib/libc/sys/ptrace.2 Tue Jun 11 23:27:46 2019 @@ -1,7 +1,7 @@ -.\" $NetBSD: ptrace.2,v 1.70 2019/05/25 04:25:14 kamil Exp $ +.\" $NetBSD: ptrace.2,v 1.71 2019/06/11 23:27:46 kamil Exp $ .\" .\" This file is in the public domain. -.Dd May 25, 2019 +.Dd June 12, 2019 .Dt PTRACE 2 .Os .Sh NAME @@ -458,17 +458,16 @@ Report parent resumed after Report thread birth. .It PTRACE_LWP_EXIT Report thread termination. +.It PTRACE_POSIX_SPAWN +Report posix_spawn(3). .El .Pp The .Xr fork 2 and .Xr vfork 2 -events can occur with similar operations, -like -.Xr clone 2 -or -.Xr posix_spawn 3 . +events can occur with +.Xr clone 2 . The .Dv PTRACE_FORK value means that process gives birth to its child @@ -489,6 +488,21 @@ The .Dv PTRACE_VFORK_DONE event can be used to report unblocking of the parent. .Pp +The +.Xr posix_spawn 3 +operation implements +.Xr vfork 2 +and +.Xr exec 3 +as a single syscall in the kernel. +The +.Dv PTRACE_POSIX_SPAWN +event semantics are the same as +.Dv PTRACE_FORK , +but the child is reported with implied +.Xr exec 3 +operation. +.Pp A pointer to this structure is passed in .Fa addr . The
CVS commit: src/sys/sys
Module Name:src Committed By: kamil Date: Tue Jun 11 23:20:18 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Welcome to 8.99.44! posix_spawn(3) + ptrace(2) integration changed 'struct proc'. To generate a diff of this commit: cvs rdiff -u -r1.591 -r1.592 src/sys/sys/param.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/sys/param.h diff -u src/sys/sys/param.h:1.591 src/sys/sys/param.h:1.592 --- src/sys/sys/param.h:1.591 Fri Jun 7 23:35:52 2019 +++ src/sys/sys/param.h Tue Jun 11 23:20:18 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.591 2019/06/07 23:35:52 christos Exp $ */ +/* $NetBSD: param.h,v 1.592 2019/06/11 23:20:18 kamil Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 899004300 /* NetBSD 8.99.43 */ +#define __NetBSD_Version__ 899004400 /* NetBSD 8.99.44 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys/sys
Module Name:src Committed By: kamil Date: Tue Jun 11 23:20:18 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Welcome to 8.99.44! posix_spawn(3) + ptrace(2) integration changed 'struct proc'. To generate a diff of this commit: cvs rdiff -u -r1.591 -r1.592 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: kamil Date: Tue Jun 11 23:18:55 UTC 2019 Modified Files: src/sys/kern: kern_exec.c kern_proc.c sys_ptrace_common.c src/sys/sys: proc.h ptrace.h Log Message: Add support for PTRACE_POSIX_SPAWN to report posix_spawn(3) events posix_spawn(3) is a first class syscall in NetBSD, different to (V)FORK+EXEC as these operations are executed in one go. This differs to Linux and FreeBSD, where posix_spawn(3) is implemented with existing kernel primitives (clone(2), vfork(2), exec(3)) inside libc. Typically LLDB and GDB software is aware of FORK/VFORK events. As discussed with the LLDB community, instead of slicing the posix_spawn(3) operation into phases emulating (V)FORK+EXEC(+VFORK_DONE) and returning intermediate state to the debugger, that might have abnormal state, introduce new event type: PTRACE_POSIX_SPAWN. A debugger implementor can easily map it into existing fork+exec semantics or treat as a distinct event. There is no functional change for existing debuggers as there was no support for reporting posix_spawn(3) events on the kernel side. To generate a diff of this commit: cvs rdiff -u -r1.465 -r1.466 src/sys/kern/kern_exec.c cvs rdiff -u -r1.232 -r1.233 src/sys/kern/kern_proc.c cvs rdiff -u -r1.54 -r1.55 src/sys/kern/sys_ptrace_common.c cvs rdiff -u -r1.352 -r1.353 src/sys/sys/proc.h cvs rdiff -u -r1.64 -r1.65 src/sys/sys/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: kamil
Date: Tue Jun 11 23:18:55 UTC 2019
Modified Files:
src/sys/kern: kern_exec.c kern_proc.c sys_ptrace_common.c
src/sys/sys: proc.h ptrace.h
Log Message:
Add support for PTRACE_POSIX_SPAWN to report posix_spawn(3) events
posix_spawn(3) is a first class syscall in NetBSD, different to
(V)FORK+EXEC as these operations are executed in one go. This differs to
Linux and FreeBSD, where posix_spawn(3) is implemented with existing kernel
primitives (clone(2), vfork(2), exec(3)) inside libc.
Typically LLDB and GDB software is aware of FORK/VFORK events. As discussed
with the LLDB community, instead of slicing the posix_spawn(3) operation
into phases emulating (V)FORK+EXEC(+VFORK_DONE) and returning intermediate
state to the debugger, that might have abnormal state, introduce new event
type: PTRACE_POSIX_SPAWN.
A debugger implementor can easily map it into existing fork+exec semantics
or treat as a distinct event.
There is no functional change for existing debuggers as there was no
support for reporting posix_spawn(3) events on the kernel side.
To generate a diff of this commit:
cvs rdiff -u -r1.465 -r1.466 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.232 -r1.233 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.54 -r1.55 src/sys/kern/sys_ptrace_common.c
cvs rdiff -u -r1.352 -r1.353 src/sys/sys/proc.h
cvs rdiff -u -r1.64 -r1.65 src/sys/sys/ptrace.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/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.465 src/sys/kern/kern_exec.c:1.466
--- src/sys/kern/kern_exec.c:1.465 Thu May 9 20:50:14 2019
+++ src/sys/kern/kern_exec.c Tue Jun 11 23:18:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.465 2019/05/09 20:50:14 kamil Exp $ */
+/* $NetBSD: kern_exec.c,v 1.466 2019/06/11 23:18:55 kamil Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.465 2019/05/09 20:50:14 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.466 2019/06/11 23:18:55 kamil Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -74,6 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_exec.c,
#include
#include
#include
+#include
#include
#include
#include
@@ -1269,7 +1270,8 @@ execve_runproc(struct lwp *l, struct exe
mutex_enter(proc_lock);
- if (p->p_slflag & PSL_TRACED) {
+ /* posix_spawn(3) reports a single event with implied exec(3) */
+ if ((p->p_slflag & PSL_TRACED) && !is_spawn) {
mutex_enter(p->p_lock);
eventswitch(TRAP_EXEC);
mutex_enter(proc_lock);
@@ -1984,6 +1986,7 @@ spawn_return(void *arg)
{
struct spawn_exec_data *spawn_data = arg;
struct lwp *l = curlwp;
+ struct proc *p = l->l_proc;
int error, newfd;
int ostat;
size_t i;
@@ -2013,7 +2016,7 @@ spawn_return(void *arg)
}
/* don't allow debugger access yet */
- rw_enter(>l_proc->p_reflock, RW_WRITER);
+ rw_enter(>p_reflock, RW_WRITER);
have_reflock = true;
error = 0;
@@ -2072,16 +2075,16 @@ spawn_return(void *arg)
* parent's p_nstopchild here. For safety, just make
* we're on the good side of SDEAD before we adjust.
*/
- ostat = l->l_proc->p_stat;
+ ostat = p->p_stat;
KASSERT(ostat < SSTOP);
- l->l_proc->p_stat = SSTOP;
- l->l_proc->p_waited = 0;
- l->l_proc->p_pptr->p_nstopchild++;
+ p->p_stat = SSTOP;
+ p->p_waited = 0;
+ p->p_pptr->p_nstopchild++;
mutex_exit(proc_lock);
/* Set process group */
if (spawn_data->sed_attrs->sa_flags & POSIX_SPAWN_SETPGROUP) {
- pid_t mypid = l->l_proc->p_pid,
+ pid_t mypid = p->p_pid,
pgrp = spawn_data->sed_attrs->sa_pgroup;
if (pgrp == 0)
@@ -2095,7 +2098,7 @@ spawn_return(void *arg)
/* Set scheduler policy */
if (spawn_data->sed_attrs->sa_flags & POSIX_SPAWN_SETSCHEDULER)
- error = do_sched_setparam(l->l_proc->p_pid, 0,
+ error = do_sched_setparam(p->p_pid, 0,
spawn_data->sed_attrs->sa_schedpolicy,
_data->sed_attrs->sa_schedparam);
else if (spawn_data->sed_attrs->sa_flags
@@ -2122,10 +2125,10 @@ spawn_return(void *arg)
/* Set signal masks/defaults */
if (spawn_data->sed_attrs->sa_flags & POSIX_SPAWN_SETSIGMASK) {
- mutex_enter(l->l_proc->p_lock);
+ mutex_enter(p->p_lock);
error = sigprocmask1(l, SIG_SETMASK,
_data->sed_attrs->sa_sigmask, NULL);
- mutex_exit(l->l_proc->p_lock);
+ mutex_exit(p->p_lock);
if (error)
goto report_error_stopped;
}
@@ -2149,8 +2152,8 @@ spawn_return(void *arg)
}
}
mutex_enter(proc_lock);
- l->l_proc->p_stat = ostat;
- l->l_proc->p_pptr->p_nstopchild--;
+ p->p_stat = ostat;
+ p->p_pptr->p_nstopchild--;
mutex_exit(proc_lock);
}
@@ -2172,6 +2175,19 @@ spawn_return(void *arg)
/* release our refcount on the data */
spawn_exec_data_release(spawn_data);
+ if (p->p_slflag & PSL_TRACED) {
+ /* Paranoid check */
+
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Tue Jun 11 17:26:10 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: MRO To generate a diff of this commit: cvs rdiff -u -r1.263 -r1.264 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Tue Jun 11 17:26:10 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: MRO To generate a diff of this commit: cvs rdiff -u -r1.263 -r1.264 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.263 src/share/misc/acronyms.comp:1.264 --- src/share/misc/acronyms.comp:1.263 Sat Jun 8 13:13:01 2019 +++ src/share/misc/acronyms.comp Tue Jun 11 17:26:09 2019 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.263 2019/06/08 13:13:01 pgoyette Exp $ +$NetBSD: acronyms.comp,v 1.264 2019/06/11 17:26:09 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -932,6 +932,7 @@ MPS memory pool system MPS multiprocessor specification MQTT Message Queuing Telemetry Transport MR modem ready +MRO method resolution order MRU most recently used MS Microsoft MSAN Memory Sanitizer
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Tue Jun 11 15:31:19 UTC 2019 Modified Files: src/usr.sbin/sysinst: msg_cmp.sh Log Message: Typo, also fix copy & pasted license To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/msg_cmp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/msg_cmp.sh diff -u src/usr.sbin/sysinst/msg_cmp.sh:1.1 src/usr.sbin/sysinst/msg_cmp.sh:1.2 --- src/usr.sbin/sysinst/msg_cmp.sh:1.1 Tue Jun 11 13:01:14 2019 +++ src/usr.sbin/sysinst/msg_cmp.sh Tue Jun 11 15:31:19 2019 @@ -1,12 +1,11 @@ #! /bin/sh -# $NetBSD: msg_cmp.sh,v 1.1 2019/06/11 13:01:14 martin Exp $ +# $NetBSD: msg_cmp.sh,v 1.2 2019/06/11 15:31:19 martin Exp $ #- # Copyright (c) 2019 The NetBSD Foundation, Inc. # All rights reserved. # -# This code is derived from software contributed to The NetBSD Foundation -# by David Laight. +# This code is derived from software contributed to The NetBSD Foundation. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -82,7 +81,7 @@ exec 4< $TMP2 # Compare lines IFS='' NUM=0 -HDR="Messages identical to the english version:" +HDR="Messages identical to the English version:" while read -r l1 <&3 && read -r l2 <&4
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Tue Jun 11 15:31:19 UTC 2019 Modified Files: src/usr.sbin/sysinst: msg_cmp.sh Log Message: Typo, also fix copy & pasted license To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/msg_cmp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: pgoyette Date: Tue Jun 11 15:20:57 UTC 2019 Modified Files: src/sys/kern: kern_module.c Log Message: Improve error message To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/kern/kern_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Tue Jun 11 15:20:57 UTC 2019
Modified Files:
src/sys/kern: kern_module.c
Log Message:
Improve error message
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/kern/kern_module.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.134 src/sys/kern/kern_module.c:1.135
--- src/sys/kern/kern_module.c:1.134 Mon Apr 8 11:32:49 2019
+++ src/sys/kern/kern_module.c Tue Jun 11 15:20:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.134 2019/04/08 11:32:49 pgoyette Exp $ */
+/* $NetBSD: kern_module.c,v 1.135 2019/06/11 15:20:57 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.134 2019/04/08 11:32:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.135 2019/06/11 15:20:57 pgoyette Exp $");
#define _MODULE_INTERNAL
@@ -1239,7 +1239,7 @@ module_do_load(const char *name, bool is
filedict = NULL;
}
if (error != 0) {
- module_error("modcmd function failed for `%s', error %d",
+ module_error("modcmd(CMD_INIT) failed for `%s', error %d",
mi->mi_name, error);
goto fail;
}
CVS commit: src/tests/fs/zfs
Module Name:src Committed By: hannken Date: Tue Jun 11 14:00:16 UTC 2019 Modified Files: src/tests/fs/zfs: t_zpool.sh Log Message: Need rumpdev_disk for rumpfs_zfs. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 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.
CVS commit: src/tests/fs/zfs
Module Name:src Committed By: hannken Date: Tue Jun 11 14:00:16 UTC 2019 Modified Files: src/tests/fs/zfs: t_zpool.sh Log Message: Need rumpdev_disk for rumpfs_zfs. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 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/zfs/t_zpool.sh diff -u src/tests/fs/zfs/t_zpool.sh:1.4 src/tests/fs/zfs/t_zpool.sh:1.5 --- src/tests/fs/zfs/t_zpool.sh:1.4 Sun Dec 16 14:04:14 2018 +++ src/tests/fs/zfs/t_zpool.sh Tue Jun 11 14:00:16 2019 @@ -1,4 +1,4 @@ -# $NetBSD: t_zpool.sh,v 1.4 2018/12/16 14:04:14 hannken Exp $ +# $NetBSD: t_zpool.sh,v 1.5 2019/06/11 14:00:16 hannken Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -25,7 +25,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -server='rump_server -lrumpvfs -lrumpkern_solaris -lrumpfs_zfs -lrumpdev -lrumpdev_rnd -d key=/dk,hostpath=zfs.img,size=100m' +server='rump_server -lrumpvfs -lrumpdev_disk -lrumpkern_solaris -lrumpfs_zfs -lrumpdev -lrumpdev_rnd -d key=/dk,hostpath=zfs.img,size=100m' export RUMP_SERVER=unix://zsuck
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Tue Jun 11 13:01:48 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC files.generic Added Files: src/sys/arch/arm/xilinx: files.zynq zynq7000_sdhc.c zynq7000_uart.c zynq7000_usb.c zynq_cemac.c zynq_platform.c zynq_uart.c zynq_uartreg.h zynq_uartvar.h zynq_usb.c zynq_usbreg.h zynq_usbvar.h Log Message: Initial commit of FDTised Xilinx Zynq-7000 support. Tested with qemu-system-arm -M xilinx-zynq-a9 -dtb zynq-zed.dtb -kernel netbsd.ub \ -serial /dev/null -serial stdio Based on a set of diffs/files from rjs@ sys/arch/arm/zynq is kept in place to allow existing kernels (e.g. ZEDBOARD and PARALLELLA) to continue to build/work during the transition, but eventually sys/arch/arm/zynq will be deleted. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/xilinx/files.zynq \ src/sys/arch/arm/xilinx/zynq7000_sdhc.c \ src/sys/arch/arm/xilinx/zynq7000_uart.c \ src/sys/arch/arm/xilinx/zynq7000_usb.c \ src/sys/arch/arm/xilinx/zynq_cemac.c \ src/sys/arch/arm/xilinx/zynq_platform.c \ src/sys/arch/arm/xilinx/zynq_uart.c \ src/sys/arch/arm/xilinx/zynq_uartreg.h \ src/sys/arch/arm/xilinx/zynq_uartvar.h src/sys/arch/arm/xilinx/zynq_usb.c \ src/sys/arch/arm/xilinx/zynq_usbreg.h \ src/sys/arch/arm/xilinx/zynq_usbvar.h cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/files.generic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.37 src/sys/arch/evbarm/conf/GENERIC:1.38 --- src/sys/arch/evbarm/conf/GENERIC:1.37 Thu Jun 6 22:41:02 2019 +++ src/sys/arch/evbarm/conf/GENERIC Tue Jun 11 13:01:48 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.37 2019/06/06 22:41:02 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.38 2019/06/11 13:01:48 skrll Exp $ # # GENERIC ARM (aarch32) kernel # @@ -147,6 +147,20 @@ makeoptions DTS=" tegra124-venice2.dts vexpress-v2p-ca15-tc1.dts + + zynq-cc108.dts + zynq-microzed.dts + zynq-parallella.dts + zynq-zc702.dts + zynq-zc706.dts + zynq-zc770-xm010.dts + zynq-zc770-xm011.dts + zynq-zc770-xm012.dts + zynq-zc770-xm013.dts + zynq-zed.dts + zynq-zturn.dts + zynq-zybo.dts + zynq-zybo-z7.dts " options CPU_CORTEXA5 @@ -178,6 +192,8 @@ options SOC_TEGRA124 options SOC_VIRT +options SOC_ZYNQ7000 + options MULTIPROCESSOR pseudo-device openfirm # /dev/openfirm @@ -215,6 +231,8 @@ pseudo-device openfirm # /dev/openfirm #options EARLYCONS=vexpress, CONSADDR=0x1c09 #options EARLYCONS=virt, CONSADDR=0x0900 +#options EARLYCONS=zynq, CONSADDR=0xe0001000 + makeoptions DEBUG="-g" # compile full symbol table makeoptions COPY_SYMTAB=1 @@ -275,6 +293,7 @@ sunxisramc* at fdt? pass 4 # System Controller syscon* at fdt? pass 1 # Generic System Controller +#zynqslcr* at fdt? pass 1 # Zynq 7000 system Controller # Timer a9tmr* at fdt? pass 2 # ARM Cortex A5/A9 Timer @@ -372,6 +391,7 @@ pci* at ppb? # Ethernet awge* at fdt? # Allwinner Gigabit Ethernet (GMAC) +cemac* at fdt? # Cadence EMAC/GEM ethernet controller emac* at fdt? # Allwinner Fast/Gigabit Ethernet (EMAC) smsh* at fdt? # SMSC LAN9118 @@ -414,6 +434,7 @@ com* at fdt? # UART exuart* at fdt? # SSCOM UART plcom* at fdt? # ARM PL011 UART mesonuart* at fdt? # Amlogic Meson UART +zynquart* at fdt? # Cadence UART # I2C controllers options I2C_MAX_ADDR=0xfff Index: src/sys/arch/evbarm/conf/files.generic diff -u src/sys/arch/evbarm/conf/files.generic:1.6 src/sys/arch/evbarm/conf/files.generic:1.7 --- src/sys/arch/evbarm/conf/files.generic:1.6 Sun Jan 27 02:08:38 2019 +++ src/sys/arch/evbarm/conf/files.generic Tue Jun 11 13:01:48 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.generic,v 1.6 2019/01/27 02:08:38 pgoyette Exp $ +# $NetBSD: files.generic,v 1.7 2019/06/11 13:01:48 skrll Exp $ # # A generic (aarch32) kernel configuration info # @@ -25,3 +25,4 @@ include "arch/arm/samsung/files.exynos" include "arch/arm/sunxi/files.sunxi" include "arch/arm/vexpress/files.vexpress" include "arch/arm/virt/files.virt" +include "arch/arm/xilinx/files.zynq" Added files: Index: src/sys/arch/arm/xilinx/files.zynq diff -u /dev/null src/sys/arch/arm/xilinx/files.zynq:1.1 --- /dev/null Tue Jun 11 13:01:48 2019 +++ src/sys/arch/arm/xilinx/files.zynq Tue Jun 11 13:01:48 2019 @@ -0,0 +1,39 @@ +# $NetBSD: files.zynq,v 1.1 2019/06/11 13:01:48 skrll Exp $ +# +# Configuration info for Xilinx Zynq-7000 SoC +# +# + +file arch/arm/xilinx/zynq_platform.c soc_zynq + +# SOC parameters +defflag opt_soc.hSOC_ZYNQ +defflag opt_soc.hSOC_ZYNQ7000: SOC_ZYNQ + +# System Level Control Module +#device zynqslcr +#attach zynqslcr at fdt +#file arch/arm/xilinx/zynq_slcr.c zynqslcr needs-flag + +#
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Tue Jun 11 13:01:48 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC files.generic Added Files: src/sys/arch/arm/xilinx: files.zynq zynq7000_sdhc.c zynq7000_uart.c zynq7000_usb.c zynq_cemac.c zynq_platform.c zynq_uart.c zynq_uartreg.h zynq_uartvar.h zynq_usb.c zynq_usbreg.h zynq_usbvar.h Log Message: Initial commit of FDTised Xilinx Zynq-7000 support. Tested with qemu-system-arm -M xilinx-zynq-a9 -dtb zynq-zed.dtb -kernel netbsd.ub \ -serial /dev/null -serial stdio Based on a set of diffs/files from rjs@ sys/arch/arm/zynq is kept in place to allow existing kernels (e.g. ZEDBOARD and PARALLELLA) to continue to build/work during the transition, but eventually sys/arch/arm/zynq will be deleted. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/xilinx/files.zynq \ src/sys/arch/arm/xilinx/zynq7000_sdhc.c \ src/sys/arch/arm/xilinx/zynq7000_uart.c \ src/sys/arch/arm/xilinx/zynq7000_usb.c \ src/sys/arch/arm/xilinx/zynq_cemac.c \ src/sys/arch/arm/xilinx/zynq_platform.c \ src/sys/arch/arm/xilinx/zynq_uart.c \ src/sys/arch/arm/xilinx/zynq_uartreg.h \ src/sys/arch/arm/xilinx/zynq_uartvar.h src/sys/arch/arm/xilinx/zynq_usb.c \ src/sys/arch/arm/xilinx/zynq_usbreg.h \ src/sys/arch/arm/xilinx/zynq_usbvar.h cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/files.generic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Tue Jun 11 13:01:15 UTC 2019
Added Files:
src/usr.sbin/sysinst: msg_cmp.sh
Log Message:
Add a help script to check for untranslated messages
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.sbin/sysinst/msg_cmp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/usr.sbin/sysinst/msg_cmp.sh
diff -u /dev/null src/usr.sbin/sysinst/msg_cmp.sh:1.1
--- /dev/null Tue Jun 11 13:01:15 2019
+++ src/usr.sbin/sysinst/msg_cmp.sh Tue Jun 11 13:01:14 2019
@@ -0,0 +1,101 @@
+#! /bin/sh
+# $NetBSD: msg_cmp.sh,v 1.1 2019/06/11 13:01:14 martin Exp $
+
+#-
+# Copyright (c) 2019 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by David Laight.
+#
+# 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.
+#
+
+
+# Compare two (binary) sysinst msg files and report identical messages.
+# Used to find untranslated strings.
+
+usage()
+{
+ echo "usage: msg_cmp.sh msg_defs.h file1 file2" >&2
+ exit 1
+}
+
+[ "$#" = 3 ] || usage
+
+msg_defs=$1
+msg_long="((msg)(long)"
+close_paren=")"
+
+TMP1=/tmp/mct1.$$
+TMP2=/tmp/mct2.$$
+inp1=$2
+inp2=$3
+
+# Read header file and set up map of message names to numbers
+
+exec <$msg_defs || exit 2
+
+while read define MSG_name number rest
+do
+ [ -z "$number" -o -n "$rest" ] && continue
+ [ "$define" = "#define" ] || continue
+ name="${MSG_name#MSG_}"
+ [ "$name" = "${MSG_name}" ] && continue
+ msg_number="${number#$msg_long}"
+ [ "$msg_number" = "$number" ] && continue
+ msg_number="${msg_number%$close_paren}"
+
+ varname=MSGNAME_$msg_number
+ eval $varname=$name
+done
+
+# Make the sysinst binary message files usable with text tools
+set -- $(tr '\000' '\n' < $inp1); off1=$(( $(( $2 + 2 )) \* 8 ))
+set -- $(tr '\000' '\n' < $inp2); off2=$(( $(( $2 + 2 )) \* 8 ))
+dd bs=1 skip=$off1 if=$inp1 2>/dev/null | tr '\n' '~' | tr '\000' '\n' > $TMP1
+dd bs=1 skip=$off2 if=$inp2 2>/dev/null | tr '\n' '~' | tr '\000' '\n' > $TMP2
+
+# Open both input files
+exec 3< $TMP1
+exec 4< $TMP2
+
+# Compare lines
+IFS=''
+NUM=0
+HDR="Messages identical to the english version:"
+
+while
+ read -r l1 <&3 && read -r l2 <&4
+do
+ NUM=$(( $NUM + 1 ))
+ if [ "$l1" != "$l2" ]; then
+ continue
+ fi
+ [ -z "$hdr_done" ] && hdr_done=1 && printf "%s\n" $HDR
+ varname=MSGNAME_$NUM
+ eval $( printf "msg=$%s" $varname )
+ printf "%s (%d):\t%s\n" $msg $NUM $l1
+done
+
+rm $TMP1 $TMP2
+
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Tue Jun 11 13:01:15 UTC 2019 Added Files: src/usr.sbin/sysinst: msg_cmp.sh Log Message: Add a help script to check for untranslated messages To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/usr.sbin/sysinst/msg_cmp.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Tue Jun 11 12:49:21 UTC 2019 Modified Files: src/lib/libc/gen: posix_spawn.3 Log Message: Quote the name "Ed" to avoid confusion with the macro "Ed". To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/gen/posix_spawn.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Tue Jun 11 12:49:21 UTC 2019 Modified Files: src/lib/libc/gen: posix_spawn.3 Log Message: Quote the name "Ed" to avoid confusion with the macro "Ed". To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/gen/posix_spawn.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/libc/gen/posix_spawn.3 diff -u src/lib/libc/gen/posix_spawn.3:1.7 src/lib/libc/gen/posix_spawn.3:1.8 --- src/lib/libc/gen/posix_spawn.3:1.7 Tue Jun 11 12:47:34 2019 +++ src/lib/libc/gen/posix_spawn.3 Tue Jun 11 12:49:21 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: posix_spawn.3,v 1.7 2019/06/11 12:47:34 kamil Exp $ +.\" $NetBSD: posix_spawn.3,v 1.8 2019/06/11 12:49:21 wiz Exp $ .\" .\" Copyright (c) 2008 Ed Schouten .\" All rights reserved. @@ -479,4 +479,4 @@ added for .Nx 6.0 during Google Summer of Code by Charles Zhang and Martin Husemann. .Sh AUTHORS -.An Ed Schouten Aq Mt e...@freebsd.org +.An \ Schouten Aq Mt e...@freebsd.org
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: skrll Date: Tue Jun 11 12:48:30 UTC 2019 Modified Files: src/sys/arch/arm/cortex: a9tmr.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/cortex/a9tmr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: skrll
Date: Tue Jun 11 12:48:30 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: a9tmr.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/cortex/a9tmr.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/cortex/a9tmr.c
diff -u src/sys/arch/arm/cortex/a9tmr.c:1.19 src/sys/arch/arm/cortex/a9tmr.c:1.20
--- src/sys/arch/arm/cortex/a9tmr.c:1.19 Thu Nov 22 21:08:19 2018
+++ src/sys/arch/arm/cortex/a9tmr.c Tue Jun 11 12:48:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: a9tmr.c,v 1.19 2018/11/22 21:08:19 aymeric Exp $ */
+/* $NetBSD: a9tmr.c,v 1.20 2019/06/11 12:48:30 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.19 2018/11/22 21:08:19 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.20 2019/06/11 12:48:30 skrll Exp $");
#include
#include
@@ -238,7 +238,7 @@ a9tmr_init_cpu_clock(struct cpu_info *ci
a9tmr_gettime(sc));
splx(s);
#elif 0
- delay(100 / hz + 1000);
+ delay(100 / hz + 1000);
#endif
}
@@ -331,7 +331,7 @@ a9tmr_intr(void *arg)
a9tmr_global_write(sc, TMR_GBL_INT, 1); /* Ack the interrupt */
#if 0
- printf("%s(%p): %s: now %#"PRIx64" delta %"PRIu64"\n",
+ printf("%s(%p): %s: now %#"PRIx64" delta %"PRIu64"\n",
__func__, cf, ci->ci_data.cpu_name, now, delta);
#endif
KASSERTMSG(delta > sc->sc_autoinc / 64,
CVS commit: src/lib/libc/gen
Module Name:src Committed By: kamil Date: Tue Jun 11 12:47:34 UTC 2019 Modified Files: src/lib/libc/gen: posix_spawn.3 Log Message: Correct outdated note that posix_spawn(3) is implemented with vfork(2) The original FreeBSD libc code uses vfork(2), it's not the case for NetBSD as there is a dedicated kernel syscall. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/gen/posix_spawn.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: mrg
Date: Tue Jun 11 10:50:58 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Added Files:
src/distrib/utils/embedded/files: creds_msdos creds_msdos.8
Log Message:
add a method to add user accounts or ssh keys to the embedded
(installable) images which may be run entirely headless and
have no current method to edit the installation without another
netbsd host to modify the root (FFS) partition.
creds_msdos reads the creds.txt file from the msdos boot
partition and provides 4 basic methods:
sshkeyfile
sshkey
useraddhash
useradd
the first two create a user with ssh key(s), and the second
two create a user with a password. if the last method is used
and raw passwords are given, the creds.txt file will be
shredded and deleted by rm -P.
inspired by a request from a pine64 user. ok jmcneill@.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/utils/embedded/conf/evbarm.conf
cvs rdiff -u -r0 -r1.1 src/distrib/utils/embedded/files/creds_msdos \
src/distrib/utils/embedded/files/creds_msdos.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.32 src/distrib/utils/embedded/conf/evbarm.conf:1.33
--- src/distrib/utils/embedded/conf/evbarm.conf:1.32 Sun Dec 2 15:43:04 2018
+++ src/distrib/utils/embedded/conf/evbarm.conf Tue Jun 11 10:50:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.32 2018/12/02 15:43:04 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.33 2019/06/11 10:50:57 mrg Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -141,6 +141,8 @@ sshd=YES
dhcpcd=YES
ntpd=YES
ntpd_flags="-g"
+creds_msdos=YES
+creds_msdos_partition=/boot
EOF
if $resize; then
@@ -156,9 +158,11 @@ EOF
>> "$tmp/selected_sets"
mkdir ${mnt}/etc/rc.d
- cp ${DIR}/files/resize_disklabel ${mnt}/etc/rc.d/resize_disklabel
- echo "./etc/rc.d/resize_disklabel type=file uname=root gname=wheel mode=0555" \
- >> "$tmp/selected_sets"
+ for _f in resize_disklabel creds_msdos; do
+ cp ${DIR}/files/${_f} ${mnt}/etc/rc.d/${_f}
+ echo "./etc/rc.d/${_f} type=file uname=root gname=wheel mode=0555" \
+ >> "$tmp/selected_sets"
+ done
if [ ! -f ${release}/dev/MAKEDEV ]; then
echo ${PROG}: Missing ${release}/dev/MAKEDEV 1>&2
Added files:
Index: src/distrib/utils/embedded/files/creds_msdos
diff -u /dev/null src/distrib/utils/embedded/files/creds_msdos:1.1
--- /dev/null Tue Jun 11 10:50:58 2019
+++ src/distrib/utils/embedded/files/creds_msdos Tue Jun 11 10:50:57 2019
@@ -0,0 +1,192 @@
+#!/bin/sh
+#
+# $NetBSD: creds_msdos,v 1.1 2019/06/11 10:50:57 mrg Exp $
+#
+# Copyright (c) 2019 Matthew R. Green
+# 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.
+# 3. The name of the author may not be used to endorse or promote products
+#derived from this software without specific prior written permission.
+#
+# 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 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.
+
+#
+# If "creds_msdos_partition" is an msdos partition and has a creds.txt
+# in it, perform these commands:
+# "sshkeyfile "
+# "sshkey "
+# "useraddhash "
+# "useradd "
+# If the "useradd" method is used, this the creds.txt file will be
+# shredded and deleted with rm -P.
+
+# PROVIDE: creds_msdos
+# REQUIRE: mountall
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="creds_msdos"
+start_cmd="creds_msdos_start"
+stop_cmd=":"
+fstab_file=/etc/fstab
+
+fail() {
+ echo "$@" 1>&2
+ exit 1
+}
+
+sshkey_setup() {
+ local user="$1"
+ local group="wheel"
+
+ # don't create existing users
+ id=$(id -u $user 2>/dev/null)
+ if [ $? -ne 0 ]; then
+ useradd -m -G "${group}" "$user" || fail
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Tue Jun 11 10:23:37 UTC 2019 Modified Files: src/tests/lib/libcurses: t_curses.sh Log Message: Fixed bug in curses library keyname, test now passes. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libcurses/t_curses.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Tue Jun 11 10:23:37 UTC 2019 Modified Files: src/tests/lib/libcurses: t_curses.sh Log Message: Fixed bug in curses library keyname, test now passes. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libcurses/t_curses.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/libcurses/t_curses.sh diff -u src/tests/lib/libcurses/t_curses.sh:1.12 src/tests/lib/libcurses/t_curses.sh:1.13 --- src/tests/lib/libcurses/t_curses.sh:1.12 Tue Jun 11 08:09:35 2019 +++ src/tests/lib/libcurses/t_curses.sh Tue Jun 11 10:23:36 2019 @@ -785,7 +785,7 @@ atf_init_test_cases() atf_add_test_case innstr atf_add_test_case is_linetouched atf_add_test_case is_wintouched -# atf_add_test_case keyname # not working + atf_add_test_case keyname atf_add_test_case keyok atf_add_test_case killchar atf_add_test_case meta
CVS commit: src/tests/lib/libcurses/director
Module Name:src
Committed By: blymn
Date: Tue Jun 11 10:22:35 UTC 2019
Modified Files:
src/tests/lib/libcurses/director: testlang_parse.y
Log Message:
Bracket strings being validated with markers to ensure sneaky whitespeace
is noticed.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/lib/libcurses/director/testlang_parse.y
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/libcurses/director/testlang_parse.y
diff -u src/tests/lib/libcurses/director/testlang_parse.y:1.14 src/tests/lib/libcurses/director/testlang_parse.y:1.15
--- src/tests/lib/libcurses/director/testlang_parse.y:1.14 Sun Jan 4 20:19:46 2015
+++ src/tests/lib/libcurses/director/testlang_parse.y Tue Jun 11 10:22:35 2019
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_parse.y,v 1.14 2015/01/04 20:19:46 christos Exp $ */
+/* $NetBSD: testlang_parse.y,v 1.15 2019/06/11 10:22:35 blymn Exp $ */
/*-
* Copyright 2009 Brett Lymn
@@ -1239,12 +1239,12 @@ validate_return(const char *expected, co
{
if (((check == 0) && strcmp(expected, value) != 0) ||
((check == 1) && strcmp(expected, value) == 0))
- errx(1, "Validate expected %s %s %s line %zu of file %s",
+ errx(1, "Validate expected >%s< %s >%s< line %zu of file %s",
expected,
(check == 0)? "matching" : "not matching", value,
line, cur_file);
if (verbose) {
- fprintf(stderr, "Validated expected value %s %s %s "
+ fprintf(stderr, "Validated expected value >%s< %s >%s< "
"at line %zu of file %s\n", expected,
(check == 0)? "matches" : "does not match",
value, line, cur_file);
CVS commit: src/lib/libcurses
Module Name:src
Committed By: blymn
Date: Tue Jun 11 10:17:24 UTC 2019
Modified Files:
src/lib/libcurses: keyname.c
Log Message:
Fix typo for unknown key keyname return.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libcurses/keyname.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/libcurses/keyname.c
diff -u src/lib/libcurses/keyname.c:1.7 src/lib/libcurses/keyname.c:1.8
--- src/lib/libcurses/keyname.c:1.7 Fri Jan 6 13:53:18 2017
+++ src/lib/libcurses/keyname.c Tue Jun 11 10:17:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: keyname.c,v 1.7 2017/01/06 13:53:18 roy Exp $ */
+/* $NetBSD: keyname.c,v 1.8 2019/06/11 10:17:24 blymn Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: keyname.c,v 1.7 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: keyname.c,v 1.8 2019/06/11 10:17:24 blymn Exp $");
#endif/* not lint */
#include
@@ -481,7 +481,7 @@ keyname(int key)
return name;
}
/* No more names. */
- strncpy(name, "UNKOWN KEY\0", KEYNAMEMAX);
+ strncpy(name, "UNKNOWN KEY\0", KEYNAMEMAX);
return name;
#endif
}
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src
Committed By: hannken
Date: Tue Jun 11 09:05:33 UTC 2019
Modified Files:
src/external/cddl/osnet/sys/kern: taskq.c
Log Message:
There is no 1:1 relation between cv_signal() and cv_timedwait() as
the latter implicitly calls cv_signal() on error.
This leads to "tq_waiting > 0" with "tq_running == 0" and the
taskq stalls.
Change task_executor() to increment and decrement "tq_waiting"
and always check and run the queue after cv_timedwait().
Use mstohz(), fix timeout and sort includes.
Addresses PR port-xen/54273: "zpool create pool xbd2" panics DOMU kernel
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/sys/kern/taskq.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/taskq.c
diff -u src/external/cddl/osnet/sys/kern/taskq.c:1.9 src/external/cddl/osnet/sys/kern/taskq.c:1.10
--- src/external/cddl/osnet/sys/kern/taskq.c:1.9 Tue May 7 08:49:59 2019
+++ src/external/cddl/osnet/sys/kern/taskq.c Tue Jun 11 09:05:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: taskq.c,v 1.9 2019/05/07 08:49:59 hannken Exp $ */
+/* $NetBSD: taskq.c,v 1.10 2019/06/11 09:05:33 hannken Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,9 +30,11 @@
*/
#include
-#include
+#include
#include
+#include
#include
+#include
#include
#include
@@ -65,7 +67,7 @@ static specificdata_key_t taskq_lwp_key;
/*
* Threadpool job to service tasks from task queue.
- * Runs until the task queue gets destroyed or the queue is empty for 5 secs.
+ * Runs until the task queue gets destroyed or the queue is empty for 10 secs.
*/
static void
task_executor(struct threadpool_job *job)
@@ -73,22 +75,27 @@ task_executor(struct threadpool_job *job
struct taskq_executor *state = (struct taskq_executor *)job;
taskq_t *tq = state->te_self;
taskq_ent_t *tqe;
+ int error;
lwp_setspecific(taskq_lwp_key, tq);
mutex_enter(>tq_lock);
while (!tq->tq_destroyed) {
- tqe = SIMPLEQ_FIRST(>tq_list);
- if (tqe == NULL) {
+ if (SIMPLEQ_EMPTY(>tq_list)) {
if (ISSET(tq->tq_flags, TASKQ_DYNAMIC))
break;
tq->tq_waiting++;
- if (cv_timedwait(>tq_cv, >tq_lock, 5000) != 0) {
-tq->tq_waiting--;
-break;
+ error = cv_timedwait(>tq_cv, >tq_lock,
+ mstohz(1));
+ tq->tq_waiting--;
+ if (SIMPLEQ_EMPTY(>tq_list)) {
+if (error)
+ break;
+continue;
}
- continue;
}
+ tqe = SIMPLEQ_FIRST(>tq_list);
+ KASSERT(tqe != NULL);
SIMPLEQ_REMOVE_HEAD(>tq_list, tqent_list);
tqe->tqent_queued = 0;
mutex_exit(>tq_lock);
@@ -144,7 +151,6 @@ taskq_dispatch_common(taskq_t *tq, taskq
tq->tq_active++;
if (tq->tq_waiting) {
cv_signal(>tq_cv);
- tq->tq_waiting--;
mutex_exit(>tq_lock);
return;
}
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: hannken Date: Tue Jun 11 09:04:37 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_disk.c src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: vdev_disk.h Log Message: Try to retrieve the per-disk maximum transfer size and use it instead of MAXPHYS. Eagerly waiting for the merge of tls-maxphys. Addresses PR port-xen/54273: "zpool create pool xbd2" panics DOMU kernel To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_disk.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: hannken
Date: Tue Jun 11 09:04:37 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_disk.c
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: vdev_disk.h
Log Message:
Try to retrieve the per-disk maximum transfer size and use it instead
of MAXPHYS. Eagerly waiting for the merge of tls-maxphys.
Addresses PR port-xen/54273: "zpool create pool xbd2" panics DOMU kernel
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_disk.h
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/vdev_disk.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.9 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.10
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.9 Sun May 26 10:22:59 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Tue Jun 11 09:04:37 2019
@@ -219,6 +219,27 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
return (SET_ERROR(EINVAL));
}
+ /* XXXNETBSD Once tls-maxphys gets merged this block becomes:
+ pdk = disk_find_blk(vp->v_rdev);
+ dvd->vd_maxphys = (pdk ? disk_maxphys(pdk) : MACHINE_MAXPHYS);
+ */
+ {
+ struct buf buf = { b_bcount: MAXPHYS };
+ const char *dev_name;
+
+ dev_name = devsw_blk2name(major(vp->v_rdev));
+ if (dev_name) {
+ char disk_name[16];
+
+ snprintf(disk_name, sizeof(disk_name), "%s%d",
+ dev_name, DISKUNIT(vp->v_rdev));
+ pdk = disk_find(disk_name);
+ if (pdk && pdk->dk_driver && pdk->dk_driver->d_minphys)
+(*pdk->dk_driver->d_minphys)();
+ }
+ dvd->vd_maxphys = buf.b_bcount;
+ }
+
/*
* XXXNETBSD Compare the devid to the stored value.
*/
@@ -421,6 +442,7 @@ vdev_disk_io_start(zio_t *zio)
zio_interrupt(zio);
return;
}
+ ASSERT3U(dvd->vd_maxphys, >, 0);
vp = dvd->vd_vp;
#endif
@@ -473,7 +495,7 @@ vdev_disk_io_start(zio_t *zio)
mutex_exit(vp->v_interlock);
}
- if (bp->b_bcount <= MAXPHYS) {
+ if (bp->b_bcount <= dvd->vd_maxphys) {
/* We can do this I/O in one pass. */
(void)VOP_STRATEGY(vp, bp);
} else {
@@ -484,7 +506,7 @@ vdev_disk_io_start(zio_t *zio)
resid = zio->io_size;
off = 0;
while (resid != 0) {
- size = uimin(resid, MAXPHYS);
+ size = uimin(resid, dvd->vd_maxphys);
nbp = getiobuf(vp, true);
nbp->b_blkno = btodb(zio->io_offset + off);
/* Below call increments v_numoutput. */
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_disk.h
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_disk.h:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_disk.h:1.4
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_disk.h:1.3 Mon May 28 21:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_disk.h Tue Jun 11 09:04:37 2019
@@ -52,6 +52,7 @@ typedef struct vdev_disk {
char*vd_minor;
vnode_t *vd_vp;
struct workqueue *vd_wq;
+ int vd_maxphys;
#endif
} vdev_disk_t;
#endif
CVS commit: src/tests/net/icmp
Module Name:src
Committed By: gson
Date: Tue Jun 11 08:34:01 UTC 2019
Modified Files:
src/tests/net/icmp: t_ping.c
Log Message:
In the "got %d/%d" message printed at the end of the pingsize test,
make the latter number show the actual number of ICMP packets the test
attempted to send. Thus, the two numbers can now be meaningfully
compared, and their difference indicates the number of packets lost.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/tests/net/icmp/t_ping.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/icmp/t_ping.c
diff -u src/tests/net/icmp/t_ping.c:1.23 src/tests/net/icmp/t_ping.c:1.24
--- src/tests/net/icmp/t_ping.c:1.23 Mon Mar 26 09:11:15 2018
+++ src/tests/net/icmp/t_ping.c Tue Jun 11 08:34:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ping.c,v 1.23 2018/03/26 09:11:15 roy Exp $ */
+/* $NetBSD: t_ping.c,v 1.24 2019/06/11 08:34:01 gson Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: t_ping.c,v 1.23 2018/03/26 09:11:15 roy Exp $");
+__RCSID("$NetBSD: t_ping.c,v 1.24 2019/06/11 08:34:01 gson Exp $");
#endif /* not lint */
#include
@@ -280,7 +280,7 @@ ATF_TC_BODY(pingsize, tc)
{
char ifname[IFNAMSIZ];
pid_t cpid;
- int succ, i;
+ int sent, succ, i;
cpid = fork();
rump_init();
@@ -299,21 +299,27 @@ ATF_TC_BODY(pingsize, tc)
netcfg_rump_if(ifname, "1.1.1.20", "255.255.255.0");
- succ = 0;
+ succ = sent = 0;
/* small sizes */
- for (i = 0 ; i < IP_MAXPACKET - 6; i++)
+ for (i = 0 ; i < IP_MAXPACKET - 6; i++) {
+ sent++;
succ += doping("1.1.1.10", 1, i);
+ }
/* medium sizes */
- for (i = IP_MAXPACKET - 6; i < IP_MAXPACKET - 100; i += 1000)
+ for (i = IP_MAXPACKET - 6; i < IP_MAXPACKET - 100; i += 1000) {
+ sent++;
succ += doping("1.1.1.10", 1, i);
+ }
/* big sizes */
- for (i = IP_MAXPACKET - 100; i < IP_MAXPACKET; i += 10)
+ for (i = IP_MAXPACKET - 100; i < IP_MAXPACKET; i += 10) {
+ sent++;
succ += doping("1.1.1.10", 1, i);
+ }
- printf("got %d/%d\n", succ, IP_MAXPACKET);
+ printf("got %d/%d\n", succ, sent);
kill(cpid, SIGKILL);
}
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Tue Jun 11 08:09:36 UTC 2019 Modified Files: src/tests/lib/libcurses: t_curses.sh src/tests/lib/libcurses/check_files: dupwin1.chk dupwin2.chk src/tests/lib/libcurses/tests: dupwin fill_window_numbers Log Message: Fix dupwin test. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libcurses/t_curses.sh cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/dupwin1.chk \ src/tests/lib/libcurses/check_files/dupwin2.chk cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/dupwin \ src/tests/lib/libcurses/tests/fill_window_numbers 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/libcurses/t_curses.sh diff -u src/tests/lib/libcurses/t_curses.sh:1.11 src/tests/lib/libcurses/t_curses.sh:1.12 --- src/tests/lib/libcurses/t_curses.sh:1.11 Tue Jun 11 08:00:38 2019 +++ src/tests/lib/libcurses/t_curses.sh Tue Jun 11 08:09:35 2019 @@ -765,7 +765,7 @@ atf_init_test_cases() # atf_add_test_case delay_output # not working atf_add_test_case derwin atf_add_test_case doupdate -# atf_add_test_case dupwin # not working + atf_add_test_case dupwin atf_add_test_case erasechar atf_add_test_case flash atf_add_test_case getattrs Index: src/tests/lib/libcurses/check_files/dupwin1.chk diff -u src/tests/lib/libcurses/check_files/dupwin1.chk:1.1 src/tests/lib/libcurses/check_files/dupwin1.chk:1.2 --- src/tests/lib/libcurses/check_files/dupwin1.chk:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/check_files/dupwin1.chk Tue Jun 11 08:09:36 2019 @@ -3,4 +3,4 @@ 33 44 55 - 66cup8;11Xcup9;13X11cup10;13X22cup11;13X33cup12;13X44cup13;13X55cup14;13X66cup14;18X + 66 cup9;13X11cup10;13X22cup11;13X33cup12;13X44cup13;13X55cup14;13X66cup14;13X \ No newline at end of file Index: src/tests/lib/libcurses/check_files/dupwin2.chk diff -u src/tests/lib/libcurses/check_files/dupwin2.chk:1.1 src/tests/lib/libcurses/check_files/dupwin2.chk:1.2 --- src/tests/lib/libcurses/check_files/dupwin2.chk:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/check_files/dupwin2.chk Tue Jun 11 08:09:36 2019 @@ -1 +1 @@ -cup8;11Xcup9;13Xaacup10;13Xbbcup11;13Xcccup12;13Xddcup13;13Xeecup14;13Xffcup14;18X +cup8;6Xcup9;13Xaacup10;13Xbbcup11;13Xcccup12;13Xddcup13;13Xeecup14;13Xffcup14;13X \ No newline at end of file Index: src/tests/lib/libcurses/tests/dupwin diff -u src/tests/lib/libcurses/tests/dupwin:1.1 src/tests/lib/libcurses/tests/dupwin:1.2 --- src/tests/lib/libcurses/tests/dupwin:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/tests/dupwin Tue Jun 11 08:09:36 2019 @@ -6,6 +6,11 @@ call OK mvwin $win2 8 12 call OK wrefresh $win1 call OK wrefresh $win2 compare dupwin1.chk +call OK scrollok $win2 $TRUE +call OK wmove $win2 5 0 +call OK waddstr $win2 "ff" +call OK wmove $win2 4 0 +call OK wscrl $win2 -1 call OK wmove $win2 0 0 call OK waddstr $win2 "aa" call OK wmove $win2 1 0 @@ -16,8 +21,6 @@ call OK wmove $win2 3 0 call OK waddstr $win2 "dd" call OK wmove $win2 4 0 call OK waddstr $win2 "ee" -call OK wmove $win2 5 0 -call OK waddstr $win2 "ff" call OK wrefresh $win1 call OK wrefresh $win2 compare dupwin2.chk Index: src/tests/lib/libcurses/tests/fill_window_numbers diff -u src/tests/lib/libcurses/tests/fill_window_numbers:1.1 src/tests/lib/libcurses/tests/fill_window_numbers:1.2 --- src/tests/lib/libcurses/tests/fill_window_numbers:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/tests/fill_window_numbers Tue Jun 11 08:09:36 2019 @@ -1,3 +1,8 @@ +call OK scrollok $win1 $TRUE +call OK wmove $win1 5 0 +call OK waddstr $win1 "66" +call OK wmove $win1 4 0 +call OK wscrl $win1 -1 call OK wmove $win1 0 0 call OK waddstr $win1 "11" call OK wmove $win1 1 0 @@ -8,5 +13,3 @@ call OK wmove $win1 3 0 call OK waddstr $win1 "44" call OK wmove $win1 4 0 call OK waddstr $win1 "55" -call OK wmove $win1 5 0 -call OK waddstr $win1 "66"
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Tue Jun 11 08:00:38 UTC 2019 Modified Files: src/tests/lib/libcurses: t_curses.sh src/tests/lib/libcurses/check_files: derwin1.chk derwin2.chk src/tests/lib/libcurses/tests: derwin Log Message: fix derwin test. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libcurses/t_curses.sh cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/derwin1.chk \ src/tests/lib/libcurses/check_files/derwin2.chk cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/derwin 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/libcurses/t_curses.sh diff -u src/tests/lib/libcurses/t_curses.sh:1.10 src/tests/lib/libcurses/t_curses.sh:1.11 --- src/tests/lib/libcurses/t_curses.sh:1.10 Sun Jun 9 07:48:47 2019 +++ src/tests/lib/libcurses/t_curses.sh Tue Jun 11 08:00:38 2019 @@ -763,7 +763,7 @@ atf_init_test_cases() atf_add_test_case curs_set atf_add_test_case define_key # atf_add_test_case delay_output # not working -# atf_add_test_case derwin # not working + atf_add_test_case derwin atf_add_test_case doupdate # atf_add_test_case dupwin # not working atf_add_test_case erasechar Index: src/tests/lib/libcurses/check_files/derwin1.chk diff -u src/tests/lib/libcurses/check_files/derwin1.chk:1.1 src/tests/lib/libcurses/check_files/derwin1.chk:1.2 --- src/tests/lib/libcurses/check_files/derwin1.chk:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/check_files/derwin1.chk Tue Jun 11 08:00:38 2019 @@ -3,4 +3,4 @@ 00 00 00 - 00cup8;11X + 00 \ No newline at end of file Index: src/tests/lib/libcurses/check_files/derwin2.chk diff -u src/tests/lib/libcurses/check_files/derwin2.chk:1.1 src/tests/lib/libcurses/check_files/derwin2.chk:1.2 --- src/tests/lib/libcurses/check_files/derwin2.chk:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/check_files/derwin2.chk Tue Jun 11 08:00:38 2019 @@ -1 +1 @@ -cup4;7X222cup5;7X222cup6;7X222cup8;11X +0222cup5;7X222cup6;7X222cup8;6X \ No newline at end of file Index: src/tests/lib/libcurses/tests/derwin diff -u src/tests/lib/libcurses/tests/derwin:1.1 src/tests/lib/libcurses/tests/derwin:1.2 --- src/tests/lib/libcurses/tests/derwin:1.1 Sun May 26 09:54:33 2019 +++ src/tests/lib/libcurses/tests/derwin Tue Jun 11 08:00:38 2019 @@ -1,5 +1,10 @@ include start include window_create +call OK scrollok $win1 $TRUE +call OK wmove $win1 5 0 +call OK waddstr $win1 "00" +call OK wmove $win1 4 0 +call OK wscrl $win1 -1 call OK wmove $win1 0 0 call OK waddstr $win1 "00" call OK wmove $win1 1 0 @@ -10,17 +15,18 @@ call OK wmove $win1 3 0 call OK waddstr $win1 "00" call OK wmove $win1 4 0 call OK waddstr $win1 "00" -call OK wmove $win1 5 0 -call OK waddstr $win1 "00" call OK wrefresh $win1 compare derwin1.chk call win2 derwin $win1 3 3 1 1 check win2 NON_NULL -call OK wmove $win2 0 0 +call OK scrollok $win2 $TRUE +call OK wmove $win2 2 0 call OK waddstr $win2 "222" call OK wmove $win2 1 0 +call OK wscrl $win2 -1 +call OK wmove $win2 0 0 call OK waddstr $win2 "222" -call OK wmove $win2 2 0 +call OK wmove $win2 1 0 call OK waddstr $win2 "222" call OK wrefresh $win1 compare derwin2.chk
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Tue Jun 11 08:00:38 UTC 2019 Modified Files: src/tests/lib/libcurses: t_curses.sh src/tests/lib/libcurses/check_files: derwin1.chk derwin2.chk src/tests/lib/libcurses/tests: derwin Log Message: fix derwin test. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libcurses/t_curses.sh cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/derwin1.chk \ src/tests/lib/libcurses/check_files/derwin2.chk cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/derwin Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
