svn commit: r270696 - stable/10/sys/amd64/include
Author: grehan
Date: Wed Aug 27 06:13:44 2014
New Revision: 270696
URL: http://svnweb.freebsd.org/changeset/base/270696
Log:
MFC 270438
Change __inline style to be consistent with FreeBSD usage,
and also fix gcc build.
PR: 192880
Modified:
stable/10/sys/amd64/include/vmm.h
Modified: stable/10/sys/amd64/include/vmm.h
==
--- stable/10/sys/amd64/include/vmm.h Wed Aug 27 01:38:26 2014
(r270695)
+++ stable/10/sys/amd64/include/vmm.h Wed Aug 27 06:13:44 2014
(r270696)
@@ -587,25 +587,25 @@ struct vm_exit {
void vm_inject_fault(void *vm, int vcpuid, int vector, int errcode_valid,
int errcode);
-static void __inline
+static __inline void
vm_inject_ud(void *vm, int vcpuid)
{
vm_inject_fault(vm, vcpuid, IDT_UD, 0, 0);
}
-static void __inline
+static __inline void
vm_inject_gp(void *vm, int vcpuid)
{
vm_inject_fault(vm, vcpuid, IDT_GP, 1, 0);
}
-static void __inline
+static __inline void
vm_inject_ac(void *vm, int vcpuid, int errcode)
{
vm_inject_fault(vm, vcpuid, IDT_AC, 1, errcode);
}
-static void __inline
+static __inline void
vm_inject_ss(void *vm, int vcpuid, int errcode)
{
vm_inject_fault(vm, vcpuid, IDT_SS, 1, errcode);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270676 - head/etc
On Wed, Aug 27, 2014 at 01:48:00PM +0900, Hiroki Sato wrote:
> Baptiste Daroussin wrote
> in <201408262233.s7qmxyfd056...@svn.freebsd.org>:
>
> ba> Author: bapt
> ba> Date: Tue Aug 26 22:33:34 2014
> ba> New Revision: 270676
> ba> URL: http://svnweb.freebsd.org/changeset/base/270676
> ba>
> ba> Log:
> ba> Allow to configure services from ${LOCALBASE}/etc/rc.conf.d
> ba>
> ba> Reviewed by:bdrewery
> ba> MFC after: 1 week
> ba> Relnotes: yes
> ba>
> ba> Modified:
> ba> head/etc/rc.subr
> ba>
> ba> Modified: head/etc/rc.subr
> ba>
> ==
> ba> --- head/etc/rc.subr Tue Aug 26 22:20:02 2014(r270675)
> ba> +++ head/etc/rc.subr Tue Aug 26 22:33:34 2014(r270676)
> ba> @@ -1301,6 +1301,10 @@ load_rc_config()
> ba> fi
> ba> done
> ba> fi
> ba> + if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then
> ba> + debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}"
> ba> + . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name"
> ba> + fi
>
> This should hornor ${local_startup} instead of ${LOCALBASE} since it
> is not used in rc(8), and should be compatible with DES's commit in
> r270392.
>
> How about the attached patch?
>
I do like it better than mine thank you
regards,
Bapt
pgpSnJsSSExR6.pgp
Description: PGP signature
Re: svn commit: r270676 - head/etc
Baptiste Daroussin wrote
in <201408262233.s7qmxyfd056...@svn.freebsd.org>:
ba> Author: bapt
ba> Date: Tue Aug 26 22:33:34 2014
ba> New Revision: 270676
ba> URL: http://svnweb.freebsd.org/changeset/base/270676
ba>
ba> Log:
ba> Allow to configure services from ${LOCALBASE}/etc/rc.conf.d
ba>
ba> Reviewed by: bdrewery
ba> MFC after:1 week
ba> Relnotes: yes
ba>
ba> Modified:
ba> head/etc/rc.subr
ba>
ba> Modified: head/etc/rc.subr
ba>
==
ba> --- head/etc/rc.subrTue Aug 26 22:20:02 2014(r270675)
ba> +++ head/etc/rc.subrTue Aug 26 22:33:34 2014(r270676)
ba> @@ -1301,6 +1301,10 @@ load_rc_config()
ba> fi
ba> done
ba> fi
ba> + if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then
ba> + debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}"
ba> + . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name"
ba> + fi
This should hornor ${local_startup} instead of ${LOCALBASE} since it
is not used in rc(8), and should be compatible with DES's commit in
r270392.
How about the attached patch?
-- Hiroki
Index: etc/rc.subr
===
--- etc/rc.subr (revision 270695)
+++ etc/rc.subr (working copy)
@@ -1270,7 +1270,7 @@
#
load_rc_config()
{
- local _name _rcvar_val _var _defval _v _msg _new
+ local _name _rcvar_val _var _defval _v _msg _new _d
_name=$1
if [ -z "$_name" ]; then
err 3 'USAGE: load_rc_config name'
@@ -1289,23 +1289,22 @@
fi
_rc_conf_loaded=true
fi
- if [ -f /etc/rc.conf.d/"$_name" ]; then
- debug "Sourcing /etc/rc.conf.d/$_name"
- . /etc/rc.conf.d/"$_name"
- elif [ -d /etc/rc.conf.d/"$_name" ] ; then
- local _rc
- for _rc in /etc/rc.conf.d/"$_name"/* ; do
- if [ -f "$_rc" ] ; then
-debug "Sourcing $_rc"
-. "$_rc"
- fi
- done
- fi
- if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then
- debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}"
- . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name"
- fi
+ for _d in /etc ${local_startup%*/rc.d}; do
+ if [ -f ${_d}/rc.conf.d/"$_name" ]; then
+ debug "Sourcing ${_d}/rc.conf.d/$_name"
+ . ${_d}/rc.conf.d/"$_name"
+ elif [ -d ${_d}/rc.conf.d/"$_name" ] ; then
+ local _rc
+ for _rc in ${_d}/rc.conf.d/"$_name"/* ; do
+if [ -f "$_rc" ] ; then
+ debug "Sourcing $_rc"
+ . "$_rc"
+fi
+ done
+ fi
+ done
+
# Set defaults if defined.
for _var in $rcvar; do
eval _defval=\$${_var}_defval
pgp4zhHnHpj7d.pgp
Description: PGP signature
svn commit: r270695 - stable/10/sys/ufs/ufs
Author: kib
Date: Wed Aug 27 01:38:26 2014
New Revision: 270695
URL: http://svnweb.freebsd.org/changeset/base/270695
Log:
MFC r270204:
Do not busy the UFS mount point inside VOP_RENAME().
Modified:
stable/10/sys/ufs/ufs/ufs_vnops.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/ufs/ufs/ufs_vnops.c
==
--- stable/10/sys/ufs/ufs/ufs_vnops.c Wed Aug 27 01:37:22 2014
(r270694)
+++ stable/10/sys/ufs/ufs/ufs_vnops.c Wed Aug 27 01:38:26 2014
(r270695)
@@ -1142,11 +1142,6 @@ ufs_rename(ap)
mp = NULL;
goto releout;
}
- error = vfs_busy(mp, 0);
- if (error) {
- mp = NULL;
- goto releout;
- }
relock:
/*
* We need to acquire 2 to 4 locks depending on whether tvp is NULL
@@ -1546,8 +1541,6 @@ unlockout:
if (error == 0 && tdp->i_flag & IN_NEEDSYNC)
error = VOP_FSYNC(tdvp, MNT_WAIT, td);
vput(tdvp);
- if (mp)
- vfs_unbusy(mp);
return (error);
bad:
@@ -1565,8 +1558,6 @@ releout:
vrele(tdvp);
if (tvp)
vrele(tvp);
- if (mp)
- vfs_unbusy(mp);
return (error);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270694 - stable/10/sys/ufs/ffs
Author: kib
Date: Wed Aug 27 01:37:22 2014
New Revision: 270694
URL: http://svnweb.freebsd.org/changeset/base/270694
Log:
MFC r270203:
Correct the test for condition to suspend UFS filesystem during unmount.
Modified:
stable/10/sys/ufs/ffs/ffs_vfsops.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/ufs/ffs/ffs_vfsops.c
==
--- stable/10/sys/ufs/ffs/ffs_vfsops.c Wed Aug 27 01:34:33 2014
(r270693)
+++ stable/10/sys/ufs/ffs/ffs_vfsops.c Wed Aug 27 01:37:22 2014
(r270694)
@@ -1213,7 +1213,7 @@ ffs_unmount(mp, mntflags)
susp = 0;
if (mntflags & MNT_FORCE) {
flags |= FORCECLOSE;
- susp = fs->fs_ronly != 0;
+ susp = fs->fs_ronly == 0;
}
#ifdef UFS_EXTATTR
if ((error = ufs_extattr_stop(mp, td))) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270693 - stable/10/sys/amd64/include
Author: kib Date: Wed Aug 27 01:34:33 2014 New Revision: 270693 URL: http://svnweb.freebsd.org/changeset/base/270693 Log: MFC r270202: Increase max number of physical segments on amd64 to 63. Modified: stable/10/sys/amd64/include/vmparam.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/amd64/include/vmparam.h == --- stable/10/sys/amd64/include/vmparam.h Wed Aug 27 01:02:19 2014 (r270692) +++ stable/10/sys/amd64/include/vmparam.h Wed Aug 27 01:34:33 2014 (r270693) @@ -87,7 +87,7 @@ * largest physical address that is accessible by ISA DMA is split * into two PHYSSEG entries. */ -#defineVM_PHYSSEG_MAX 31 +#defineVM_PHYSSEG_MAX 63 /* * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270691 - head/sys/compat/freebsd32
Author: kib
Date: Wed Aug 27 01:02:02 2014
New Revision: 270691
URL: http://svnweb.freebsd.org/changeset/base/270691
Log:
Fix handling of the third argument for fcntl(2). The native syscall
uses long for arg, which needs translation.
Discussed with and tested by: mjg
Sponsored by: The FreeBSD Foundation
MFC after:1 week
Modified:
head/sys/compat/freebsd32/freebsd32_misc.c
head/sys/compat/freebsd32/syscalls.master
Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==
--- head/sys/compat/freebsd32/freebsd32_misc.c Wed Aug 27 00:57:45 2014
(r270690)
+++ head/sys/compat/freebsd32/freebsd32_misc.c Wed Aug 27 01:02:02 2014
(r270691)
@@ -2980,3 +2980,28 @@ freebsd32_procctl(struct thread *td, str
return (kern_procctl(td, uap->idtype, PAIR32TO64(id_t, uap->id),
uap->com, data));
}
+
+int
+freebsd32_fcntl(struct thread *td, struct freebsd32_fcntl_args *uap)
+{
+ intptr_t tmp;
+
+ switch (uap->cmd) {
+ /*
+* Do unsigned conversion for arg when operation
+* interprets it as flags or pointer.
+*/
+ case F_SETLK_REMOTE:
+ case F_SETLKW:
+ case F_SETLK:
+ case F_GETLK:
+ case F_SETFD:
+ case F_SETFL:
+ tmp = (unsigned int)(uap->arg);
+ break;
+ default:
+ tmp = uap->arg;
+ break;
+ }
+ return (kern_fcntl(td, uap->fd, uap->cmd, tmp));
+}
Modified: head/sys/compat/freebsd32/syscalls.master
==
--- head/sys/compat/freebsd32/syscalls.master Wed Aug 27 00:57:45 2014
(r270690)
+++ head/sys/compat/freebsd32/syscalls.master Wed Aug 27 01:02:02 2014
(r270691)
@@ -200,7 +200,8 @@
89 AUE_GETDTABLESIZE NOPROTO { int getdtablesize(void); }
90 AUE_DUP2NOPROTO { int dup2(u_int from, u_int to); }
91 AUE_NULLUNIMPL getdopt
-92 AUE_FCNTL NOPROTO { int fcntl(int fd, int cmd, long arg); }
+92 AUE_FCNTL STD { int freebsd32_fcntl(int fd, int cmd, \
+ int arg); }
93 AUE_SELECT STD { int freebsd32_select(int nd, fd_set *in, \
fd_set *ou, fd_set *ex, \
struct timeval32 *tv); }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270692 - head/sys/compat/freebsd32
Author: kib
Date: Wed Aug 27 01:02:19 2014
New Revision: 270692
URL: http://svnweb.freebsd.org/changeset/base/270692
Log:
Regen.
Modified:
head/sys/compat/freebsd32/freebsd32_proto.h
head/sys/compat/freebsd32/freebsd32_syscall.h
head/sys/compat/freebsd32/freebsd32_syscalls.c
head/sys/compat/freebsd32/freebsd32_sysent.c
head/sys/compat/freebsd32/freebsd32_systrace_args.c
Modified: head/sys/compat/freebsd32/freebsd32_proto.h
==
--- head/sys/compat/freebsd32/freebsd32_proto.h Wed Aug 27 01:02:02 2014
(r270691)
+++ head/sys/compat/freebsd32/freebsd32_proto.h Wed Aug 27 01:02:19 2014
(r270692)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 263318
2014-03-18 21:32:03Z attilio
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 270691
2014-08-27 01:02:02Z kib
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -92,6 +92,11 @@ struct freebsd32_getitimer_args {
char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
char itv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * itv;
char itv_r_[PADR_(struct itimerval32 *)];
};
+struct freebsd32_fcntl_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
+ char arg_l_[PADL_(int)]; int arg; char arg_r_[PADR_(int)];
+};
struct freebsd32_select_args {
char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)];
char in_l_[PADL_(fd_set *)]; fd_set * in; char in_r_[PADR_(fd_set *)];
@@ -695,6 +700,7 @@ int freebsd32_execve(struct thread *, st
intfreebsd32_mprotect(struct thread *, struct freebsd32_mprotect_args *);
intfreebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *);
intfreebsd32_getitimer(struct thread *, struct freebsd32_getitimer_args *);
+intfreebsd32_fcntl(struct thread *, struct freebsd32_fcntl_args *);
intfreebsd32_select(struct thread *, struct freebsd32_select_args *);
intfreebsd32_gettimeofday(struct thread *, struct
freebsd32_gettimeofday_args *);
intfreebsd32_getrusage(struct thread *, struct freebsd32_getrusage_args *);
@@ -1098,6 +1104,7 @@ int freebsd7_freebsd32_shmctl(struct thr
#defineFREEBSD32_SYS_AUE_freebsd32_mprotectAUE_MPROTECT
#defineFREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER
#defineFREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER
+#defineFREEBSD32_SYS_AUE_freebsd32_fcntl AUE_FCNTL
#defineFREEBSD32_SYS_AUE_freebsd32_select AUE_SELECT
#defineFREEBSD32_SYS_AUE_ofreebsd32_sigreturn AUE_NULL
#defineFREEBSD32_SYS_AUE_ofreebsd32_sigvec AUE_O_SIGVEC
Modified: head/sys/compat/freebsd32/freebsd32_syscall.h
==
--- head/sys/compat/freebsd32/freebsd32_syscall.h Wed Aug 27 01:02:02
2014(r270691)
+++ head/sys/compat/freebsd32/freebsd32_syscall.h Wed Aug 27 01:02:19
2014(r270692)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 263318
2014-03-18 21:32:03Z attilio
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 270691
2014-08-27 01:02:02Z kib
*/
#defineFREEBSD32_SYS_syscall 0
@@ -97,7 +97,7 @@
/* 88 is obsolete osethostname */
#defineFREEBSD32_SYS_getdtablesize 89
#defineFREEBSD32_SYS_dup2 90
-#defineFREEBSD32_SYS_fcntl 92
+#defineFREEBSD32_SYS_freebsd32_fcntl 92
#defineFREEBSD32_SYS_freebsd32_select 93
#defineFREEBSD32_SYS_fsync 95
#defineFREEBSD32_SYS_setpriority 96
Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c
==
--- head/sys/compat/freebsd32/freebsd32_syscalls.c Wed Aug 27 01:02:02
2014(r270691)
+++ head/sys/compat/freebsd32/freebsd32_syscalls.c Wed Aug 27 01:02:19
2014(r270692)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 263318
2014-03-18 21:32:03Z attilio
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 270691
2014-08-27 01:02:02Z kib
*/
const char *freebsd32_syscallnames[] = {
@@ -102,7 +102,7 @@ const char *freebsd32_syscallnames[] = {
"getdtablesize",/* 89 = getdtablesize */
"dup2", /* 90 = dup2 */
"#91", /* 91 = getdopt */
- "fcntl",/* 92 = fcntl */
+ "freebsd32_fcntl", /* 92 = freebs
svn commit: r270690 - stable/9/release
Author: gjb
Date: Wed Aug 27 00:57:45 2014
New Revision: 270690
URL: http://svnweb.freebsd.org/changeset/base/270690
Log:
MFC r270455, r270457:
r270455:
Set OSREL and UNAME_r in release/release.sh when building
ports to prevent ports build failures from killing the
release build.
r270457:
Wrap a long line.
Sponsored by: The FreeBSD Foundation
Modified:
stable/9/release/release.sh
Directory Properties:
stable/9/release/ (props changed)
Modified: stable/9/release/release.sh
==
--- stable/9/release/release.sh Wed Aug 27 00:53:56 2014(r270689)
+++ stable/9/release/release.sh Wed Aug 27 00:57:45 2014(r270690)
@@ -253,11 +253,16 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then
## Trick the ports 'run-autotools-fixup' target to do the right thing.
_OSVERSION=$(sysctl -n kern.osreldate)
+ REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
+ BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+ UNAME_r=${REVISION}-${BRANCH}
if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then
PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
- PBUILD_FLAGS="${PBUILD_FLAGS}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
- ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean
distclean
+ ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
+ install clean distclean
fi
fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270689 - head/sys/amd64/vmm
Author: grehan
Date: Wed Aug 27 00:53:56 2014
New Revision: 270689
URL: http://svnweb.freebsd.org/changeset/base/270689
Log:
Implement the 0x2B SUB instruction, and the OR variant of 0x81.
Found with local APIC accesses from bitrig/amd64 bsd.rd, 07/15-snap.
Reviewed by: neel
MFC after:3 days
Modified:
head/sys/amd64/vmm/vmm_instruction_emul.c
Modified: head/sys/amd64/vmm/vmm_instruction_emul.c
==
--- head/sys/amd64/vmm/vmm_instruction_emul.c Wed Aug 27 00:50:51 2014
(r270688)
+++ head/sys/amd64/vmm/vmm_instruction_emul.c Wed Aug 27 00:53:56 2014
(r270689)
@@ -65,6 +65,7 @@ enum {
VIE_OP_TYPE_MOVZX,
VIE_OP_TYPE_AND,
VIE_OP_TYPE_OR,
+ VIE_OP_TYPE_SUB,
VIE_OP_TYPE_TWO_BYTE,
VIE_OP_TYPE_PUSH,
VIE_OP_TYPE_CMP,
@@ -97,6 +98,10 @@ static const struct vie_op one_byte_opco
.op_byte = 0x0F,
.op_type = VIE_OP_TYPE_TWO_BYTE
},
+ [0x2B] = {
+ .op_byte = 0x2B,
+ .op_type = VIE_OP_TYPE_SUB,
+ },
[0x3B] = {
.op_byte = 0x3B,
.op_type = VIE_OP_TYPE_CMP,
@@ -597,18 +602,16 @@ emulate_and(void *vm, int vcpuid, uint64
break;
case 0x81:
/*
-* AND mem (ModRM:r/m) with immediate and store the
+* AND/OR mem (ModRM:r/m) with immediate and store the
* result in mem.
*
-* 81 /4and r/m16, imm16
-* 81 /4and r/m32, imm32
-* REX.W + 81 /4and r/m64, imm32 sign-extended to 64
+* AND: i = 4
+* OR: i = 1
+* 81 /iop r/m16, imm16
+* 81 /iop r/m32, imm32
+* REX.W + 81 /iop r/m64, imm32 sign-extended to 64
*
-* Currently, only the AND operation of the 0x81 opcode
-* is implemented (ModRM:reg = b100).
*/
- if ((vie->reg & 7) != 4)
- break;
/* get the first operand */
error = memread(vm, vcpuid, gpa, &val1, size, arg);
@@ -616,11 +619,26 @@ emulate_and(void *vm, int vcpuid, uint64
break;
/*
-* perform the operation with the pre-fetched immediate
-* operand and write the result
-*/
-val1 &= vie->immediate;
-error = memwrite(vm, vcpuid, gpa, val1, size, arg);
+ * perform the operation with the pre-fetched immediate
+ * operand and write the result
+ */
+ switch (vie->reg & 7) {
+ case 0x4:
+ /* modrm:reg == b100, AND */
+ val1 &= vie->immediate;
+ break;
+ case 0x1:
+ /* modrm:reg == b001, OR */
+ val1 |= vie->immediate;
+ break;
+ default:
+ error = EINVAL;
+ break;
+ }
+ if (error)
+ break;
+
+ error = memwrite(vm, vcpuid, gpa, val1, size, arg);
break;
default:
break;
@@ -723,6 +741,62 @@ emulate_cmp(void *vm, int vcpuid, uint64
}
static int
+emulate_sub(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
+ mem_region_read_t memread, mem_region_write_t memwrite, void *arg)
+{
+ int error, size;
+ uint64_t nval, rflags, rflags2, val1, val2;
+ enum vm_reg_name reg;
+
+ size = vie->opsize;
+ error = EINVAL;
+
+ switch (vie->op.op_byte) {
+ case 0x2B:
+ /*
+* SUB r/m from r and store the result in r
+*
+* 2B/rSUB r16, r/m16
+* 2B/rSUB r32, r/m32
+* REX.W + 2B/rSUB r64, r/m64
+*/
+
+ /* get the first operand */
+ reg = gpr_map[vie->reg];
+ error = vie_read_register(vm, vcpuid, reg, &val1);
+ if (error)
+ break;
+
+ /* get the second operand */
+ error = memread(vm, vcpuid, gpa, &val2, size, arg);
+ if (error)
+ break;
+
+ /* perform the operation and write the result */
+ nval = val1 - val2;
+ error = vie_update_register(vm, vcpuid, reg, nval, size);
+ break;
+ default:
+ break;
+ }
+
+ if (!error) {
+ rflags2 = getcc(size, val1, val2);
+ error = vie_read_register(vm, vcpuid, VM
svn commit: r270688 - in stable/10/release: . arm
Author: gjb
Date: Wed Aug 27 00:50:51 2014
New Revision: 270688
URL: http://svnweb.freebsd.org/changeset/base/270688
Log:
MFC r270417, r270418, r270455, r270457:
r270417:
Fix arm build breakage when building stable/10 on
head/.
r270418:
Also export UNAME_r to fix arm builds.
r270455:
Set OSREL and UNAME_r in release/release.sh when building
ports to prevent ports build failures from killing the
release build.
r270457:
Wrap a long line.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/arm/release.sh
stable/10/release/release.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/arm/release.sh
==
--- stable/10/release/arm/release.shWed Aug 27 00:48:09 2014
(r270687)
+++ stable/10/release/arm/release.shWed Aug 27 00:50:51 2014
(r270688)
@@ -92,6 +92,14 @@ install_uboot() {
}
main() {
+ # Fix broken ports that use kern.osreldate.
+ OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
+ export OSVERSION
+ REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
+ BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+ UNAME_r=${REVISION}-${BRANCH}
+ export UNAME_r
+
# Build the 'xdev' target for crochet.
eval chroot ${CHROOTDIR} make -C /usr/src \
${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
Modified: stable/10/release/release.sh
==
--- stable/10/release/release.shWed Aug 27 00:48:09 2014
(r270687)
+++ stable/10/release/release.shWed Aug 27 00:50:51 2014
(r270688)
@@ -253,11 +253,16 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then
## Trick the ports 'run-autotools-fixup' target to do the right thing.
_OSVERSION=$(sysctl -n kern.osreldate)
+ REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
+ BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+ UNAME_r=${REVISION}-${BRANCH}
if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then
PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
- PBUILD_FLAGS="${PBUILD_FLAGS}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
- ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean
distclean
+ ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
+ install clean distclean
fi
fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270687 - head/libexec/rtld-elf
Author: kib
Date: Wed Aug 27 00:48:09 2014
New Revision: 270687
URL: http://svnweb.freebsd.org/changeset/base/270687
Log:
Remove stray newline.
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==
--- head/libexec/rtld-elf/rtld.cWed Aug 27 00:07:33 2014
(r270686)
+++ head/libexec/rtld-elf/rtld.cWed Aug 27 00:48:09 2014
(r270687)
@@ -2784,7 +2784,7 @@ search_library_pathfds(const char *name,
size_t len;
int dirfd, fd;
- dbg("%s('%s', '%s', fdp)\n", __func__, name, path);
+ dbg("%s('%s', '%s', fdp)", __func__, name, path);
/* Don't load from user-specified libdirs into setuid binaries. */
if (!trust)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270686 - stable/10/release/doc/en_US.ISO8859-1/errata
Author: gjb Date: Wed Aug 27 00:07:33 2014 New Revision: 270686 URL: http://svnweb.freebsd.org/changeset/base/270686 Log: Fix the stable/10 errata/article.xml to conform to FDP style conventions (as best as possible). Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/errata/article.xmlTue Aug 26 23:58:54 2014(r270685) +++ stable/10/release/doc/en_US.ISO8859-1/errata/article.xmlWed Aug 27 00:07:33 2014(r270686) @@ -1,14 +1,14 @@ http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd"; [ + "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd"; [ http://www.FreeBSD.org/release/XML/release.ent";> + "http://www.FreeBSD.org/release/XML/release.ent";> %release; ]> http://docbook.org/ns/docbook"; -xmlns:xlink="http://www.w3.org/1999/xlink"; -version="5.0"> + xmlns:xlink="http://www.w3.org/1999/xlink"; version="5.0"> + &os; &release.prev; Errata @@ -19,7 +19,8 @@ 2014 - mailto:d...@freebsd.org";>The &os; Documentation Project + mailto:d...@freebsd.org";>The &os; Documentation + Project @@ -31,46 +32,45 @@ This document lists errata items for &os; &release.prev;, - containing significant information discovered after the release - or too late in the release cycle to be otherwise included in the - release documentation. - This information includes security advisories, as well as news - relating to the software or documentation that could affect its - operation or usability. An up-to-date version of this document - should always be consulted before installing this version of + containing significant information discovered after the + release or too late in the release cycle to be otherwise + included in the release documentation. This information + includes security advisories, as well as news relating to the + software or documentation that could affect its operation or + usability. An up-to-date version of this document should + always be consulted before installing this version of &os;. - This errata document for &os; &release.prev; - will be maintained until the release of &os; &release.next;. + This errata document for &os; &release.prev; will be + maintained until the release of &os; &release.next;. Introduction -This errata document contains late-breaking news - about &os; &release.prev; - Before installing this version, it is important to consult this - document to learn about any post-release discoveries or problems - that may already have been found and fixed. +This errata document contains late-breaking + news about &os; &release.prev; Before installing this + version, it is important to consult this document to learn about + any post-release discoveries or problems that may already have + been found and fixed. Any version of this errata document actually distributed with the release (for example, on a CDROM distribution) will be out of date by definition, but other copies are kept updated on the Internet and should be consulted as the current - errata for this release. These other copies of the - errata are located at - http://www.FreeBSD.org/releases/"; />, - plus any sites - which keep up-to-date mirrors of this location. + errata for this release. These other copies of the + errata are located at http://www.FreeBSD.org/releases/"; />, plus any + sites which keep up-to-date mirrors of this location. Source and binary snapshots of &os; &release.branch; also contain up-to-date copies of this document (as of the time of the snapshot). -For a list of all &os; CERT security advisories, see - http://www.FreeBSD.org/security/"; /> - or ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"; />. +For a list of all &os; CERT security advisories, see http://www.FreeBSD.org/security/"/> or ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"/>. @@ -240,17 +240,17 @@ It causes various errors and makes &os; quite unstable. Although the cause is still unclear, disabling unmapped I/O - works as a workaround. To disable it, choose Escape to - loader prompt in the boot menu and enter the following - lines from &man.loader.8; prompt, after - an OK: + works as a workaround. To disable it, choose + Escape to loader prompt in the boot menu + and enter the following lines from &man.loader.8; prompt, + after an OK: set vfs.unmapped_buf_allowed=0 boot Note that the foll
svn commit: r270685 - stable/10/release/doc/en_US.ISO8859-1/readme
Author: gjb Date: Tue Aug 26 23:58:54 2014 New Revision: 270685 URL: http://svnweb.freebsd.org/changeset/base/270685 Log: Fix the stable/10 hardware/article.xml to conform to FDP style conventions. Fix a few rendering issues, while here. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/readme/article.xmlTue Aug 26 23:51:01 2014(r270684) +++ stable/10/release/doc/en_US.ISO8859-1/readme/article.xmlTue Aug 26 23:58:54 2014(r270685) @@ -1,10 +1,10 @@ %release; ]> - -http://docbook.org/ns/docbook"; xmlns:xlink="http://www.w3.org/1999/xlink"; version="5.0"> - &os; &release.current; README - +http://docbook.org/ns/docbook"; + xmlns:xlink="http://www.w3.org/1999/xlink"; version="5.0"> + +&os; &release.current; README The &os; Project @@ -36,7 +37,8 @@ 2012 2013 2014 - mailto:d...@freebsd.org";>The &os; Documentation Project + mailto:d...@freebsd.org";>The &os; Documentation + Project @@ -47,31 +49,32 @@ &tm-attrib.general; - -This document gives a brief introduction to &os; - &release.current;. It includes some information on how to - obtain &os;, a listing of various ways to contact the &os; - Project, and pointers to some other sources of - information. - + + This document gives a brief introduction to &os; + &release.current;. It includes some information on how to + obtain &os;, a listing of various ways to contact the &os; + Project, and pointers to some other sources of + information. + Introduction -This distribution is a &release.type; of &os; &release.current;, the - latest point along the &release.branch; branch. +This distribution is a &release.type; of &os; + &release.current;, the latest point along the &release.branch; + branch. About &os; &os; is an operating system based on 4.4 BSD Lite for - AMD64 and Intel EM64T based PC hardware (&arch.amd64;), - Intel, AMD, Cyrix or NexGen x86 based PC hardware (&arch.i386;), - Intel Itanium Processor based computers (&arch.ia64;), - NEC PC-9801/9821 series PCs and compatibles (&arch.pc98;), - and &ultrasparc; machines (&arch.sparc64;). Versions - for the &arm; (&arch.arm;), &mips; (&arch.mips;), and + AMD64 and Intel EM64T based PC hardware (&arch.amd64;), Intel, + AMD, Cyrix or NexGen x86 based PC hardware + (&arch.i386;), Intel Itanium Processor based computers + (&arch.ia64;), NEC PC-9801/9821 series PCs and compatibles + (&arch.pc98;), and &ultrasparc; machines (&arch.sparc64;). + Versions for the &arm; (&arch.arm;), &mips; (&arch.mips;), and &powerpc; (&arch.powerpc;) architectures are currently under development as well. &os; works with a wide variety of peripherals and configurations and can be used for everything @@ -88,61 +91,63 @@ A large collection of third-party ported software (the Ports Collection) is also provided to make it - easy to obtain and install all your favorite traditional &unix; - utilities for &os;. Each port consists of a - set of scripts to retrieve, configure, build, and install a - piece of software, with a single command. Over &os.numports; - ports, from editors to programming languages to graphical - applications, make &os; a powerful and comprehensive operating - environment that extends far beyond what's provided by many - commercial versions of &unix;. Most ports are also available as - pre-compiled packages, which can be quickly - installed from the installation program. + easy to obtain and install all your favorite traditional + &unix; utilities for &os;. Each port consists + of a set of scripts to retrieve, configure, build, and install + a piece of software, with a single command. Over + &os.numports; ports, from editors to programming languages to + graphical applications, make &os; a powerful and comprehensive + operating environment that extends far beyond what's provided + by many commercial versions of &unix;. Most ports are also + available as pre-compiled packages, which can + be quickly installed from the installation program. Target Audience - This &release.type; is aimed primarily at early adopters - and various other users who want to get involved with the - ongoing development of &os;. While the &os; development team - tries its best to ensure that each &release.type; works as - advertised, &release.branch; is very
svn commit: r270684 - stable/10/release/doc/en_US.ISO8859-1/readme
Author: gjb Date: Tue Aug 26 23:51:01 2014 New Revision: 270684 URL: http://svnweb.freebsd.org/changeset/base/270684 Log: Bump copyright year. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/readme/article.xmlTue Aug 26 23:50:21 2014(r270683) +++ stable/10/release/doc/en_US.ISO8859-1/readme/article.xmlTue Aug 26 23:51:01 2014(r270684) @@ -35,6 +35,7 @@ 2011 2012 2013 + 2014 mailto:d...@freebsd.org";>The &os; Documentation Project ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270683 - stable/10/release/doc/en_US.ISO8859-1/readme
Author: gjb Date: Tue Aug 26 23:50:21 2014 New Revision: 270683 URL: http://svnweb.freebsd.org/changeset/base/270683 Log: Update the readme/article.xml to reflect send-pr(1) is deprecated, and direct to Bugzilla. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/readme/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/readme/article.xmlTue Aug 26 23:45:26 2014(r270682) +++ stable/10/release/doc/en_US.ISO8859-1/readme/article.xmlTue Aug 26 23:50:21 2014(r270683) @@ -249,21 +249,17 @@ course even more welcome. The preferred method to submit bug reports from a machine - with Internet mail connectivity is to use the &man.send-pr.1; - command. + with Internet connectivity is to use the Bugzilla + bug tracker. Problem Reports (PRs) submitted in this way will be filed and their progress tracked; the &os; developers will do their best to respond to all reported bugs as soon as - possible. http://www.FreeBSD.org/cgi/query-pr-summary.cgi";>A list + possible. https://bugs.FreeBSD.org/search/";>A list of all active PRs is available on the &os; Web site; this list is useful to see what potential problems other users have encountered. - Note that &man.send-pr.1; itself is a shell script that - should be easy to move even onto a non-&os; system. Using - this interface is highly preferred. If, for some reason, you - are unable to use &man.send-pr.1; to submit a bug report, you - can try to send it to the &a.bugs;. + Note that &man.send-pr.1; is deprecated. For more information, Writing &os; Problem Reports, available on the &os; Web ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270682 - stable/10/release/doc/en_US.ISO8859-1/hardware
Author: gjb Date: Tue Aug 26 23:45:26 2014 New Revision: 270682 URL: http://svnweb.freebsd.org/changeset/base/270682 Log: Fix the stable/10 hardware/article.xml to conform to FDP style conventions. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 23:31:22 2014(r270681) +++ stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 23:45:26 2014(r270682) @@ -1,14 +1,15 @@ %release; %devauto; ]> -http://docbook.org/ns/docbook"; xmlns:xlink="http://www.w3.org/1999/xlink"; version="5.0"> - &os; &release.current; Hardware Notes - +http://docbook.org/ns/docbook"; + xmlns:xlink="http://www.w3.org/1999/xlink"; version="5.0"> + +&os; &release.current; Hardware Notes The &os; Documentation Project @@ -30,7 +31,8 @@ 2012 2013 2014 - mailto:d...@freebsd.org";>The &os; Documentation Project + mailto:d...@freebsd.org";>The &os; Documentation + Project @@ -43,7 +45,6 @@ &tm-attrib.sun; &tm-attrib.general; - @@ -97,8 +98,8 @@ - The single-core &intel; &xeon; -processors Nocona, Irwindale, + The single-core &intel; &xeon; processors + Nocona, Irwindale, Potomac, and Cranford have EM64T support. @@ -121,9 +122,10 @@ Some &intel; &pentium; 4s and Celeron Ds using the Prescott core have EM64T support. See - the http://processorfinder.intel.com";>Intel - Processor Spec Finder for the definitive answer about - EM64T support in Intel processors. + the http://processorfinder.intel.com";>Intel + Processor Spec Finder for the definitive answer + about EM64T support in Intel processors. @@ -148,14 +150,14 @@ i386 &os;/&arch.i386; runs on a wide variety of IBM PC - compatible machines. Due to the wide range of + compatible machines. Due to the wide range of hardware available for this architecture, it is impossible to exhaustively list all combinations of equipment supported by &os;. Nevertheless, some general guidelines are presented here. Almost all &i386;-compatible processors with a floating - point unit are supported. All &intel; processors beginning + point unit are supported. All &intel; processors beginning with the 80486 are supported, including the 80486, &pentium;, &pentium; Pro, &pentium; II, &pentium; III, &pentium; 4, and variants thereof, such as the &xeon; and &celeron; processors. @@ -225,19 +227,22 @@ (DSDT) provided by each machine's BIOS. Some machines have bad or incomplete DSDTs, which prevents ACPI from functioning correctly. Replacement DSDTs for some machines can be found - at the http://acpi.sourceforge.net/dsdt/index.php";>DSDT - section of the http://acpi.sourceforge.net/";>ACPI4Linux project - Web site. &os; can use these DSDTs to override the DSDT - provided by the BIOS; see the &man.acpi.4; manual page for - more information. + at the http://acpi.sourceforge.net/dsdt/index.php";>DSDT + section of the http://acpi.sourceforge.net/";>ACPI4Linux + project Web site. &os; can use these DSDTs to override the + DSDT provided by the BIOS; see the &man.acpi.4; manual page + for more information. ia64 - Currently supported processors are the http://people.freebsd.org/~marcel/refs/ia64/itanium/24532003.pdf";>&itanium; - and the http://people.freebsd.org/~marcel/refs/ia64/itanium2/25111003.pdf";>&itanium; - 2. + Currently supported processors are the http://people.freebsd.org/~marcel/refs/ia64/itanium/24532003.pdf";>&itanium; + and the http://people.freebsd.org/~marcel/refs/ia64/itanium2/25111003.pdf";>&itanium; 2. Supported chipsets include: @@ -260,10 +265,10 @@ Most devices that can be found in or are compatible with &arch.ia64; machines are fully supported. The notable - exception is the VGA console. The &os; support for VGA + exception is the VGA console. The &os; support for VGA consoles is at this time too much based on PC hardware and not all &arch.ia64; machines have chipsets that provide sufficient - PC legacy support. As such &man.syscons.4; can not be enabled + PC legacy support. As such &man.syscons.4; cannot be enabled and the use of a serial console is required. @@ -299,8 +304,8 @@ powerpc - All Apple PowerPC machines
svn commit: r270681 - stable/10/release/doc/en_US.ISO8859-1/errata
Author: gjb Date: Tue Aug 26 23:31:22 2014 New Revision: 270681 URL: http://svnweb.freebsd.org/changeset/base/270681 Log: Fix a typo: s/sytem/system/ Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/errata/article.xmlTue Aug 26 23:19:09 2014(r270680) +++ stable/10/release/doc/en_US.ISO8859-1/errata/article.xmlTue Aug 26 23:31:22 2014(r270681) @@ -333,7 +333,7 @@ boot Updating LSI firmware on &man.mps.4; controllers with the sas2flash utility may cause - the system to hang, or may cause the sytem to panic. This + the system to hang, or may cause the system to panic. This is fixed in the stable/10 branch with revisions r262553 and r262575, and will be included in ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270680 - stable/10/release/doc/en_US.ISO8859-1/hardware
Author: gjb Date: Tue Aug 26 23:19:09 2014 New Revision: 270680 URL: http://svnweb.freebsd.org/changeset/base/270680 Log: Fix alphabetical sorting with alc(4) addition. Move atp(4) driver under 'Pointing Devices', added to 'Keyboards' by mistake. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 22:54:54 2014(r270679) +++ stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 23:19:09 2014(r270680) @@ -821,10 +821,10 @@ &hwlist.age; - &hwlist.ale; - &hwlist.alc; + &hwlist.ale; + &hwlist.aue; &hwlist.axe; @@ -1591,10 +1591,6 @@ - &hwlist.atp; - - - [&arch.amd64;, &arch.i386;] PS/2 keyboards (&man.atkbd.4; driver) @@ -1614,6 +1610,10 @@ + &hwlist.atp; + + + [&arch.amd64;, &arch.i386;, &arch.pc98;] Bus mice and compatible devices (&man.mse.4; driver) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270679 - head/share/man/man5
Author: bapt
Date: Tue Aug 26 22:54:54 2014
New Revision: 270679
URL: http://svnweb.freebsd.org/changeset/base/270679
Log:
Document the new ${LOCALBASE}/etc/rc.conf.d in rc.conf(5)
MFC after:1 week
Modified:
head/share/man/man5/rc.conf.5
Modified: head/share/man/man5/rc.conf.5
==
--- head/share/man/man5/rc.conf.5 Tue Aug 26 22:47:40 2014
(r270678)
+++ head/share/man/man5/rc.conf.5 Tue Aug 26 22:54:54 2014
(r270679)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 15, 2014
+.Dd August 27, 2014
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -69,6 +69,8 @@ you can also place smaller configuration
.Xr rc 8
script in the
.Pa /etc/rc.conf.d
+directory or in the
+.Pa ${LOCALBASE}/etc/rc.conf.d
directory, which will be included by the
.Va load_rc_config
function.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270678 - stable/10/release/doc/en_US.ISO8859-1/hardware
Author: gjb Date: Tue Aug 26 22:47:40 2014 New Revision: 270678 URL: http://svnweb.freebsd.org/changeset/base/270678 Log: Add the following to the hardware notes: - aacraid(4) - alc(4) - ath_hal(4) - atp(4) - cxgbe(4) - hptnr(4) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 22:39:24 2014(r270677) +++ stable/10/release/doc/en_US.ISO8859-1/hardware/article.xml Tue Aug 26 22:47:40 2014(r270678) @@ -665,6 +665,8 @@ &hwlist.aac; + &hwlist.aacraid; + &hwlist.adv; &hwlist.adw; @@ -709,6 +711,8 @@ &hwlist.hptmv; + &hwlist.hptnr; + &hwlist.hptrr; &hwlist.ida; @@ -819,6 +823,8 @@ &hwlist.ale; + &hwlist.alc; + &hwlist.aue; &hwlist.axe; @@ -846,6 +852,8 @@ &hwlist.cxgb; + &hwlist.cxgbe; + &hwlist.dc; &hwlist.de; @@ -998,6 +1006,8 @@ &hwlist.ath; + &hwlist.ath.hal; + &hwlist.bwi; &hwlist.bwn; @@ -1581,6 +1591,10 @@ + &hwlist.atp; + + + [&arch.amd64;, &arch.i386;] PS/2 keyboards (&man.atkbd.4; driver) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270677 - head/etc/pam.d
Author: gavin Date: Tue Aug 26 22:39:24 2014 New Revision: 270677 URL: http://svnweb.freebsd.org/changeset/base/270677 Log: Fix xref, pam(8) -> pam(3) PR: 193045 Submitted by: rsimmons0 gmail com MFC after:3 days Modified: head/etc/pam.d/README Modified: head/etc/pam.d/README == --- head/etc/pam.d/README Tue Aug 26 22:33:34 2014(r270676) +++ head/etc/pam.d/README Tue Aug 26 22:39:24 2014(r270677) @@ -8,7 +8,7 @@ particular service, the /etc/pam.d/other file does not exist, /etc/pam.conf is searched for entries matching the specified service or, failing that, the "other" service. -See the pam(8) manual page for an explanation of the workings of the +See the pam(3) manual page for an explanation of the workings of the PAM library and descriptions of the various files and modules. Below is a summary of the format for the pam.conf and /etc/pam.d/* files. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270676 - head/etc
Author: bapt
Date: Tue Aug 26 22:33:34 2014
New Revision: 270676
URL: http://svnweb.freebsd.org/changeset/base/270676
Log:
Allow to configure services from ${LOCALBASE}/etc/rc.conf.d
Reviewed by: bdrewery
MFC after:1 week
Relnotes: yes
Modified:
head/etc/rc.subr
Modified: head/etc/rc.subr
==
--- head/etc/rc.subrTue Aug 26 22:20:02 2014(r270675)
+++ head/etc/rc.subrTue Aug 26 22:33:34 2014(r270676)
@@ -1301,6 +1301,10 @@ load_rc_config()
fi
done
fi
+ if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then
+ debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}"
+ . ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name"
+ fi
# Set defaults if defined.
for _var in $rcvar; do
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r265792 - head/sys/kern
On Tue, Aug 26, 2014 at 03:05:41PM -0700, Adrian Chadd wrote: > This to me reads like "we need to fix pmc's locking so it's not so > terrible on multi-multi-core-machines." :) I am may be wrong, but I don't see in pmc interrupt path. May be this is need fix too? > On 26 August 2014 11:54, Slawa Olhovchenkov wrote: > > On Tue, May 20, 2014 at 09:04:25AM -0700, Adrian Chadd wrote: > > > >> On 20 May 2014 08:41, Slawa Olhovchenkov wrote: > >> > >> >> (But if you try it on 10.0 and it changes things, by all means let me > >> >> know.) > >> > > >> > I am try on 10.0, but not sure about significant improvement (may be > >> > 10%). > >> > > >> > For current CPU (E5-2650 v2 @ 2.60GHz) hwpmc don't working (1. after > >> > collect some data `pmcstat -R sample.out -G out.txt` don't decode any; > >> > 2. kldunload hwpmc do kernel crash) and I can't collect detailed > >> > profile information. > >> > >> Yup. I'm starting to get really ticked off at how pmc logging on > >> multi-core devices just "stops" after a while. I'll talk with other > >> pmc people and see if we can figure out what the heck is going on. :( > > > > Now I can test you work on CPU w/ working pmc. > > Current traffic 16.8 Gbit/s. > > CPU: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz (2000.04-MHz K8-class CPU) > > > > last pid: 22677; load averages: 9.12, 9.07, 8.90 > >up 0+04:06:06 > > 22:52:57 > > 47 processes: 3 running, 44 sleeping > > CPU 0: 11.8% user, 0.0% nice, 43.1% system, 1.6% interrupt, 43.5% idle > > CPU 1: 11.4% user, 0.0% nice, 51.8% system, 0.0% interrupt, 36.9% idle > > CPU 2: 10.6% user, 0.0% nice, 46.3% system, 0.8% interrupt, 42.4% idle > > CPU 3: 11.8% user, 0.0% nice, 45.1% system, 0.4% interrupt, 42.7% idle > > CPU 4: 13.7% user, 0.0% nice, 43.1% system, 0.0% interrupt, 43.1% idle > > CPU 5: 14.5% user, 0.0% nice, 45.9% system, 0.4% interrupt, 39.2% idle > > CPU 6: 0.0% user, 0.0% nice, 5.5% system, 68.6% interrupt, 25.9% idle > > CPU 7: 0.0% user, 0.0% nice, 4.3% system, 70.2% interrupt, 25.5% idle > > CPU 8: 0.0% user, 0.0% nice, 2.7% system, 69.4% interrupt, 27.8% idle > > CPU 9: 0.0% user, 0.0% nice, 4.7% system, 67.1% interrupt, 28.2% idle > > CPU 10: 0.0% user, 0.0% nice, 3.1% system, 76.9% interrupt, 20.0% idle > > CPU 11: 0.0% user, 0.0% nice, 5.1% system, 58.8% interrupt, 36.1% idle > > Mem: 322M Active, 15G Inact, 96G Wired, 956K Cache, 13G Free > > ARC: 90G Total, 84G MFU, 5690M MRU, 45M Anon, 394M Header, 98M Other > > Swap: > > > > > > > > @ CPU_CLK_UNHALTED_CORE [241440 samples] > > > > 10.59% [25561]_mtx_lock_spin_cookie @ /boot/kernel/kernel > > 94.25% [24092] pmclog_reserve @ /boot/kernel/hwpmc.ko > > 100.0% [24092] pmclog_process_callchain > >100.0% [24092] pmc_process_samples > > 100.0% [24092]pmc_hook_handler > > 100.0% [24092] hardclock_cnt @ /boot/kernel/kernel > > 100.0% [24092] handleevents > >99.62% [24001] timercb > > 100.0% [24001]lapic_handle_timer > >00.38% [91] cpu_activeclock > > 100.0% [91] cpu_idle > > 100.0% [91]sched_idletd > > 100.0% [91] fork_exit > > 03.04% [777] callout_lock > > 91.63% [712]callout_reset_sbt_on > >98.60% [702] tcp_timer_activate > > 94.87% [666] tcp_do_segment > > 100.0% [666] tcp_input > > 100.0% [666]ip_input > >100.0% [666] netisr_dispatch_src > > 100.0% [666] ether_demux > > 100.0% [666] ether_nh_input > > 100.0% [666]netisr_dispatch_src > >98.05% [653] ixgbe_rxeof @ > > /boot/kernel/if_ixgbe.ko > > 87.44% [571] ixgbe_msix_que > > 100.0% [571] intr_event_execute_handlers @ > > /boot/kernel/kernel > > 100.0% [571]ithread_loop > >100.0% [571] fork_exit > > 12.56% [82] ixgbe_handle_que @ > > /boot/kernel/if_ixgbe.ko > > 100.0% [82]taskqueue_run_locked @ > > /boot/kernel/kernel > > 100.0% [82] taskqueue_thread_loop > >100.0% [82] fork_exit > >01.95% [13] tcp_lro_flush > > 92.31% [12] ixgbe_rxeof @ > > /boot/kernel/if_ixgbe.ko > > 100.0% [12]ixgbe_msix_que > > 100.0% [12] intr_event_execute_handlers > > @ /boot/kernel/kernel > >100.0% [12] ithread_loop > > 07.69% [1]t
svn commit: r270675 - head/usr.sbin/mailwrapper
Author: bapt
Date: Tue Aug 26 22:20:02 2014
New Revision: 270675
URL: http://svnweb.freebsd.org/changeset/base/270675
Log:
Allow mailwrapper to use mailer.conf from localbase (respecting LOCALBASE env
var if set)
Phabric: https://reviews.freebsd.org/D412
Reviewed by: bdrewery
MFC after:2 weeks
Relnotes: yes
Modified:
head/usr.sbin/mailwrapper/mailwrapper.8
head/usr.sbin/mailwrapper/mailwrapper.c
Modified: head/usr.sbin/mailwrapper/mailwrapper.8
==
--- head/usr.sbin/mailwrapper/mailwrapper.8 Tue Aug 26 21:21:57 2014
(r270674)
+++ head/usr.sbin/mailwrapper/mailwrapper.8 Tue Aug 26 22:20:02 2014
(r270675)
@@ -31,7 +31,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd August 7, 2006
+.Dd August 27, 2014
.Dt MAILWRAPPER 8
.Os
.Sh NAME
@@ -109,6 +109,8 @@ utility is designed to replace
and to invoke an appropriate MTA instead of
.Xr sendmail 8
based on configuration information placed in
+.Pa ${LOCALBASE}/etc/mail/mailer.conf
+falling back on
.Pa /etc/mail/mailer.conf .
This permits the administrator to configure which MTA is to be invoked on
the system at run time.
@@ -126,6 +128,8 @@ should be turned off in
Configuration for
.Nm
is kept in
+.Pa ${LOCALBASE}/etc/mail/mailer.conf
+or
.Pa /etc/mail/mailer.conf .
.Pa /usr/sbin/sendmail
is typically set up as a symbolic link to
Modified: head/usr.sbin/mailwrapper/mailwrapper.c
==
--- head/usr.sbin/mailwrapper/mailwrapper.c Tue Aug 26 21:21:57 2014
(r270674)
+++ head/usr.sbin/mailwrapper/mailwrapper.c Tue Aug 26 22:20:02 2014
(r270675)
@@ -35,6 +35,8 @@
#include
__FBSDID("$FreeBSD$");
+#include
+
#include
#include
#include
@@ -87,6 +89,8 @@ main(int argc, char *argv[], char *envp[
FILE *config;
char *line, *cp, *from, *to, *ap;
const char *progname;
+ char localmailerconf[MAXPATHLEN];
+ const char *mailerconf;
size_t len, lineno = 0;
int i;
struct arglist al;
@@ -98,11 +102,18 @@ main(int argc, char *argv[], char *envp[
initarg(&al);
addarg(&al, argv[0]);
- if ((config = fopen(_PATH_MAILERCONF, "r")) == NULL) {
+ snprintf(localmailerconf, MAXPATHLEN, "%s/etc/mail/mailer.conf",
+ getenv("LOCALBASE") ? getenv("LOCALBASE") : "/usr/local");
+
+ mailerconf = localmailerconf;
+ if ((config = fopen(localmailerconf, "r")) == NULL)
+ mailerconf = _PATH_MAILERCONF;
+
+ if (config == NULL && ((config = fopen(mailerconf, "r")) == NULL)) {
addarg(&al, NULL);
openlog(getprogname(), LOG_PID, LOG_MAIL);
syslog(LOG_INFO, "cannot open %s, using %s as default MTA",
- _PATH_MAILERCONF, _PATH_DEFAULTMTA);
+ mailerconf, _PATH_DEFAULTMTA);
closelog();
execve(_PATH_DEFAULTMTA, al.argv, envp);
err(EX_OSERR, "cannot exec %s", _PATH_DEFAULTMTA);
@@ -112,7 +123,7 @@ main(int argc, char *argv[], char *envp[
for (;;) {
if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL) {
if (feof(config))
- errx(EX_CONFIG, "no mapping in %s",
_PATH_MAILERCONF);
+ errx(EX_CONFIG, "no mapping in %s", mailerconf);
err(EX_CONFIG, "cannot parse line %lu", (u_long)lineno);
}
@@ -157,6 +168,6 @@ main(int argc, char *argv[], char *envp[
/*NOTREACHED*/
parse_error:
errx(EX_CONFIG, "parse error in %s at line %lu",
- _PATH_MAILERCONF, (u_long)lineno);
+ mailerconf, (u_long)lineno);
/*NOTREACHED*/
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r265792 - head/sys/kern
This to me reads like "we need to fix pmc's locking so it's not so terrible on multi-multi-core-machines." :) -a On 26 August 2014 11:54, Slawa Olhovchenkov wrote: > On Tue, May 20, 2014 at 09:04:25AM -0700, Adrian Chadd wrote: > >> On 20 May 2014 08:41, Slawa Olhovchenkov wrote: >> >> >> (But if you try it on 10.0 and it changes things, by all means let me >> >> know.) >> > >> > I am try on 10.0, but not sure about significant improvement (may be >> > 10%). >> > >> > For current CPU (E5-2650 v2 @ 2.60GHz) hwpmc don't working (1. after >> > collect some data `pmcstat -R sample.out -G out.txt` don't decode any; >> > 2. kldunload hwpmc do kernel crash) and I can't collect detailed >> > profile information. >> >> Yup. I'm starting to get really ticked off at how pmc logging on >> multi-core devices just "stops" after a while. I'll talk with other >> pmc people and see if we can figure out what the heck is going on. :( > > Now I can test you work on CPU w/ working pmc. > Current traffic 16.8 Gbit/s. > CPU: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz (2000.04-MHz K8-class CPU) > > last pid: 22677; load averages: 9.12, 9.07, 8.90 > up 0+04:06:06 > 22:52:57 > 47 processes: 3 running, 44 sleeping > CPU 0: 11.8% user, 0.0% nice, 43.1% system, 1.6% interrupt, 43.5% idle > CPU 1: 11.4% user, 0.0% nice, 51.8% system, 0.0% interrupt, 36.9% idle > CPU 2: 10.6% user, 0.0% nice, 46.3% system, 0.8% interrupt, 42.4% idle > CPU 3: 11.8% user, 0.0% nice, 45.1% system, 0.4% interrupt, 42.7% idle > CPU 4: 13.7% user, 0.0% nice, 43.1% system, 0.0% interrupt, 43.1% idle > CPU 5: 14.5% user, 0.0% nice, 45.9% system, 0.4% interrupt, 39.2% idle > CPU 6: 0.0% user, 0.0% nice, 5.5% system, 68.6% interrupt, 25.9% idle > CPU 7: 0.0% user, 0.0% nice, 4.3% system, 70.2% interrupt, 25.5% idle > CPU 8: 0.0% user, 0.0% nice, 2.7% system, 69.4% interrupt, 27.8% idle > CPU 9: 0.0% user, 0.0% nice, 4.7% system, 67.1% interrupt, 28.2% idle > CPU 10: 0.0% user, 0.0% nice, 3.1% system, 76.9% interrupt, 20.0% idle > CPU 11: 0.0% user, 0.0% nice, 5.1% system, 58.8% interrupt, 36.1% idle > Mem: 322M Active, 15G Inact, 96G Wired, 956K Cache, 13G Free > ARC: 90G Total, 84G MFU, 5690M MRU, 45M Anon, 394M Header, 98M Other > Swap: > > > > @ CPU_CLK_UNHALTED_CORE [241440 samples] > > 10.59% [25561]_mtx_lock_spin_cookie @ /boot/kernel/kernel > 94.25% [24092] pmclog_reserve @ /boot/kernel/hwpmc.ko > 100.0% [24092] pmclog_process_callchain >100.0% [24092] pmc_process_samples > 100.0% [24092]pmc_hook_handler > 100.0% [24092] hardclock_cnt @ /boot/kernel/kernel > 100.0% [24092] handleevents >99.62% [24001] timercb > 100.0% [24001]lapic_handle_timer >00.38% [91] cpu_activeclock > 100.0% [91] cpu_idle > 100.0% [91]sched_idletd > 100.0% [91] fork_exit > 03.04% [777] callout_lock > 91.63% [712]callout_reset_sbt_on >98.60% [702] tcp_timer_activate > 94.87% [666] tcp_do_segment > 100.0% [666] tcp_input > 100.0% [666]ip_input >100.0% [666] netisr_dispatch_src > 100.0% [666] ether_demux > 100.0% [666] ether_nh_input > 100.0% [666]netisr_dispatch_src >98.05% [653] ixgbe_rxeof @ > /boot/kernel/if_ixgbe.ko > 87.44% [571] ixgbe_msix_que > 100.0% [571] intr_event_execute_handlers @ > /boot/kernel/kernel > 100.0% [571]ithread_loop >100.0% [571] fork_exit > 12.56% [82] ixgbe_handle_que @ > /boot/kernel/if_ixgbe.ko > 100.0% [82]taskqueue_run_locked @ > /boot/kernel/kernel > 100.0% [82] taskqueue_thread_loop >100.0% [82] fork_exit >01.95% [13] tcp_lro_flush > 92.31% [12] ixgbe_rxeof @ > /boot/kernel/if_ixgbe.ko > 100.0% [12]ixgbe_msix_que > 100.0% [12] intr_event_execute_handlers @ > /boot/kernel/kernel >100.0% [12] ithread_loop > 07.69% [1]tcp_lro_rx > 100.0% [1] ixgbe_rxeof @ > /boot/kernel/if_ixgbe.ko > 100.0% [1] ixgbe_msix_que >100.0% [1] intr_event_execute_handlers > @ /boot/kernel/kernel > 05.13% [36] tcp_output > 100.0% [36]
Re: svn commit: r270444 - in head/sys: kern sys
On Tue, Aug 26, 2014 at 05:23:10PM -0400, John Baldwin wrote:
> On Tuesday, August 26, 2014 3:32:10 pm John-Mark Gurney wrote:
> > John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400:
> > > On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote:
> > > > John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400:
> > > > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote:
> > > > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote:
> > > > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote:
> > > > > > > > Author: mjg
> > > > > > > > Date: Sun Aug 24 09:04:09 2014
> > > > > > > > New Revision: 270444
> > > > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444
> > > > > > > >
> > > > > > > > Log:
> > > > > > > > Fix getppid for traced processes.
> > > > > > > >
> > > > > > > > Traced processes always have the tracer set as the parent.
> > > > > > > > Utilize proc_realparent to obtain the right process when
> > > > > > > > needed.
> > > > > > >
> > > > > > > Are you sure this won't break things? I know of several
> > > > > > > applications that
> > > > > > > expect a debugger to be the parent when attached and change
> > > > > > > behavior as a
> > > > > > > result (e.g. inserting a breakpoint on an assertion failure
> > > > > > > rather than
> > > > > > > generating a core).
Shouldn't such applications use a breakpoint instruction like INT3
unconditionally then ? Detection of the attached debugger is inherently
racy, the debugger might have detached after the test. This, and the
fact that default action for the SIGTRAP is coredumping.
> > > > > >
> > > > > > Well, this is what linux and solaris do.
> > > > >
> > > > > Interesting.
> > > > >
> > > > > > I don't feel strongly about this change. If you really want I'm
> > > > > > happy to
> > > > > > revert.
> > > > >
> > > > > In general I'd like to someday have the debugger-debuggee
> > > > > relationship not
> > > > > override parent-child and this is a step in that direction. However,
> > > > > this
> > > > > will break existing applications, so this needs to be clearly
> > > > > documented in
> > > > > the release notes. In addition, we should probably advertise how a
> > > > > process
> > > > > can correctly determine if it is being run under a debugger (right
> > > > > now you can
> > > > > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so
> > > > > you can
> > > > > do different things for "gdb" vs "gcore", etc. so just checking
> > > > > P_TRACED from
> > > > > kinfo_proc wouldn't be equivalent in functionality)
> > > >
> > > > But what about when you attach gdb to a running process... That
> > > > doesn't magicly make the now debugged process a child of gdb does it?
> > >
> > > % cat hello.c
> > > #include
> > >
> > > int
> > > main()
> > > {
> > > printf("hello world\n");
> > > (void)getchar();
> > > return (0);
> > > }
> > > % cc -g hello.c -o hello
> > > % ./hello
> > > hello world
> > > load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k
> > >
> > > < different window >
> > >
> > > % ps -O ppid -p `pgrep hello`
> > > PID PPID TT STAT TIME COMMAND
> > > 42599 5340 16 I+ 0:00.00 ./hello
> > > % gdb hello `pgrep hello`
> > > GNU gdb 6.1.1 [FreeBSD]
> > > ...
> > > (gdb)
> > > Suspended
> > > % ps -O ppid -p `pgrep hello`
> > > PID PPID TT STAT TIME COMMAND
> > > 42599 45079 16 TX+0:00.00 ./hello
> >
> > Wow, learn something new every day...
> >
> > But doesn't that break apps that use getppid to signal their parent
> > that forked them?
>
> Until mjg@'s commit, yes. It's been that way in FreeBSD at least for
> as long as I can remember. Certainly back to 4.x.
The ps(1) trick continues to work after the commit, since kern_proc
sysctl directly accesses p_pptr to fill ki_ppid. I simply forgot about
it during the review.
Anyway, checking the parent pid is definitely not the right way to
see if the process is under ptrace debugging. What if the parent
is the debugger ? The p_flag AKA ki_flag P_TRACED bit seems to be
the correct indicator.
pgpNaktRunWdw.pgp
Description: PGP signature
Re: svn commit: r270444 - in head/sys: kern sys
On 8/26/2014 4:23 PM, John Baldwin wrote:
> On Tuesday, August 26, 2014 3:32:10 pm John-Mark Gurney wrote:
>> John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400:
>>> On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote:
John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400:
> On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote:
>> On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote:
>>> On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote:
Author: mjg
Date: Sun Aug 24 09:04:09 2014
New Revision: 270444
URL: http://svnweb.freebsd.org/changeset/base/270444
Log:
Fix getppid for traced processes.
Traced processes always have the tracer set as the parent.
Utilize proc_realparent to obtain the right process when needed.
>>>
>>> Are you sure this won't break things? I know of several applications
>>> that
>>> expect a debugger to be the parent when attached and change behavior as
>>> a
>>> result (e.g. inserting a breakpoint on an assertion failure rather than
>>> generating a core).
>>
>> Well, this is what linux and solaris do.
>
> Interesting.
>
>> I don't feel strongly about this change. If you really want I'm happy to
>> revert.
>
> In general I'd like to someday have the debugger-debuggee relationship
> not
> override parent-child and this is a step in that direction. However,
> this
> will break existing applications, so this needs to be clearly documented
> in
> the release notes. In addition, we should probably advertise how a
> process
> can correctly determine if it is being run under a debugger (right now
> you can
> do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you
> can
> do different things for "gdb" vs "gcore", etc. so just checking P_TRACED
> from
> kinfo_proc wouldn't be equivalent in functionality)
But what about when you attach gdb to a running process... That
doesn't magicly make the now debugged process a child of gdb does it?
>>>
>>> % cat hello.c
>>> #include
>>>
>>> int
>>> main()
>>> {
>>> printf("hello world\n");
>>> (void)getchar();
>>> return (0);
>>> }
>>> % cc -g hello.c -o hello
>>> % ./hello
>>> hello world
>>> load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k
>>>
>>> < different window >
>>>
>>> % ps -O ppid -p `pgrep hello`
>>> PID PPID TT STAT TIME COMMAND
>>> 42599 5340 16 I+ 0:00.00 ./hello
>>> % gdb hello `pgrep hello`
>>> GNU gdb 6.1.1 [FreeBSD]
>>> ...
>>> (gdb)
>>> Suspended
>>> % ps -O ppid -p `pgrep hello`
>>> PID PPID TT STAT TIME COMMAND
>>> 42599 45079 16 TX+0:00.00 ./hello
>>
>> Wow, learn something new every day...
>>
>> But doesn't that break apps that use getppid to signal their parent
>> that forked them?
>
> Until mjg@'s commit, yes. It's been that way in FreeBSD at least for
> as long as I can remember. Certainly back to 4.x.
>
Fun things can happen (local DoS) when you trace your own parent too.
Recently fixed by other commits. Easily thwarted by
security.bsd.unprivileged_proc_debug=0.
--
Regards,
Bryan Drewery
signature.asc
Description: OpenPGP digital signature
Re: svn commit: r270444 - in head/sys: kern sys
On Tuesday, August 26, 2014 3:32:10 pm John-Mark Gurney wrote:
> John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400:
> > On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote:
> > > John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400:
> > > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote:
> > > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote:
> > > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote:
> > > > > > > Author: mjg
> > > > > > > Date: Sun Aug 24 09:04:09 2014
> > > > > > > New Revision: 270444
> > > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444
> > > > > > >
> > > > > > > Log:
> > > > > > > Fix getppid for traced processes.
> > > > > > >
> > > > > > > Traced processes always have the tracer set as the parent.
> > > > > > > Utilize proc_realparent to obtain the right process when needed.
> > > > > >
> > > > > > Are you sure this won't break things? I know of several
> > > > > > applications that
> > > > > > expect a debugger to be the parent when attached and change
> > > > > > behavior as a
> > > > > > result (e.g. inserting a breakpoint on an assertion failure rather
> > > > > > than
> > > > > > generating a core).
> > > > >
> > > > > Well, this is what linux and solaris do.
> > > >
> > > > Interesting.
> > > >
> > > > > I don't feel strongly about this change. If you really want I'm happy
> > > > > to
> > > > > revert.
> > > >
> > > > In general I'd like to someday have the debugger-debuggee relationship
> > > > not
> > > > override parent-child and this is a step in that direction. However,
> > > > this
> > > > will break existing applications, so this needs to be clearly
> > > > documented in
> > > > the release notes. In addition, we should probably advertise how a
> > > > process
> > > > can correctly determine if it is being run under a debugger (right now
> > > > you can
> > > > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so
> > > > you can
> > > > do different things for "gdb" vs "gcore", etc. so just checking
> > > > P_TRACED from
> > > > kinfo_proc wouldn't be equivalent in functionality)
> > >
> > > But what about when you attach gdb to a running process... That
> > > doesn't magicly make the now debugged process a child of gdb does it?
> >
> > % cat hello.c
> > #include
> >
> > int
> > main()
> > {
> > printf("hello world\n");
> > (void)getchar();
> > return (0);
> > }
> > % cc -g hello.c -o hello
> > % ./hello
> > hello world
> > load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k
> >
> > < different window >
> >
> > % ps -O ppid -p `pgrep hello`
> > PID PPID TT STAT TIME COMMAND
> > 42599 5340 16 I+ 0:00.00 ./hello
> > % gdb hello `pgrep hello`
> > GNU gdb 6.1.1 [FreeBSD]
> > ...
> > (gdb)
> > Suspended
> > % ps -O ppid -p `pgrep hello`
> > PID PPID TT STAT TIME COMMAND
> > 42599 45079 16 TX+0:00.00 ./hello
>
> Wow, learn something new every day...
>
> But doesn't that break apps that use getppid to signal their parent
> that forked them?
Until mjg@'s commit, yes. It's been that way in FreeBSD at least for
as long as I can remember. Certainly back to 4.x.
--
John Baldwin
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270674 - head/usr.bin/ktrace
Author: jhb Date: Tue Aug 26 21:21:57 2014 New Revision: 270674 URL: http://svnweb.freebsd.org/changeset/base/270674 Log: Clarify that the -c argument clears the list of tracepoints specified by -t (it does not clear all tracepoints). Submitted by: jmg, Eric van Gyzen MFC after:1 week Modified: head/usr.bin/ktrace/ktrace.1 Modified: head/usr.bin/ktrace/ktrace.1 == --- head/usr.bin/ktrace/ktrace.1Tue Aug 26 21:15:34 2014 (r270673) +++ head/usr.bin/ktrace/ktrace.1Tue Aug 26 21:21:57 2014 (r270674) @@ -28,7 +28,7 @@ .\"@(#)ktrace.18.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd May 31, 2012 +.Dd August 26, 2014 .Dt KTRACE 1 .Os .Sh NAME @@ -81,7 +81,7 @@ Append to the trace file instead of recr Disable tracing on all user-owned processes, and, if executed by root, all processes in the system. .It Fl c -Clear the trace points associated with the specified file or processes. +Clear the specified trace points associated with the given file or processes. .It Fl d Descendants; perform the operation for all current children of the designated processes. @@ -102,8 +102,10 @@ Enable (disable) tracing on the indicate .Fl p flag is permitted). .It Fl t Ar trstr -The string argument represents the kernel trace points, one per letter. -The following table equates the letters with the tracepoints: +Specify the list of trace points to enable or disable, one per letter. +If an explicit list is not specified, the default set of trace points is used. +.Pp +The following trace points are supported: .Pp .Bl -tag -width flag -compact .It Cm c ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270673 - head/sys/netinet
Author: tuexen
Date: Tue Aug 26 21:15:34 2014
New Revision: 270673
URL: http://svnweb.freebsd.org/changeset/base/270673
Log:
Announce SCTP support in the kern.features sysctl variables.
MFC after: 3 days
Modified:
head/sys/netinet/sctp_sysctl.c
Modified: head/sys/netinet/sctp_sysctl.c
==
--- head/sys/netinet/sctp_sysctl.c Tue Aug 26 20:40:12 2014
(r270672)
+++ head/sys/netinet/sctp_sysctl.c Tue Aug 26 21:15:34 2014
(r270673)
@@ -41,6 +41,9 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
+
+FEATURE(sctp, "Stream Control Transmission Protocol");
/*
* sysctl tunable variables
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270672 - head/usr.bin/svn/svn
Author: gjb
Date: Tue Aug 26 20:40:12 2014
New Revision: 270672
URL: http://svnweb.freebsd.org/changeset/base/270672
Log:
Add svnlite.1 to CLEANFILES.
MFC after:3 days
X-MFC-To: stable/10 only
Sponsored by: The FreeBSD Foundation
Modified:
head/usr.bin/svn/svn/Makefile
Modified: head/usr.bin/svn/svn/Makefile
==
--- head/usr.bin/svn/svn/Makefile Tue Aug 26 20:01:18 2014
(r270671)
+++ head/usr.bin/svn/svn/Makefile Tue Aug 26 20:40:12 2014
(r270672)
@@ -51,6 +51,7 @@ DPADD=${LIBSVN_CLIENT} ${LIBSVN_WC} ${L
${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
+CLEANFILES+= svnlite.1
.if(defined(ORGANIZATION) && !empty(ORGANIZATION))
DPSRCS+= freebsd-organization.h
CLEANFILES+= freebsd-organization.h
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270671 - stable/9/sys/sys
Author: wblock (doc committer)
Date: Tue Aug 26 20:01:18 2014
New Revision: 270671
URL: http://svnweb.freebsd.org/changeset/base/270671
Log:
MFC r269743:
Update the comments in exec.h with help from jilles.
Modified:
stable/9/sys/sys/exec.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/sys/ (props changed)
Modified: stable/9/sys/sys/exec.h
==
--- stable/9/sys/sys/exec.h Tue Aug 26 19:58:48 2014(r270670)
+++ stable/9/sys/sys/exec.h Tue Aug 26 20:01:18 2014(r270671)
@@ -39,12 +39,17 @@
#define _SYS_EXEC_H_
/*
- * The following structure is found at the top of the user stack of each
- * user process. The ps program uses it to locate argv and environment
- * strings. Programs that wish ps to display other information may modify
- * it; normally ps_argvstr points to the argv vector, and ps_nargvstr
- * is the same as the program's argc. The fields ps_envstr and ps_nenvstr
- * are the equivalent for the environment.
+ * Before ps_args existed, the following structure, found at the top of
+ * the user stack of each user process, was used by ps(1) to locate
+ * environment and argv strings. Normally ps_argvstr points to the
+ * argv vector, and ps_nargvstr is the same as the program's argc. The
+ * fields ps_envstr and ps_nenvstr are the equivalent for the environment.
+ *
+ * Programs should now use setproctitle(3) to change ps output.
+ * setproctitle() always informs the kernel with sysctl and sets the
+ * pointers in ps_strings. The kern.proc.args sysctl first tries p_args.
+ * If p_args is NULL, it then falls back to reading ps_strings and following
+ * the pointers.
*/
struct ps_strings {
char**ps_argvstr; /* first of 0 or more argument strings */
@@ -55,6 +60,7 @@ struct ps_strings {
/*
* Address of ps_strings structure (in user space).
+ * Prefer the kern.ps_strings or kern.proc.ps_strings sysctls to this constant.
*/
#definePS_STRINGS (USRSTACK - sizeof(struct ps_strings))
#define SPARE_USRSPACE 4096
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270670 - stable/10/sys/sys
Author: wblock (doc committer)
Date: Tue Aug 26 19:58:48 2014
New Revision: 270670
URL: http://svnweb.freebsd.org/changeset/base/270670
Log:
MFC r269743:
Update the comments in exec.h with help from jilles.
Modified:
stable/10/sys/sys/exec.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/sys/exec.h
==
--- stable/10/sys/sys/exec.hTue Aug 26 19:36:47 2014(r270669)
+++ stable/10/sys/sys/exec.hTue Aug 26 19:58:48 2014(r270670)
@@ -39,12 +39,17 @@
#define _SYS_EXEC_H_
/*
- * The following structure is found at the top of the user stack of each
- * user process. The ps program uses it to locate argv and environment
- * strings. Programs that wish ps to display other information may modify
- * it; normally ps_argvstr points to the argv vector, and ps_nargvstr
- * is the same as the program's argc. The fields ps_envstr and ps_nenvstr
- * are the equivalent for the environment.
+ * Before ps_args existed, the following structure, found at the top of
+ * the user stack of each user process, was used by ps(1) to locate
+ * environment and argv strings. Normally ps_argvstr points to the
+ * argv vector, and ps_nargvstr is the same as the program's argc. The
+ * fields ps_envstr and ps_nenvstr are the equivalent for the environment.
+ *
+ * Programs should now use setproctitle(3) to change ps output.
+ * setproctitle() always informs the kernel with sysctl and sets the
+ * pointers in ps_strings. The kern.proc.args sysctl first tries p_args.
+ * If p_args is NULL, it then falls back to reading ps_strings and following
+ * the pointers.
*/
struct ps_strings {
char**ps_argvstr; /* first of 0 or more argument strings */
@@ -55,6 +60,7 @@ struct ps_strings {
/*
* Address of ps_strings structure (in user space).
+ * Prefer the kern.ps_strings or kern.proc.ps_strings sysctls to this constant.
*/
#definePS_STRINGS (USRSTACK - sizeof(struct ps_strings))
#define SPARE_USRSPACE 4096
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r265792 - head/sys/kern
On Tue, Aug 26, 2014 at 10:35:21PM +0300, Alexander Motin wrote: > On 26.08.2014 21:54, Slawa Olhovchenkov wrote: > > On Tue, May 20, 2014 at 09:04:25AM -0700, Adrian Chadd wrote: > > > >> On 20 May 2014 08:41, Slawa Olhovchenkov wrote: > >> > (But if you try it on 10.0 and it changes things, by all means let me > know.) > >>> > >>> I am try on 10.0, but not sure about significant improvement (may be > >>> 10%). > >>> > >>> For current CPU (E5-2650 v2 @ 2.60GHz) hwpmc don't working (1. after > >>> collect some data `pmcstat -R sample.out -G out.txt` don't decode any; > >>> 2. kldunload hwpmc do kernel crash) and I can't collect detailed > >>> profile information. > >> > >> Yup. I'm starting to get really ticked off at how pmc logging on > >> multi-core devices just "stops" after a while. I'll talk with other > >> pmc people and see if we can figure out what the heck is going on. :( > > > > Now I can test you work on CPU w/ working pmc. > > @ CPU_CLK_UNHALTED_CORE [241440 samples] > > > > 10.59% [25561]_mtx_lock_spin_cookie @ /boot/kernel/kernel > > 94.25% [24092] pmclog_reserve @ /boot/kernel/hwpmc.ko > > 100.0% [24092] pmclog_process_callchain > >100.0% [24092] pmc_process_samples > > 100.0% [24092]pmc_hook_handler > > 100.0% [24092] hardclock_cnt @ /boot/kernel/kernel > > Slava, on large SMP systems you should specify some much bigger division > rate (like `-n 1`) when doing PMC sampling. Otherwise you are > mostly measuring PMC's internal lock congestion. OK, now traffic less (15.8 Gbit) Any other recomendations? last pid: 27787; load averages: 8.99, 8.53, 8.43 up 0+04:54:59 23:41:50 47 processes: 6 running, 41 sleeping CPU 0: 17.3% user, 0.0% nice, 36.9% system, 0.8% interrupt, 45.1% idle CPU 1: 12.9% user, 0.0% nice, 37.3% system, 0.4% interrupt, 49.4% idle CPU 2: 11.8% user, 0.0% nice, 40.4% system, 0.0% interrupt, 47.8% idle CPU 3: 11.4% user, 0.0% nice, 40.8% system, 0.4% interrupt, 47.5% idle CPU 4: 17.3% user, 0.0% nice, 41.2% system, 0.0% interrupt, 41.6% idle CPU 5: 14.9% user, 0.0% nice, 40.4% system, 0.4% interrupt, 44.3% idle CPU 6: 0.4% user, 0.0% nice, 5.5% system, 71.0% interrupt, 23.1% idle CPU 7: 0.4% user, 0.0% nice, 3.5% system, 63.9% interrupt, 32.2% idle CPU 8: 0.0% user, 0.0% nice, 3.5% system, 65.5% interrupt, 31.0% idle CPU 9: 0.4% user, 0.0% nice, 3.9% system, 70.2% interrupt, 25.5% idle CPU 10: 0.0% user, 0.0% nice, 3.9% system, 59.2% interrupt, 36.9% idle CPU 11: 0.4% user, 0.0% nice, 4.3% system, 69.8% interrupt, 25.5% idle Mem: 319M Active, 15G Inact, 96G Wired, 13G Free ARC: 90G Total, 85G MFU, 5233M MRU, 95M Anon, 396M Header, 101M Other Swap: @ CPU_CLK_UNHALTED_CORE [79302 samples] 09.97% [7908] _mtx_lock_spin_cookie @ /boot/kernel/kernel 95.73% [7570] pmclog_reserve @ /boot/kernel/hwpmc.ko 100.0% [7570] pmclog_process_callchain 100.0% [7570]pmc_process_samples 100.0% [7570] pmc_hook_handler 100.0% [7570] hardclock_cnt @ /boot/kernel/kernel 100.0% [7570] handleevents 97.54% [7384]timercb 100.0% [7384] lapic_handle_timer 02.46% [186] cpu_activeclock 100.0% [186] cpu_idle 100.0% [186] sched_idletd 100.0% [186]fork_exit 02.66% [210] callout_lock 94.76% [199]callout_reset_sbt_on 99.50% [198] tcp_timer_activate 94.95% [188] tcp_do_segment 100.0% [188] tcp_input 100.0% [188]ip_input 100.0% [188] netisr_dispatch_src 100.0% [188] ether_demux 100.0% [188] ether_nh_input 100.0% [188]netisr_dispatch_src 84.04% [158] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [158] ixgbe_msix_que 100.0% [158] intr_event_execute_handlers @ /boot/kernel/kernel 100.0% [158]ithread_loop 100.0% [158] fork_exit 15.96% [30] tcp_lro_flush 96.67% [29] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [29]ixgbe_msix_que 100.0% [29] intr_event_execute_handlers @ /boot/kernel/kernel 100.0% [29] ithread_loop 03.33% [1]tcp_lro_rx 100.0% [1] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [1] ixgbe_msix_que 100.0% [1] intr_event_execute_handlers @ /boot/kernel/kerne
svn commit: r270669 - head/usr.bin/host
Author: gjb
Date: Tue Aug 26 19:36:47 2014
New Revision: 270669
URL: http://svnweb.freebsd.org/changeset/base/270669
Log:
Add host.1 to CLEANFILES.
MFC after:3 days
X-MFC-To: stable/10 only
Sponsored by: The FreeBSD Foundation
Modified:
head/usr.bin/host/Makefile
Modified: head/usr.bin/host/Makefile
==
--- head/usr.bin/host/Makefile Tue Aug 26 19:36:34 2014(r270668)
+++ head/usr.bin/host/Makefile Tue Aug 26 19:36:47 2014(r270669)
@@ -8,6 +8,7 @@ LDNSHOSTDIR=${.CURDIR}/../../contrib/ld
PROG= host
SRCS= ldns-host.c
MAN= host.1
+CLEANFILES+= host.1
host.1: ldns-host.1
sed -e 's/ldns-//gI' <${.ALLSRC} >${.TARGET} || \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270668 - head/gnu/usr.bin/grep
Author: gjb
Date: Tue Aug 26 19:36:34 2014
New Revision: 270668
URL: http://svnweb.freebsd.org/changeset/base/270668
Log:
Add gnugrep.1 to CLEANFILES.
MFC after:3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/gnu/usr.bin/grep/Makefile
Modified: head/gnu/usr.bin/grep/Makefile
==
--- head/gnu/usr.bin/grep/Makefile Tue Aug 26 17:48:05 2014
(r270667)
+++ head/gnu/usr.bin/grep/Makefile Tue Aug 26 19:36:34 2014
(r270668)
@@ -12,6 +12,7 @@ PROG= gnugrep
SRCS= closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \
isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
xstrtoumax.c
+CLEANFILES+= gnugrep.1
CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r265792 - head/sys/kern
On 26.08.2014 21:54, Slawa Olhovchenkov wrote: > On Tue, May 20, 2014 at 09:04:25AM -0700, Adrian Chadd wrote: > >> On 20 May 2014 08:41, Slawa Olhovchenkov wrote: >> (But if you try it on 10.0 and it changes things, by all means let me know.) >>> >>> I am try on 10.0, but not sure about significant improvement (may be >>> 10%). >>> >>> For current CPU (E5-2650 v2 @ 2.60GHz) hwpmc don't working (1. after >>> collect some data `pmcstat -R sample.out -G out.txt` don't decode any; >>> 2. kldunload hwpmc do kernel crash) and I can't collect detailed >>> profile information. >> >> Yup. I'm starting to get really ticked off at how pmc logging on >> multi-core devices just "stops" after a while. I'll talk with other >> pmc people and see if we can figure out what the heck is going on. :( > > Now I can test you work on CPU w/ working pmc. > @ CPU_CLK_UNHALTED_CORE [241440 samples] > > 10.59% [25561]_mtx_lock_spin_cookie @ /boot/kernel/kernel > 94.25% [24092] pmclog_reserve @ /boot/kernel/hwpmc.ko > 100.0% [24092] pmclog_process_callchain >100.0% [24092] pmc_process_samples > 100.0% [24092]pmc_hook_handler > 100.0% [24092] hardclock_cnt @ /boot/kernel/kernel Slava, on large SMP systems you should specify some much bigger division rate (like `-n 1`) when doing PMC sampling. Otherwise you are mostly measuring PMC's internal lock congestion. -- Alexander Motin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270444 - in head/sys: kern sys
John Baldwin wrote this message on Tue, Aug 26, 2014 at 15:09 -0400:
> On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote:
> > John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400:
> > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote:
> > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote:
> > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote:
> > > > > > Author: mjg
> > > > > > Date: Sun Aug 24 09:04:09 2014
> > > > > > New Revision: 270444
> > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444
> > > > > >
> > > > > > Log:
> > > > > > Fix getppid for traced processes.
> > > > > >
> > > > > > Traced processes always have the tracer set as the parent.
> > > > > > Utilize proc_realparent to obtain the right process when needed.
> > > > >
> > > > > Are you sure this won't break things? I know of several applications
> > > > > that
> > > > > expect a debugger to be the parent when attached and change behavior
> > > > > as a
> > > > > result (e.g. inserting a breakpoint on an assertion failure rather
> > > > > than
> > > > > generating a core).
> > > >
> > > > Well, this is what linux and solaris do.
> > >
> > > Interesting.
> > >
> > > > I don't feel strongly about this change. If you really want I'm happy to
> > > > revert.
> > >
> > > In general I'd like to someday have the debugger-debuggee relationship
> > > not
> > > override parent-child and this is a step in that direction. However,
> > > this
> > > will break existing applications, so this needs to be clearly documented
> > > in
> > > the release notes. In addition, we should probably advertise how a
> > > process
> > > can correctly determine if it is being run under a debugger (right now
> > > you can
> > > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you
> > > can
> > > do different things for "gdb" vs "gcore", etc. so just checking P_TRACED
> > > from
> > > kinfo_proc wouldn't be equivalent in functionality)
> >
> > But what about when you attach gdb to a running process... That
> > doesn't magicly make the now debugged process a child of gdb does it?
>
> % cat hello.c
> #include
>
> int
> main()
> {
> printf("hello world\n");
> (void)getchar();
> return (0);
> }
> % cc -g hello.c -o hello
> % ./hello
> hello world
> load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k
>
> < different window >
>
> % ps -O ppid -p `pgrep hello`
> PID PPID TT STAT TIME COMMAND
> 42599 5340 16 I+ 0:00.00 ./hello
> % gdb hello `pgrep hello`
> GNU gdb 6.1.1 [FreeBSD]
> ...
> (gdb)
> Suspended
> % ps -O ppid -p `pgrep hello`
> PID PPID TT STAT TIME COMMAND
> 42599 45079 16 TX+0:00.00 ./hello
Wow, learn something new every day...
But doesn't that break apps that use getppid to signal their parent
that forked them?
--
John-Mark Gurney Voice: +1 415 225 5579
"All that I will do, has been done, All that I have, has not."
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270444 - in head/sys: kern sys
On Monday, August 25, 2014 6:30:34 pm John-Mark Gurney wrote:
> John Baldwin wrote this message on Mon, Aug 25, 2014 at 13:35 -0400:
> > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote:
> > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote:
> > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote:
> > > > > Author: mjg
> > > > > Date: Sun Aug 24 09:04:09 2014
> > > > > New Revision: 270444
> > > > > URL: http://svnweb.freebsd.org/changeset/base/270444
> > > > >
> > > > > Log:
> > > > > Fix getppid for traced processes.
> > > > >
> > > > > Traced processes always have the tracer set as the parent.
> > > > > Utilize proc_realparent to obtain the right process when needed.
> > > >
> > > > Are you sure this won't break things? I know of several applications
> > > > that
> > > > expect a debugger to be the parent when attached and change behavior as
> > > > a
> > > > result (e.g. inserting a breakpoint on an assertion failure rather than
> > > > generating a core).
> > >
> > > Well, this is what linux and solaris do.
> >
> > Interesting.
> >
> > > I don't feel strongly about this change. If you really want I'm happy to
> > > revert.
> >
> > In general I'd like to someday have the debugger-debuggee relationship not
> > override parent-child and this is a step in that direction. However, this
> > will break existing applications, so this needs to be clearly documented in
> > the release notes. In addition, we should probably advertise how a process
> > can correctly determine if it is being run under a debugger (right now you
> > can
> > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you
> > can
> > do different things for "gdb" vs "gcore", etc. so just checking P_TRACED
> > from
> > kinfo_proc wouldn't be equivalent in functionality)
>
> But what about when you attach gdb to a running process... That
> doesn't magicly make the now debugged process a child of gdb does it?
% cat hello.c
#include
int
main()
{
printf("hello world\n");
(void)getchar();
return (0);
}
% cc -g hello.c -o hello
% ./hello
hello world
load: 9.81 cmd: hello 42599 [ttyin] 1.67r 0.00u 0.00s 0% 1056k
< different window >
% ps -O ppid -p `pgrep hello`
PID PPID TT STAT TIME COMMAND
42599 5340 16 I+ 0:00.00 ./hello
% gdb hello `pgrep hello`
GNU gdb 6.1.1 [FreeBSD]
...
(gdb)
Suspended
% ps -O ppid -p `pgrep hello`
PID PPID TT STAT TIME COMMAND
42599 45079 16 TX+0:00.00 ./hello
--
John Baldwin
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270648 - in head/sys: kern sys
On Tuesday, August 26, 2014 9:55:22 am Mateusz Guzik wrote: > On Tue, Aug 26, 2014 at 09:45:38AM -0400, John Baldwin wrote: > > On Tuesday, August 26, 2014 4:17:22 am Mateusz Guzik wrote: > > > Author: mjg > > > Date: Tue Aug 26 08:17:22 2014 > > > New Revision: 270648 > > > URL: http://svnweb.freebsd.org/changeset/base/270648 > > > > > > Log: > > > Fix up races with f_seqcount handling. > > > > > > It was possible that the kernel would overwrite user-supplied hint. > > > > > > Abuse vnode lock for this purpose. > > > > > > In collaboration with: kib > > > MFC after: 1 week > > > > Do we care about this being correct enough to penalize reads by single- > > threading them? This is just an optimization, if you lose the race it doesn't > > actually break anything. > > > > We don't singlethread reads, vnode is locked exactly as it was > previously. > > What changes is that a rarely used (as compared to reads) function > playing with f_seqcount now takes exclusive lock. > > If anything, this is an optimization since it removes an unnecessary > load_acq. Ah, I misread the diff and had thought the fcntl() changes were in the read() path instead. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270444 - in head/sys: kern sys
On Monday, August 25, 2014 9:28:16 pm Mateusz Guzik wrote: > On Mon, Aug 25, 2014 at 01:35:58PM -0400, John Baldwin wrote: > > On Monday, August 25, 2014 07:02:41 PM Mateusz Guzik wrote: > > > On Mon, Aug 25, 2014 at 10:23:19AM -0400, John Baldwin wrote: > > > > On Sunday, August 24, 2014 09:04:09 AM Mateusz Guzik wrote: > > > > > Author: mjg > > > > > Date: Sun Aug 24 09:04:09 2014 > > > > > New Revision: 270444 > > > > > URL: http://svnweb.freebsd.org/changeset/base/270444 > > > > > > > > > > Log: > > > > > Fix getppid for traced processes. > > > > > > > > > > Traced processes always have the tracer set as the parent. > > > > > Utilize proc_realparent to obtain the right process when needed. > > > > > > > > Are you sure this won't break things? I know of several applications > > > > that > > > > expect a debugger to be the parent when attached and change behavior as > > > > a > > > > result (e.g. inserting a breakpoint on an assertion failure rather than > > > > generating a core). > > > > > > Well, this is what linux and solaris do. > > > > Interesting. > > > > > I don't feel strongly about this change. If you really want I'm happy to > > > revert. > > > > In general I'd like to someday have the debugger-debuggee relationship not > > override parent-child and this is a step in that direction. However, this > > will break existing applications, so this needs to be clearly documented in > > the release notes. In addition, we should probably advertise how a process > > can correctly determine if it is being run under a debugger (right now you > > can > > do 'getppid()' and use strcmp or strstr on the p_comm of that pid so you > > can > > do different things for "gdb" vs "gcore", etc. so just checking P_TRACED > > from > > kinfo_proc wouldn't be equivalent in functionality) > > > > Is any of programs you mentioned opensource or at least publicly > available? The only ones I can currently think of are not publicly available. > In linux they provide TracerPid in /proc//status. > > We could add a specific sysctl or extend kinfo with the same data. A tracer pid would be sufficient. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r265792 - head/sys/kern
On Tue, May 20, 2014 at 09:04:25AM -0700, Adrian Chadd wrote: > On 20 May 2014 08:41, Slawa Olhovchenkov wrote: > > >> (But if you try it on 10.0 and it changes things, by all means let me > >> know.) > > > > I am try on 10.0, but not sure about significant improvement (may be > > 10%). > > > > For current CPU (E5-2650 v2 @ 2.60GHz) hwpmc don't working (1. after > > collect some data `pmcstat -R sample.out -G out.txt` don't decode any; > > 2. kldunload hwpmc do kernel crash) and I can't collect detailed > > profile information. > > Yup. I'm starting to get really ticked off at how pmc logging on > multi-core devices just "stops" after a while. I'll talk with other > pmc people and see if we can figure out what the heck is going on. :( Now I can test you work on CPU w/ working pmc. Current traffic 16.8 Gbit/s. CPU: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz (2000.04-MHz K8-class CPU) last pid: 22677; load averages: 9.12, 9.07, 8.90 up 0+04:06:06 22:52:57 47 processes: 3 running, 44 sleeping CPU 0: 11.8% user, 0.0% nice, 43.1% system, 1.6% interrupt, 43.5% idle CPU 1: 11.4% user, 0.0% nice, 51.8% system, 0.0% interrupt, 36.9% idle CPU 2: 10.6% user, 0.0% nice, 46.3% system, 0.8% interrupt, 42.4% idle CPU 3: 11.8% user, 0.0% nice, 45.1% system, 0.4% interrupt, 42.7% idle CPU 4: 13.7% user, 0.0% nice, 43.1% system, 0.0% interrupt, 43.1% idle CPU 5: 14.5% user, 0.0% nice, 45.9% system, 0.4% interrupt, 39.2% idle CPU 6: 0.0% user, 0.0% nice, 5.5% system, 68.6% interrupt, 25.9% idle CPU 7: 0.0% user, 0.0% nice, 4.3% system, 70.2% interrupt, 25.5% idle CPU 8: 0.0% user, 0.0% nice, 2.7% system, 69.4% interrupt, 27.8% idle CPU 9: 0.0% user, 0.0% nice, 4.7% system, 67.1% interrupt, 28.2% idle CPU 10: 0.0% user, 0.0% nice, 3.1% system, 76.9% interrupt, 20.0% idle CPU 11: 0.0% user, 0.0% nice, 5.1% system, 58.8% interrupt, 36.1% idle Mem: 322M Active, 15G Inact, 96G Wired, 956K Cache, 13G Free ARC: 90G Total, 84G MFU, 5690M MRU, 45M Anon, 394M Header, 98M Other Swap: @ CPU_CLK_UNHALTED_CORE [241440 samples] 10.59% [25561]_mtx_lock_spin_cookie @ /boot/kernel/kernel 94.25% [24092] pmclog_reserve @ /boot/kernel/hwpmc.ko 100.0% [24092] pmclog_process_callchain 100.0% [24092] pmc_process_samples 100.0% [24092]pmc_hook_handler 100.0% [24092] hardclock_cnt @ /boot/kernel/kernel 100.0% [24092] handleevents 99.62% [24001] timercb 100.0% [24001]lapic_handle_timer 00.38% [91] cpu_activeclock 100.0% [91] cpu_idle 100.0% [91]sched_idletd 100.0% [91] fork_exit 03.04% [777] callout_lock 91.63% [712]callout_reset_sbt_on 98.60% [702] tcp_timer_activate 94.87% [666] tcp_do_segment 100.0% [666] tcp_input 100.0% [666]ip_input 100.0% [666] netisr_dispatch_src 100.0% [666] ether_demux 100.0% [666] ether_nh_input 100.0% [666]netisr_dispatch_src 98.05% [653] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 87.44% [571] ixgbe_msix_que 100.0% [571] intr_event_execute_handlers @ /boot/kernel/kernel 100.0% [571]ithread_loop 100.0% [571] fork_exit 12.56% [82] ixgbe_handle_que @ /boot/kernel/if_ixgbe.ko 100.0% [82]taskqueue_run_locked @ /boot/kernel/kernel 100.0% [82] taskqueue_thread_loop 100.0% [82] fork_exit 01.95% [13] tcp_lro_flush 92.31% [12] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [12]ixgbe_msix_que 100.0% [12] intr_event_execute_handlers @ /boot/kernel/kernel 100.0% [12] ithread_loop 07.69% [1]tcp_lro_rx 100.0% [1] ixgbe_rxeof @ /boot/kernel/if_ixgbe.ko 100.0% [1] ixgbe_msix_que 100.0% [1] intr_event_execute_handlers @ /boot/kernel/kernel 05.13% [36] tcp_output 100.0% [36]tcp_do_segment 100.0% [36] tcp_input 100.0% [36] ip_input 100.0% [36] netisr_dispatch_src 100.0% [36]ether_demux 100.0% [36] ether_nh_input 100.0% [36] netisr_dispatch_src 100.0%
Re: svn commit: r270227 - head/sys/sys
On Tue, 26 Aug 2014, Benjamin Kaduk wrote: On Tue, Aug 26, 2014 at 9:58 AM, Bruce Evans wrote: That would be a further obfuscation. The *INTC() macros expand to integer constant expressions of the specified type suitable for use in #if preprocessing directives. (It is otherwise difficult to detemine the correct suffix, to add to the constant to give it the specified type). There are no preprocessing directives here, so a simple cast works. The cast could also be applied to the other operand but it is easier to read when applied to the constant. I thought that in C99, all integers in preprocessor evaluation were treated as if they were [u]intmax_t (6.10.1.4 in the n1256.pdf I have here). I was only just skimming that part yesterday for unrelated reasons, though, so maybe I'm missing the bigger picture. Yes, that makes it unclear what typed constants in cpp expressions are useful for. C has always been careful to make limits like UINT_MAX have the correct type, but that seems to be worse than useless in cpp expressions. (Oops. I was thinking that UCHAR_MAX had type u_char, but the correctness actually goes the other way -- it is required to have type the promotion of u_char (signed int except on exotic machines). UINT_MAX has type unsigned int. So -UINT_MAX > 0 in normal expressions. But in cpp expressions, UINT_MAX promotes to intmax_t before it is negated (since C's broken "value-preserving" promotion rules apply). So -UINT_MAX < 0 in cpp expressions. There seem to be some compiler bugs in this. In cpp expressions, testing on clang on amd64 gives -UINT_MAX < 0 and -0x < 0, but -0xU > 0. The first 2 results are the same since UINT_MAX is just 0x. ( intentionally avoids using suffixes on constants if possible since it didn't use them old versions, I don't like them, and I would have tried to undo any changes that added them. Some buggy versions used them to break thinks like USHRT_MAX -- 0xU has the wrong type.) But 0x and 0xU have the same type if u_int == uint32_t, since the type of an unsuffixed hex constant is the type of lowest rank that can represent it. gcc-3.3 on i386 under an old version of FreeBSD gives the same results, except UINT_MAX is defined with a U suffix so the the result for it agrees with the wrong result for 0x. Perhaps this is specified somewhere, but it is bizarre for 0xU to promote not bug for bug compatibly with the "value-preserving" rules, while the same type and value spelled as 0x does promote bug for bug compatibly. TenDRA (4.2) is normally more of a C compiler than gcc or clang, and it gives very interesting errors for all 3 cpp expressions: [ISO C90 6.8.1]: Can't have target dependent '#if' at outer level. The expression is target-dependent since the type of 0x depends on the size of int. Even the result of -1U > 0 is apparently target- dependent in C90. I think it is still target-dependent. On exotic targets, uintmax_t == u_int, so there is no promotion and -1U > 0, but on normal targets 1U promotes to a (intmax_t)1 and negating that makes it negative. I didn't know about this stupid rule 6.8.1. It mainly prevents you writing target-dependent cpp expressions to determine the target. It seems to be a bug in TenDRA. 6.8.1 only says that it is implementation-defined whether the result is the same as a non-cpp expression, and gives an example of a more usefule expression involving character constants being quite likely to give a different rewsult. Sigh. My compiler and TurboC handled cpp expressions better in 1988. cpp was part of the compiler, so casts, sizeof() and floating point worked in it, and the result of constant expressions didn't depend on whether they were evaluated in cpp. Running my compiler now gives -0x > 0 for all spellings of 0x, since the compiler is pre-C90 and never implemented "value-preserving" promotion. It also never supported 64-bit integers, so promotion doesn't apply in this example, but it applies to -0x in 16-bit mode similarly. The expression could also be written without a cast and without using UINT64_C(), by using a 'ULL' suffix instead of 'LL'. That would still use the long long abomination, and be different obfuscation -- the type of the constant doesn't really matter, but we need to promote to the type of 'frac', that is, uint64_t. 'ULL' works because long longs are at least 64 bits (and I think unsigned long longs are also 2's complemention, so their type is larger than uint64_t. Two's complement semantics are guaranteed for the fixed width types such as int64_t, but I'm not sure how that comes into play for unsigned types? Unsigned types have 2's complement arithmetic, but might not have purely 2's complement representations (except for unsigned char). They can have padding bits, Perhaps with trap representations. I think that is the only complication allowed in in C99 and later.
svn commit: r270667 - head/sys/dev/vt
Author: dumbbell
Date: Tue Aug 26 17:48:05 2014
New Revision: 270667
URL: http://svnweb.freebsd.org/changeset/base/270667
Log:
vt(4): When creating a window buffer, fill it entirely
... not just the visible part.
This fixes a bug where, when switching from eg. vt_vga to vt_fb (ie. the
resolution goes up), the originally hidden, uninitialized area of the
buffer is displayed on the screen. This leads to a missing text cursor
when it's over an unitialized area.
This was also visible when selecting text: the uninitialized area was
not highlighted.
Internally, this area was zeroed: characters were all 0x,
meaning the foreground and background color was black. Now, everything
is filled with a space with a gray foreground color, like the visible
area.
While here, remove the check for the mute flag and always use
TERMINAL_NORM_ATTR as the character attribute (ie. gray foreground,
black background).
MFC after:1 week
Modified:
head/sys/dev/vt/vt_buf.c
Modified: head/sys/dev/vt/vt_buf.c
==
--- head/sys/dev/vt/vt_buf.cTue Aug 26 16:40:20 2014(r270666)
+++ head/sys/dev/vt/vt_buf.cTue Aug 26 17:48:05 2014(r270667)
@@ -410,9 +410,9 @@ vtbuf_init_early(struct vt_buf *vb)
vtbuf_init_rows(vb);
rect.tr_begin.tp_row = rect.tr_begin.tp_col = 0;
- rect.tr_end = vb->vb_scr_size;
- vtbuf_fill(vb, &rect, VTBUF_SPACE_CHAR((boothowto & RB_MUTE) == 0 ?
- TERMINAL_KERN_ATTR : TERMINAL_NORM_ATTR));
+ rect.tr_end.tp_col = vb->vb_scr_size.tp_col;
+ rect.tr_end.tp_row = vb->vb_history_size;
+ vtbuf_fill(vb, &rect, VTBUF_SPACE_CHAR(TERMINAL_NORM_ATTR));
vtbuf_make_undirty(vb);
if ((vb->vb_flags & VBF_MTX_INIT) == 0) {
mtx_init(&vb->vb_lock, "vtbuf", NULL, MTX_SPIN);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270666 - head/sys/vm
Author: alc
Date: Tue Aug 26 16:40:20 2014
New Revision: 270666
URL: http://svnweb.freebsd.org/changeset/base/270666
Log:
Back in the days when the kernel was single threaded, testing
"vm_paging_target() > 0" was a reasonable way of determining if the
inactive queue scan met its target. However, now that other threads
can be allocating pages while the inactive queue scan is running, it's
an unreliable method. The effect of it being unreliable is that we
can start swapping out processes when we didn't intend to.
This issue has existed since the kernel was multithreaded, but the
changes to the inactive queue target in 10.0-RELEASE have made its
effects visible.
This change introduces a more direct method for determining if the
inactive queue scan met its target that is not affected by the actions
of other threads.
Reported by: Steve Polyack
Tested by:pho, Steve Polyack (an earlier version)
MFC after:1 week
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/vm/vm_pageout.c
Modified: head/sys/vm/vm_pageout.c
==
--- head/sys/vm/vm_pageout.cTue Aug 26 15:31:56 2014(r270665)
+++ head/sys/vm/vm_pageout.cTue Aug 26 16:40:20 2014(r270666)
@@ -1299,6 +1299,23 @@ relock_queues:
}
vm_pagequeue_unlock(pq);
+#if !defined(NO_SWAPPING)
+ /*
+* Wakeup the swapout daemon if we didn't cache or free the targeted
+* number of pages.
+*/
+ if (vm_swap_enabled && page_shortage > 0)
+ vm_req_vmdaemon(VM_SWAP_NORMAL);
+#endif
+
+ /*
+* Wakeup the sync daemon if we skipped a vnode in a writeable object
+* and we didn't cache or free enough pages.
+*/
+ if (vnodes_skipped > 0 && page_shortage > vm_cnt.v_free_target -
+ vm_cnt.v_free_min)
+ (void)speedup_syncer();
+
/*
* Compute the number of pages we want to try to move from the
* active queue to the inactive queue.
@@ -1408,20 +1425,6 @@ relock_queues:
}
}
#endif
-
- /*
-* If we didn't get enough free pages, and we have skipped a vnode
-* in a writeable object, wakeup the sync daemon. And kick swapout
-* if we did not get enough free pages.
-*/
- if (vm_paging_target() > 0) {
- if (vnodes_skipped && vm_page_count_min())
- (void) speedup_syncer();
-#if !defined(NO_SWAPPING)
- if (vm_swap_enabled && vm_page_count_target())
- vm_req_vmdaemon(VM_SWAP_NORMAL);
-#endif
- }
/*
* If we are critically low on one of RAM or swap and low on
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270665 - in stable/10: gnu/usr.bin/groff/tmac lib/clang sys/conf
Author: gjb
Date: Tue Aug 26 15:31:56 2014
New Revision: 270665
URL: http://svnweb.freebsd.org/changeset/base/270665
Log:
- Update stable/10 to 10.1-PRERELEASE now that the
code slush is in effect. (Forgotten on the 22nd.)
- Set the 10.1 as the .Fx mdoc(7) default.
- Update the TARGET_TRIPLE and BUILD_TRIPLE for clang(1)
to reflect 10.1.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/gnu/usr.bin/groff/tmac/mdoc.local
stable/10/lib/clang/clang.build.mk
stable/10/sys/conf/newvers.sh
Modified: stable/10/gnu/usr.bin/groff/tmac/mdoc.local
==
--- stable/10/gnu/usr.bin/groff/tmac/mdoc.local Tue Aug 26 14:44:08 2014
(r270664)
+++ stable/10/gnu/usr.bin/groff/tmac/mdoc.local Tue Aug 26 15:31:56 2014
(r270665)
@@ -50,7 +50,7 @@
.ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
.
.\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~10.0
+.ds doc-default-operating-system FreeBSD\~10.1
.
.\" FreeBSD releases not found in doc-common
.ds doc-operating-system-FreeBSD-7.47.4
Modified: stable/10/lib/clang/clang.build.mk
==
--- stable/10/lib/clang/clang.build.mk Tue Aug 26 14:44:08 2014
(r270664)
+++ stable/10/lib/clang/clang.build.mk Tue Aug 26 15:31:56 2014
(r270665)
@@ -27,8 +27,8 @@ TARGET_ABI= gnueabi
TARGET_ABI=unknown
.endif
-TARGET_TRIPLE?=${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
-BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0
+TARGET_TRIPLE?=${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.1
+BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.1
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
Modified: stable/10/sys/conf/newvers.sh
==
--- stable/10/sys/conf/newvers.sh Tue Aug 26 14:44:08 2014
(r270664)
+++ stable/10/sys/conf/newvers.sh Tue Aug 26 15:31:56 2014
(r270665)
@@ -31,8 +31,8 @@
# $FreeBSD$
TYPE="FreeBSD"
-REVISION="10.0"
-BRANCH="STABLE"
+REVISION="10.1"
+BRANCH="PRERELEASE"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270664 - in head/sys: dev/streams kern sys
Author: glebius
Date: Tue Aug 26 14:44:08 2014
New Revision: 270664
URL: http://svnweb.freebsd.org/changeset/base/270664
Log:
- Remove socket file operations declaration from sys/file.h.
- Make them static in sys_socket.c.
- Provide generic invfo_truncate() instead of soo_truncate().
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
head/sys/dev/streams/streams.c
head/sys/kern/kern_descrip.c
head/sys/kern/sys_socket.c
head/sys/kern/uipc_socket.c
head/sys/sys/file.h
Modified: head/sys/dev/streams/streams.c
==
--- head/sys/dev/streams/streams.c Tue Aug 26 13:53:01 2014
(r270663)
+++ head/sys/dev/streams/streams.c Tue Aug 26 14:44:08 2014
(r270664)
@@ -87,20 +87,8 @@ enum {
static struct cdev *dt_ptm, *dt_arp, *dt_icmp, *dt_ip, *dt_tcp, *dt_udp,
*dt_rawip, *dt_unix_dgram, *dt_unix_stream, *dt_unix_ord_stream;
-static struct fileops svr4_netops = {
- .fo_read = soo_read,
- .fo_write = soo_write,
- .fo_truncate = soo_truncate,
- .fo_ioctl = soo_ioctl,
- .fo_poll = soo_poll,
- .fo_kqfilter = soo_kqfilter,
- .fo_stat = soo_stat,
- .fo_close = svr4_soo_close,
- .fo_chmod = invfo_chmod,
- .fo_chown = invfo_chown,
- .fo_sendfile = invfo_sendfile,
-};
-
+static struct fileops svr4_netops;
+
static struct cdevsw streams_cdevsw = {
.d_version =D_VERSION,
.d_open = streamsopen,
@@ -147,6 +135,11 @@ streams_modevent(module_t mod, int type,
printf("WARNING: device config for STREAMS failed\n");
printf("Suggest unloading streams KLD\n");
}
+
+ /* Inherit generic socket file operations, except close(2). */
+ bcopy(&socketops, &svr4_netops, sizeof(struct fileops));
+ svr4_netops.fo_close = svr4_soo_close;
+
return 0;
case MOD_UNLOAD:
/* XXX should check to see if it's busy first */
@@ -345,11 +338,15 @@ svr4_stream_get(fp)
static int
svr4_soo_close(struct file *fp, struct thread *td)
{
-struct socket *so = fp->f_data;
+ struct socket *so = fp->f_data;
/* CHECKUNIT_DIAG(ENXIO);*/
svr4_delete_socket(td->td_proc, fp);
free(so->so_emuldata, M_TEMP);
- return soo_close(fp, td);
+
+ fp->f_ops = &badfileops;
+ fp->f_data = NULL;
+
+ return soclose(so);
}
Modified: head/sys/kern/kern_descrip.c
==
--- head/sys/kern/kern_descrip.cTue Aug 26 13:53:01 2014
(r270663)
+++ head/sys/kern/kern_descrip.cTue Aug 26 14:44:08 2014
(r270664)
@@ -3944,6 +3944,14 @@ struct fileops badfileops = {
};
int
+invfo_truncate(struct file *fp, off_t length, struct ucred *active_cred,
+struct thread *td)
+{
+
+ return (EINVAL);
+}
+
+int
invfo_chmod(struct file *fp, mode_t mode, struct ucred *active_cred,
struct thread *td)
{
Modified: head/sys/kern/sys_socket.c
==
--- head/sys/kern/sys_socket.c Tue Aug 26 13:53:01 2014(r270663)
+++ head/sys/kern/sys_socket.c Tue Aug 26 14:44:08 2014(r270664)
@@ -56,10 +56,18 @@ __FBSDID("$FreeBSD$");
#include
+static fo_rdwr_t soo_read;
+static fo_rdwr_t soo_write;
+static fo_ioctl_t soo_ioctl;
+static fo_poll_t soo_poll;
+extern fo_kqfilter_t soo_kqfilter;
+static fo_stat_t soo_stat;
+static fo_close_t soo_close;
+
struct fileops socketops = {
.fo_read = soo_read,
.fo_write = soo_write,
- .fo_truncate = soo_truncate,
+ .fo_truncate = invfo_truncate,
.fo_ioctl = soo_ioctl,
.fo_poll = soo_poll,
.fo_kqfilter = soo_kqfilter,
@@ -71,8 +79,7 @@ struct fileopssocketops = {
.fo_flags = DFLAG_PASSABLE
};
-/* ARGSUSED */
-int
+static int
soo_read(struct file *fp, struct uio *uio, struct ucred *active_cred,
int flags, struct thread *td)
{
@@ -88,8 +95,7 @@ soo_read(struct file *fp, struct uio *ui
return (error);
}
-/* ARGSUSED */
-int
+static int
soo_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
int flags, struct thread *td)
{
@@ -110,15 +116,7 @@ soo_write(struct file *fp, struct uio *u
return (error);
}
-int
-soo_truncate(struct file *fp, off_t length, struct ucred *active_cred,
-struct thread *td)
-{
-
- return (EINVAL);
-}
-
-int
+static int
soo_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred,
struct thread *td)
{
@@ -226,7 +224,7 @@ soo_ioctl(struct file *fp, u_long cmd, v
return (error);
}
-int
+static int
soo_poll(struct file *fp, int events, struct ucred *active_cred,
struct thread *td)
{
@@ -241,7 +239,7 @@ soo_poll(struct file *fp, int events, st
Re: svn commit: r270227 - head/sys/sys
On Tue, Aug 26, 2014 at 9:58 AM, Bruce Evans wrote: > > That would be a further obfuscation. The *INTC() macros expand to > integer constant expressions of the specified type suitable for use > in #if preprocessing directives. (It is otherwise difficult to > detemine the correct suffix, to add to the constant to give it the > specified type). There are no preprocessing directives here, so a > simple cast works. The cast could also be applied to the other > operand but it is easier to read when applied to the constant. > I thought that in C99, all integers in preprocessor evaluation were treated as if they were [u]intmax_t (6.10.1.4 in the n1256.pdf I have here). I was only just skimming that part yesterday for unrelated reasons, though, so maybe I'm missing the bigger picture. > The expression could also be written without a cast and without using > UINT64_C(), by using a 'ULL' suffix instead of 'LL'. That would still > use the long long abomination, and be different obfuscation -- the > type of the constant doesn't really matter, but we need to promote > to the type of 'frac', that is, uint64_t. 'ULL' works because long > longs are at least 64 bits (and I think unsigned long longs are also > 2's complemention, so their type is larger than uint64_t. Two's complement semantics are guaranteed for the fixed width types such as int64_t, but I'm not sure how that comes into play for unsigned types? -Ben ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270227 - head/sys/sys
On Tue, 26 Aug 2014, Ed Schouten wrote: On 20 August 2014 18:32, Davide Italiano wrote: - _bt->frac = _ts->tv_nsec * (uint64_t)18446744073LL; + _bt->frac = _ts->tv_nsec * (uint64_t)18446744073; You could also consider using UINT64_C(18446744073); that's the C standard way of creating an integer constant having a certain type. That would be a further obfuscation. The *INTC() macros expand to integer constant expressions of the specified type suitable for use in #if preprocessing directives. (It is otherwise difficult to detemine the correct suffix, to add to the constant to give it the specified type). There are no preprocessing directives here, so a simple cast works. The cast could also be applied to the other operand but it is easier to read when applied to the constant. UINT64_C() might work around the compiler bug of warning for constants larger than ULONG_MAX, depending on its implementation. I think it always does. On 64-bit arches, the above constant is not larger than ULONG_MAX so there is no problem, and on 32-bit arches the implementation can't be much different from appending 'ULL'. The expression could also be written without a cast and without using UINT64_C(), by using a 'ULL' suffix instead of 'LL'. That would still use the long long abomination, and be different obfuscation -- the type of the constant doesn't really matter, but we need to promote to the type of 'frac', that is, uint64_t. 'ULL' works because long longs are at least 64 bits (and I think unsigned long longs are also 2's complemention, so their type is larger than uint64_t. Bruce ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270648 - in head/sys: kern sys
On Tue, Aug 26, 2014 at 09:45:38AM -0400, John Baldwin wrote: > On Tuesday, August 26, 2014 4:17:22 am Mateusz Guzik wrote: > > Author: mjg > > Date: Tue Aug 26 08:17:22 2014 > > New Revision: 270648 > > URL: http://svnweb.freebsd.org/changeset/base/270648 > > > > Log: > > Fix up races with f_seqcount handling. > > > > It was possible that the kernel would overwrite user-supplied hint. > > > > Abuse vnode lock for this purpose. > > > > In collaboration with: kib > > MFC after:1 week > > Do we care about this being correct enough to penalize reads by single- > threading them? This is just an optimization, if you lose the race it > doesn't > actually break anything. > We don't singlethread reads, vnode is locked exactly as it was previously. What changes is that a rarely used (as compared to reads) function playing with f_seqcount now takes exclusive lock. If anything, this is an optimization since it removes an unnecessary load_acq. -- Mateusz Guzik ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270663 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Tue Aug 26 13:53:01 2014 New Revision: 270663 URL: http://svnweb.freebsd.org/changeset/base/270663 Log: Add a non-breaking space in the mount_nfs(8) example. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Aug 26 13:44:56 2014(r270662) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Aug 26 13:53:01 2014(r270663) @@ -956,7 +956,7 @@ a key=value pair argument to the -o flag. For example, to specify NFS version 4, the syntax to use is - -o vers=4. + -o vers=4. Support for the account facility has been added to &man.pam.3; library. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270648 - in head/sys: kern sys
On Tuesday, August 26, 2014 4:17:22 am Mateusz Guzik wrote: > Author: mjg > Date: Tue Aug 26 08:17:22 2014 > New Revision: 270648 > URL: http://svnweb.freebsd.org/changeset/base/270648 > > Log: > Fix up races with f_seqcount handling. > > It was possible that the kernel would overwrite user-supplied hint. > > Abuse vnode lock for this purpose. > > In collaboration with: kib > MFC after: 1 week Do we care about this being correct enough to penalize reads by single- threading them? This is just an optimization, if you lose the race it doesn't actually break anything. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270662 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Tue Aug 26 13:44:56 2014 New Revision: 270662 URL: http://svnweb.freebsd.org/changeset/base/270662 Log: Fix an oddly-worded sentence. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Aug 26 13:11:38 2014(r270661) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Aug 26 13:44:56 2014(r270662) @@ -1048,7 +1048,8 @@ been updated to version 1.7. The lukemftpd - has been removed from the &os; base system. + FTP server has been removed from the + &os; base system. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270661 - head/contrib/libarchive/tar
Author: ae
Date: Tue Aug 26 13:11:38 2014
New Revision: 270661
URL: http://svnweb.freebsd.org/changeset/base/270661
Log:
Remove leading '/' from hardlink name when removing them from the
regular file name. This fixes the problem, when bsdtar can not create
hardlinks to extracted files.
Silence from: kientzle@
MFC after:1 week
Sponsored by: Yandex LLC
Modified:
head/contrib/libarchive/tar/util.c
Modified: head/contrib/libarchive/tar/util.c
==
--- head/contrib/libarchive/tar/util.c Tue Aug 26 11:13:07 2014
(r270660)
+++ head/contrib/libarchive/tar/util.c Tue Aug 26 13:11:38 2014
(r270661)
@@ -372,6 +372,21 @@ strip_components(const char *p, int elem
}
}
+static const char*
+strip_leading_slashes(const char *p)
+{
+
+ /* Remove leading "/../", "//", etc. */
+ while (p[0] == '/' || p[0] == '\\') {
+ if (p[1] == '.' && p[2] == '.' && (
+ p[3] == '/' || p[3] == '\\')) {
+ p += 3; /* Remove "/..", leave "/" for next pass. */
+ } else
+ p += 1; /* Remove "/". */
+ }
+ return (p);
+}
+
/*
* Handle --strip-components and any future path-rewriting options.
* Returns non-zero if the pathname should not be extracted.
@@ -474,16 +489,7 @@ edit_pathname(struct bsdtar *bsdtar, str
p += 2;
slashonly = 0;
}
- /* Remove leading "/../", "//", etc. */
- while (p[0] == '/' || p[0] == '\\') {
- if (p[1] == '.' && p[2] == '.' &&
- (p[3] == '/' || p[3] == '\\')) {
- p += 3; /* Remove "/..", leave "/"
-* for next pass. */
- slashonly = 0;
- } else
- p += 1; /* Remove "/". */
- }
+ p = strip_leading_slashes(p);
} while (rp != p);
if (p != name && !bsdtar->warned_lead_slash) {
@@ -504,6 +510,19 @@ edit_pathname(struct bsdtar *bsdtar, str
name = ".";
else
name = p;
+
+ p = archive_entry_hardlink(entry);
+ if (p != NULL) {
+ rp = strip_leading_slashes(p);
+ if (rp == '\0')
+ return (1);
+ if (rp != p) {
+ char *linkname = strdup(rp);
+
+ archive_entry_copy_hardlink(entry, linkname);
+ free(linkname);
+ }
+ }
} else {
/* Strip redundant leading '/' characters. */
while (name[0] == '/' && name[1] == '/')
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270227 - head/sys/sys
Hey! On 20 August 2014 18:32, Davide Italiano wrote: > - _bt->frac = _ts->tv_nsec * (uint64_t)18446744073LL; > + _bt->frac = _ts->tv_nsec * (uint64_t)18446744073; You could also consider using UINT64_C(18446744073); that's the C standard way of creating an integer constant having a certain type. -- Ed Schouten ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270647 - in head: etc/defaults share/man/man4 share/man/man5 share/man/man7 share/man/man8
Am 26.08.2014 um 10:53 schrieb Marius Strobl: > On Tue, Aug 26, 2014 at 08:13:30AM +, Stefan Esser wrote: >> Author: se >> Date: Tue Aug 26 08:13:30 2014 >> New Revision: 270647 >> URL: http://svnweb.freebsd.org/changeset/base/270647 >> >> Log: >> Add references to vt(4) and the configuration files in /usr7share/vt where >> appropriate (i.e. where syscons was already mentioned and vt supports the >> feature). Comments in defaults/rc.conf are updated to match the contents >> of the modified man-page rc.conf(5). >> >> Reviewed by: pluknet, emaste >> MFC after: 3 days >> > > <...> > >> Modified: head/share/man/man4/splash.4 >> == >> --- head/share/man/man4/splash.4 Tue Aug 26 06:31:52 2014 >> (r270646) >> +++ head/share/man/man4/splash.4 Tue Aug 26 08:13:30 2014 >> (r270647) >> @@ -245,6 +245,7 @@ bitmap_name="/boot/splash.bin" >> .Xr vidcontrol 1 , >> .Xr syscons 4 , >> .Xr vga 4 , >> +.Xr vt 4 , >> .Xr loader.conf 5 , >> .Xr rc.conf 5 , >> .Xr kldload 8 , >> @@ -285,6 +286,8 @@ code. >> .Sh CAVEATS >> Both the splash screen and the screen saver work with >> .Xr syscons 4 >> + or >> +.Xr vt 4 >> only. >> .Sh BUGS >> If you load a screen saver while another screen saver has already >> > > That information is incorrect; vt(4) has only very limited splash > screen support and doesn't interface with splash(4) for that. Screen > saver support even is entirely nonexistent with vt(4) to date. Hi Marius, thank you for pointing that out. I had added vt(4) behind comment markers in that file, since I did not know whether splash(4) was used with vt or not. From the feedback that I received, I assumed that it should work (and I seemed to remember that there was some kind of splash support in vt), but apparently in error. I'll back-out the change from splash.4 then ... Best regards, STefan ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270660 - head/share/man/man4
Author: se Date: Tue Aug 26 11:13:07 2014 New Revision: 270660 URL: http://svnweb.freebsd.org/changeset/base/270660 Log: Back-out the references to vt(4) from this man-page. It appears that the splash support in vt is implemented within the vt driver and does not depend on splash(4). Submitted by: mar...@alchemy.franken.de Modified: head/share/man/man4/splash.4 Modified: head/share/man/man4/splash.4 == --- head/share/man/man4/splash.4Tue Aug 26 11:04:51 2014 (r270659) +++ head/share/man/man4/splash.4Tue Aug 26 11:13:07 2014 (r270660) @@ -245,7 +245,6 @@ bitmap_name="/boot/splash.bin" .Xr vidcontrol 1 , .Xr syscons 4 , .Xr vga 4 , -.Xr vt 4 , .Xr loader.conf 5 , .Xr rc.conf 5 , .Xr kldload 8 , @@ -286,8 +285,6 @@ code. .Sh CAVEATS Both the splash screen and the screen saver work with .Xr syscons 4 - or -.Xr vt 4 only. .Sh BUGS If you load a screen saver while another screen saver has already ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270659 - head/usr.bin/lock
Author: pluknet Date: Tue Aug 26 11:04:51 2014 New Revision: 270659 URL: http://svnweb.freebsd.org/changeset/base/270659 Log: Missed comma. Modified: head/usr.bin/lock/lock.1 Modified: head/usr.bin/lock/lock.1 == --- head/usr.bin/lock/lock.1Tue Aug 26 10:56:51 2014(r270658) +++ head/usr.bin/lock/lock.1Tue Aug 26 11:04:51 2014(r270659) @@ -75,7 +75,7 @@ virtual terminal. .El .Sh SEE ALSO .Xr vidcontrol 1 , -.Xr syscons 4 +.Xr syscons 4 , .Xr vt 4 .Sh HISTORY The ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270657 - in head: usr.bin/lock usr.sbin/bsdconfig usr.sbin/bsdinstall usr.sbin/kbdmap
Author: se Date: Tue Aug 26 10:55:08 2014 New Revision: 270657 URL: http://svnweb.freebsd.org/changeset/base/270657 Log: More man pages that need to know about vt in addition to syscons. MFC after:3 dayS Modified: head/usr.bin/lock/lock.1 head/usr.sbin/bsdconfig/bsdconfig.8 head/usr.sbin/bsdinstall/bsdinstall.8 head/usr.sbin/kbdmap/kbdmap.1 Modified: head/usr.bin/lock/lock.1 == --- head/usr.bin/lock/lock.1Tue Aug 26 10:35:32 2014(r270656) +++ head/usr.bin/lock/lock.1Tue Aug 26 10:55:08 2014(r270657) @@ -69,11 +69,14 @@ option of and thus has the same restrictions. It is only available if the terminal in question is a .Xr syscons 4 +or +.Xr vt 4 virtual terminal. .El .Sh SEE ALSO .Xr vidcontrol 1 , .Xr syscons 4 +.Xr vt 4 .Sh HISTORY The .Nm Modified: head/usr.sbin/bsdconfig/bsdconfig.8 == --- head/usr.sbin/bsdconfig/bsdconfig.8 Tue Aug 26 10:35:32 2014 (r270656) +++ head/usr.sbin/bsdconfig/bsdconfig.8 Tue Aug 26 10:55:08 2014 (r270657) @@ -172,16 +172,27 @@ Shortcut to the Delete menu under the Vi (startup_rcconf) of startup. .It Cm startup_rcvar Shortcut to the Toggle Startup Services menu under startup. +.\" use neutral name, e.g. console_keymap instead of syscons_keymap? +.\" font (encoding) selection not applicable to vt(4)! .It Cm syscons_font Shortcut to the Font menu under console. +.\" .It Cm console_keymap +.\" Shortcut to the Keymap menu under console. .It Cm syscons_keymap Shortcut to the Keymap menu under console. +.\" .It Cm vt_repeat +.\" Shortcut to the Repeat menu under console. .It Cm syscons_repeat Shortcut to the Repeat menu under console. +.\" .It Cm vt_saver +.\" Shortcut to the Saver menu under console. .It Cm syscons_saver Shortcut to the Saver menu under console. +.\" screenmap (encoding) selection not applicable to vt(4)! .It Cm syscons_screenmap Shortcut to the Screenmap menu under console. +.\" .It Cm vt_syscons_ttys +.\" Shortcut to the Ttys menu under console. .It Cm syscons_ttys Shortcut to the Ttys menu under console. .It Cm timezone Modified: head/usr.sbin/bsdinstall/bsdinstall.8 == --- head/usr.sbin/bsdinstall/bsdinstall.8 Tue Aug 26 10:35:32 2014 (r270656) +++ head/usr.sbin/bsdinstall/bsdinstall.8 Tue Aug 26 10:55:08 2014 (r270657) @@ -95,6 +95,8 @@ for more information on this target. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 +or +.Xr vt 4 console, asks the user to set the current keymap, and saves the result to the new system's .Pa rc.conf . Modified: head/usr.sbin/kbdmap/kbdmap.1 == --- head/usr.sbin/kbdmap/kbdmap.1 Tue Aug 26 10:35:32 2014 (r270656) +++ head/usr.sbin/kbdmap/kbdmap.1 Tue Aug 26 10:55:08 2014 (r270657) @@ -29,7 +29,7 @@ .Sh NAME .Nm kbdmap , .Nm vidfont -.Nd front end for syscons +.Nd front end for syscons and vt .Sh SYNOPSIS .Nm .Op Fl K @@ -106,8 +106,10 @@ preferred language .Sh FILES .Bl -tag -width ".Pa /usr/share/syscons/keymaps/INDEX.keymaps" -compact .It Pa /usr/share/syscons/keymaps/INDEX.keymaps +.It Pa /usr/share/vt/keymaps/INDEX.keymaps database for keymaps .It Pa /usr/share/syscons/fonts/INDEX.fonts +.It Pa /usr/share/vt/fonts/INDEX.fonts database for fonts .It Pa /etc/rc.conf default font @@ -120,6 +122,8 @@ values .Xr dialog 1 , .Xr kbdcontrol 1 , .Xr vidcontrol 1 , +.Xr syscons 4 , +.Xr vt 4 , .Xr kbdmap 5 , .Xr rc.conf 5 .Sh HISTORY ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270656 - stable/9/usr.sbin/ndp
Author: ae
Date: Tue Aug 26 10:35:32 2014
New Revision: 270656
URL: http://svnweb.freebsd.org/changeset/base/270656
Log:
MFC r265778 (by melifaro):
Fix ndp(8) -f flag parsing
PR: bin/136661
MFC r268827 (by peter):
Fix "ndp -d hostname".
Modified:
stable/9/usr.sbin/ndp/ndp.8
stable/9/usr.sbin/ndp/ndp.c
Directory Properties:
stable/9/usr.sbin/ndp/ (props changed)
Modified: stable/9/usr.sbin/ndp/ndp.8
==
--- stable/9/usr.sbin/ndp/ndp.8 Tue Aug 26 10:32:08 2014(r270655)
+++ stable/9/usr.sbin/ndp/ndp.8 Tue Aug 26 10:35:32 2014(r270656)
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd Jan 10, 2013
+.Dd May 9, 2014
.Dt NDP 8
.Os
.\"
@@ -136,9 +136,26 @@ seconds.
Erase all the NDP entries.
.It Fl d
Delete specified NDP entry.
-.It Fl f
-Parse the file specified by
-.Ar filename .
+.It Fl f Ar filename
+Cause the file
+.Ar filename
+to be read and multiple entries to be set in the
+.Tn NDP
+table.
+Entries
+in the file should be of the form
+.Pp
+.Bd -ragged -offset indent -compact
+.Ar hostname ether_addr
+.Op Cm temp
+.Op Cm proxy
+.Ed
+.Pp
+with argument meanings as given above.
+Leading whitespace and empty lines are ignored.
+A
+.Ql #
+character will mark the rest of the line as a comment.
.It Fl H
Harmonize consistency between the routing table and the default router
list; install the top entry of the list into the kernel routing table.
Modified: stable/9/usr.sbin/ndp/ndp.c
==
--- stable/9/usr.sbin/ndp/ndp.c Tue Aug 26 10:32:08 2014(r270655)
+++ stable/9/usr.sbin/ndp/ndp.c Tue Aug 26 10:35:32 2014(r270656)
@@ -97,6 +97,7 @@
#include
+#include
#include
#include
#include
@@ -131,7 +132,7 @@ char host_buf[NI_MAXHOST]; /* getnamein
char ifix_buf[IFNAMSIZ]; /* if_indextoname() */
int main(int, char **);
-int file(char *);
+static int file(char *);
void getsocket(void);
int set(int, char **);
void get(char *);
@@ -194,9 +195,10 @@ main(argc, argv)
mode = ch;
arg = NULL;
break;
- case 'd':
case 'f':
- case 'i' :
+ exit(file(optarg) ? 1 : 0);
+ case 'd':
+ case 'i':
if (mode) {
usage();
/*NOTREACHED*/
@@ -319,18 +321,16 @@ main(argc, argv)
/*
* Process a file to set standard ndp entries
*/
-int
+static int
file(name)
char *name;
{
FILE *fp;
int i, retval;
- char line[100], arg[5][50], *args[5];
+ char line[100], arg[5][50], *args[5], *p;
- if ((fp = fopen(name, "r")) == NULL) {
- fprintf(stderr, "ndp: cannot open %s\n", name);
- exit(1);
- }
+ if ((fp = fopen(name, "r")) == NULL)
+ err(1, "cannot open %s", name);
args[0] = &arg[0][0];
args[1] = &arg[1][0];
args[2] = &arg[2][0];
@@ -338,10 +338,15 @@ file(name)
args[4] = &arg[4][0];
retval = 0;
while (fgets(line, sizeof(line), fp) != NULL) {
+ if ((p = strchr(line, '#')) != NULL)
+ *p = '\0';
+ for (p = line; isblank(*p); p++);
+ if (*p == '\n' || *p == '\0')
+ continue;
i = sscanf(line, "%49s %49s %49s %49s %49s",
arg[0], arg[1], arg[2], arg[3], arg[4]);
if (i < 2) {
- fprintf(stderr, "ndp: bad line: %s\n", line);
+ warnx("bad line: %s", line);
retval = 1;
continue;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270655 - stable/10/usr.sbin/ndp
Author: ae
Date: Tue Aug 26 10:32:08 2014
New Revision: 270655
URL: http://svnweb.freebsd.org/changeset/base/270655
Log:
MFC r265778 (by melifaro):
Fix ndp(8) -f flag parsing
PR: bin/136661
MFC r268827 (by peter):
Fix "ndp -d hostname".
Modified:
stable/10/usr.sbin/ndp/ndp.8
stable/10/usr.sbin/ndp/ndp.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/ndp/ndp.8
==
--- stable/10/usr.sbin/ndp/ndp.8Tue Aug 26 10:22:59 2014
(r270654)
+++ stable/10/usr.sbin/ndp/ndp.8Tue Aug 26 10:32:08 2014
(r270655)
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd Jan 10, 2013
+.Dd May 9, 2014
.Dt NDP 8
.Os
.\"
@@ -136,9 +136,26 @@ seconds.
Erase all the NDP entries.
.It Fl d
Delete specified NDP entry.
-.It Fl f
-Parse the file specified by
-.Ar filename .
+.It Fl f Ar filename
+Cause the file
+.Ar filename
+to be read and multiple entries to be set in the
+.Tn NDP
+table.
+Entries
+in the file should be of the form
+.Pp
+.Bd -ragged -offset indent -compact
+.Ar hostname ether_addr
+.Op Cm temp
+.Op Cm proxy
+.Ed
+.Pp
+with argument meanings as given above.
+Leading whitespace and empty lines are ignored.
+A
+.Ql #
+character will mark the rest of the line as a comment.
.It Fl H
Harmonize consistency between the routing table and the default router
list; install the top entry of the list into the kernel routing table.
Modified: stable/10/usr.sbin/ndp/ndp.c
==
--- stable/10/usr.sbin/ndp/ndp.cTue Aug 26 10:22:59 2014
(r270654)
+++ stable/10/usr.sbin/ndp/ndp.cTue Aug 26 10:32:08 2014
(r270655)
@@ -97,6 +97,7 @@
#include
+#include
#include
#include
#include
@@ -131,7 +132,7 @@ char host_buf[NI_MAXHOST]; /* getnamein
char ifix_buf[IFNAMSIZ]; /* if_indextoname() */
int main(int, char **);
-int file(char *);
+static int file(char *);
void getsocket(void);
int set(int, char **);
void get(char *);
@@ -194,9 +195,10 @@ main(argc, argv)
mode = ch;
arg = NULL;
break;
- case 'd':
case 'f':
- case 'i' :
+ exit(file(optarg) ? 1 : 0);
+ case 'd':
+ case 'i':
if (mode) {
usage();
/*NOTREACHED*/
@@ -319,18 +321,16 @@ main(argc, argv)
/*
* Process a file to set standard ndp entries
*/
-int
+static int
file(name)
char *name;
{
FILE *fp;
int i, retval;
- char line[100], arg[5][50], *args[5];
+ char line[100], arg[5][50], *args[5], *p;
- if ((fp = fopen(name, "r")) == NULL) {
- fprintf(stderr, "ndp: cannot open %s\n", name);
- exit(1);
- }
+ if ((fp = fopen(name, "r")) == NULL)
+ err(1, "cannot open %s", name);
args[0] = &arg[0][0];
args[1] = &arg[1][0];
args[2] = &arg[2][0];
@@ -338,10 +338,15 @@ file(name)
args[4] = &arg[4][0];
retval = 0;
while (fgets(line, sizeof(line), fp) != NULL) {
+ if ((p = strchr(line, '#')) != NULL)
+ *p = '\0';
+ for (p = line; isblank(*p); p++);
+ if (*p == '\n' || *p == '\0')
+ continue;
i = sscanf(line, "%49s %49s %49s %49s %49s",
arg[0], arg[1], arg[2], arg[3], arg[4]);
if (i < 2) {
- fprintf(stderr, "ndp: bad line: %s\n", line);
+ warnx("bad line: %s", line);
retval = 1;
continue;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270653 - head/usr.sbin/kbdcontrol
Author: se Date: Tue Aug 26 09:40:14 2014 New Revision: 270653 URL: http://svnweb.freebsd.org/changeset/base/270653 Log: Update man-pages to correctly refer to changed pathes and naming conventions for systems with vt(4) consoles. MFC after:3 days Modified: head/usr.sbin/kbdcontrol/kbdcontrol.1 head/usr.sbin/kbdcontrol/kbdmap.5 Modified: head/usr.sbin/kbdcontrol/kbdcontrol.1 == --- head/usr.sbin/kbdcontrol/kbdcontrol.1 Tue Aug 26 09:37:43 2014 (r270652) +++ head/usr.sbin/kbdcontrol/kbdcontrol.1 Tue Aug 26 09:40:14 2014 (r270653) @@ -1,5 +1,5 @@ .\" -.\" kbdcontrol - a utility for manipulating the syscons keyboard driver section +.\" kbdcontrol - a utility for manipulating the syscons or vt keyboard driver section .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -41,6 +41,8 @@ The .Nm command is used to set various keyboard related options for the .Xr syscons 4 +or +.Xr vt 4 console driver and the keyboard drivers, such as key map, keyboard repeat and delay rates, bell characteristics etc. @@ -213,7 +215,9 @@ for details. .Sh FILES .Bl -tag -width /usr/share/syscons/keymaps/foo_bar -compact .It Pa /usr/share/syscons/keymaps/* -keyboard map files +keyboard map files for syscons +.It Pa /usr/share/vt/keymaps/* +keyboard map files for vt .El .Sh EXAMPLES The following command will load the keyboard map file @@ -222,9 +226,19 @@ The following command will load the keyb .Dl kbdcontrol -l /usr/share/syscons/keymaps/ru.koi8-r.kbd .Pp So long as the keyboard map file resides in -.Pa /usr/share/syscons/keymaps , +.Pa /usr/share/syscons/keymaps +(if using +.Xr syscons 4 ) or +.Pa /usr/share/vt/keymaps +(if using +.Xr vt 4 ) , you may abbreviate the file name as .Pa ru.koi8-r . +Since +.Xr vt 4 +uses Unicode, the corresponding keyboard file names omit the encoding +and typically are just a country code, e.g.\& +.Pa ru . .Pp .Dl kbdcontrol -l ru.koi8-r .Pp @@ -268,6 +282,7 @@ kbdcontrol -k /dev/kbdmux0 < /dev/consol .Xr screen 4 , .Xr syscons 4 , .Xr ukbd 4 , +.Xr vt 4 , .Xr kbdmap 5 , .Xr rc.conf 5 .Sh AUTHORS Modified: head/usr.sbin/kbdcontrol/kbdmap.5 == --- head/usr.sbin/kbdcontrol/kbdmap.5 Tue Aug 26 09:37:43 2014 (r270652) +++ head/usr.sbin/kbdcontrol/kbdmap.5 Tue Aug 26 09:40:14 2014 (r270653) @@ -313,13 +313,16 @@ for that vowel with a grave accent. .Sh FILES .Bl -tag -width /usr/share/syscons/keymaps/* -compact .It Pa /usr/share/syscons/keymaps/* -standard keyboard map files +standard keyboard map files for syscons +.It Pa /usr/share/vt/keymaps/* +standard keyboard map files for vt .El .Sh SEE ALSO .Xr kbdcontrol 1 , .Xr kbdmap 1 , .Xr keyboard 4 , .Xr syscons 4 , +.Xr vt 4 , .Xr ascii 7 .Sh HISTORY This manual page first appeared in ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270652 - head/usr.sbin/kbdcontrol
Author: se
Date: Tue Aug 26 09:37:43 2014
New Revision: 270652
URL: http://svnweb.freebsd.org/changeset/base/270652
Log:
Remove band.aid that made kbdcontrol lookup keymap files in the syscons
path even under vt, which is no longer useful, since the syscons keymap
files have been converted and committed for use by vt.
Modified:
head/usr.sbin/kbdcontrol/kbdcontrol.c
Modified: head/usr.sbin/kbdcontrol/kbdcontrol.c
==
--- head/usr.sbin/kbdcontrol/kbdcontrol.c Tue Aug 26 09:12:41 2014
(r270651)
+++ head/usr.sbin/kbdcontrol/kbdcontrol.c Tue Aug 26 09:37:43 2014
(r270652)
@@ -800,7 +800,7 @@ load_keymap(char *opt, int dumponly)
char*name, *cp;
charblank[] = "", keymap_path[] = KEYMAP_PATH;
charvt_keymap_path[] = VT_KEYMAP_PATH, dotkbd[] = ".kbd";
- char*prefix[] = {blank, blank, blank, keymap_path, NULL};
+ char*prefix[] = {blank, blank, keymap_path, NULL};
char*postfix[] = {blank, dotkbd, NULL};
if (is_vt4())
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270651 - head/share/mk
Author: ngie
Date: Tue Aug 26 09:12:41 2014
New Revision: 270651
URL: http://svnweb.freebsd.org/changeset/base/270651
Log:
Introduce missing definition for LIBTERMCAPW
Some Makefiles expect this value to exist
Approved by: rpaulo (mentor)
MFC after: 5 days
Phabric: D675 (as part of a larger diff)
PR: 192762
Modified:
head/share/mk/bsd.libnames.mk
Modified: head/share/mk/bsd.libnames.mk
==
--- head/share/mk/bsd.libnames.mk Tue Aug 26 09:10:28 2014
(r270650)
+++ head/share/mk/bsd.libnames.mk Tue Aug 26 09:12:41 2014
(r270651)
@@ -137,6 +137,7 @@ LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.
LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a
LIBTERMCAP?= ${DESTDIR}${LIBDIR}/libtermcap.a
+LIBTERMCAPW?= ${DESTDIR}${LIBDIR}/libtermcapw.a
LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP"
LIBTINFO?= "don't use LIBTINFO, use LIBNCURSES"
LIBUFS?= ${DESTDIR}${LIBDIR}/libufs.a
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270650 - in head: usr.bin/bc usr.bin/clang/lldb usr.bin/talk usr.sbin/gstat
Author: ngie
Date: Tue Aug 26 09:10:28 2014
New Revision: 270650
URL: http://svnweb.freebsd.org/changeset/base/270650
Log:
Convert LIBCURSES to LIBNCURSES to fix "make checkdpadd"
Also, add a missing LIBPANEL dependency for lldb
Approved by: rpaulo (mentor)
Suggested by: brooks
MFC after: 5 days
Phabric: D675 (as part of a larger diff)
PR: 192762
Modified:
head/usr.bin/bc/Makefile
head/usr.bin/clang/lldb/Makefile
head/usr.bin/talk/Makefile
head/usr.sbin/gstat/Makefile
Modified: head/usr.bin/bc/Makefile
==
--- head/usr.bin/bc/MakefileTue Aug 26 09:01:11 2014(r270649)
+++ head/usr.bin/bc/MakefileTue Aug 26 09:10:28 2014(r270650)
@@ -5,8 +5,8 @@ PROG= bc
SRCS= bc.y scan.l tty.c
CFLAGS+= -I. -I${.CURDIR}
-LDADD+=-ledit -lcurses
-DPADD+=${LIBEDIT} ${LIBCURSES}
+DPADD+=${LIBEDIT} ${LIBNCURSESW}
+LDADD+=-ledit -lncursesw
NO_WMISSING_VARIABLE_DECLARATIONS=
Modified: head/usr.bin/clang/lldb/Makefile
==
--- head/usr.bin/clang/lldb/MakefileTue Aug 26 09:01:11 2014
(r270649)
+++ head/usr.bin/clang/lldb/MakefileTue Aug 26 09:10:28 2014
(r270650)
@@ -16,8 +16,8 @@ SRCS= Driver.cpp \
lldb.1:
ln -fs ${LLDB_SRCS}/docs/lldb.1 ${.TARGET}
-DPADD= ${LIBEDIT} ${LIBCURSES} ${LIBEXECINFO}
-LDADD= -lcurses -ledit -lexecinfo -lpanel
+DPADD= ${LIBEDIT} ${LIBNCURSESW} ${LIBEXECINFO} ${LIBPANEL}
+LDADD= -ledit -lncursesw -lexecinfo -lpanel
LLDB_LIBS=\
lldb \
Modified: head/usr.bin/talk/Makefile
==
--- head/usr.bin/talk/Makefile Tue Aug 26 09:01:11 2014(r270649)
+++ head/usr.bin/talk/Makefile Tue Aug 26 09:10:28 2014(r270650)
@@ -4,7 +4,7 @@
PROG= talk
SRCS= ctl.c ctl_transact.c display.c get_addrs.c get_iface.c get_names.c \
init_disp.c invite.c io.c look_up.c msgs.c talk.c
-DPADD= ${LIBCURSESW}
-LDADD= -lcursesw
+DPADD= ${LIBNCURSESW}
+LDADD= -lncursesw
.include
Modified: head/usr.sbin/gstat/Makefile
==
--- head/usr.sbin/gstat/MakefileTue Aug 26 09:01:11 2014
(r270649)
+++ head/usr.sbin/gstat/MakefileTue Aug 26 09:10:28 2014
(r270650)
@@ -2,7 +2,7 @@
PROG= gstat
MAN= gstat.8
-DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBEDIT}
${LIBCURSES}
-LDADD= -ldevstat -lkvm -lgeom -lbsdxml -lsbuf -ledit -lcurses
+DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBEDIT}
${LIBNCURSESW}
+LDADD= -ldevstat -lkvm -lgeom -lbsdxml -lsbuf -ledit -lncursesw
.include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270649 - head/libexec/rtld-elf/tests/target
Author: ngie
Date: Tue Aug 26 09:01:11 2014
New Revision: 270649
URL: http://svnweb.freebsd.org/changeset/base/270649
Log:
Fix "make checkdpadd" by "spoofing" DPADD
Approved by: jmmv (mentor)
Phabric: D631
PR: 192769
Modified:
head/libexec/rtld-elf/tests/target/Makefile
Modified: head/libexec/rtld-elf/tests/target/Makefile
==
--- head/libexec/rtld-elf/tests/target/Makefile Tue Aug 26 08:17:22 2014
(r270648)
+++ head/libexec/rtld-elf/tests/target/Makefile Tue Aug 26 09:01:11 2014
(r270649)
@@ -8,6 +8,7 @@ BINDIR= ${TESTSBASE}/libexec/rtld-elf
CFLAGS+= -I${.CURDIR}/../libpythagoras
LDFLAGS+= -L${.OBJDIR}/../libpythagoras
+DPADD+=${.OBJDIR}/../libpythagoras/libpythagoras.a
LDADD= -lpythagoras
MAN=
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270647 - in head: etc/defaults share/man/man4 share/man/man5 share/man/man7 share/man/man8
On Tue, Aug 26, 2014 at 08:13:30AM +, Stefan Esser wrote: > Author: se > Date: Tue Aug 26 08:13:30 2014 > New Revision: 270647 > URL: http://svnweb.freebsd.org/changeset/base/270647 > > Log: > Add references to vt(4) and the configuration files in /usr7share/vt where > appropriate (i.e. where syscons was already mentioned and vt supports the > feature). Comments in defaults/rc.conf are updated to match the contents > of the modified man-page rc.conf(5). > > Reviewed by:pluknet, emaste > MFC after: 3 days > <...> > Modified: head/share/man/man4/splash.4 > == > --- head/share/man/man4/splash.4 Tue Aug 26 06:31:52 2014 > (r270646) > +++ head/share/man/man4/splash.4 Tue Aug 26 08:13:30 2014 > (r270647) > @@ -245,6 +245,7 @@ bitmap_name="/boot/splash.bin" > .Xr vidcontrol 1 , > .Xr syscons 4 , > .Xr vga 4 , > +.Xr vt 4 , > .Xr loader.conf 5 , > .Xr rc.conf 5 , > .Xr kldload 8 , > @@ -285,6 +286,8 @@ code. > .Sh CAVEATS > Both the splash screen and the screen saver work with > .Xr syscons 4 > + or > +.Xr vt 4 > only. > .Sh BUGS > If you load a screen saver while another screen saver has already > That information is incorrect; vt(4) has only very limited splash screen support and doesn't interface with splash(4) for that. Screen saver support even is entirely nonexistent with vt(4) to date. Marius ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270648 - in head/sys: kern sys
Author: mjg
Date: Tue Aug 26 08:17:22 2014
New Revision: 270648
URL: http://svnweb.freebsd.org/changeset/base/270648
Log:
Fix up races with f_seqcount handling.
It was possible that the kernel would overwrite user-supplied hint.
Abuse vnode lock for this purpose.
In collaboration with: kib
MFC after:1 week
Modified:
head/sys/kern/kern_descrip.c
head/sys/kern/vfs_vnops.c
head/sys/sys/file.h
Modified: head/sys/kern/kern_descrip.c
==
--- head/sys/kern/kern_descrip.cTue Aug 26 08:13:30 2014
(r270647)
+++ head/sys/kern/kern_descrip.cTue Aug 26 08:17:22 2014
(r270648)
@@ -476,7 +476,6 @@ kern_fcntl(struct thread *td, int fd, in
struct vnode *vp;
cap_rights_t rights;
int error, flg, tmp;
- u_int old, new;
uint64_t bsize;
off_t foffset;
@@ -760,26 +759,24 @@ kern_fcntl(struct thread *td, int fd, in
error = EBADF;
break;
}
+ vp = fp->f_vnode;
+ /*
+* Exclusive lock synchronizes against f_seqcount reads and
+* writes in sequential_heuristic().
+*/
+ error = vn_lock(vp, LK_EXCLUSIVE);
+ if (error != 0) {
+ fdrop(fp, td);
+ break;
+ }
if (arg >= 0) {
- vp = fp->f_vnode;
- error = vn_lock(vp, LK_SHARED);
- if (error != 0) {
- fdrop(fp, td);
- break;
- }
bsize = fp->f_vnode->v_mount->mnt_stat.f_iosize;
- VOP_UNLOCK(vp, 0);
fp->f_seqcount = (arg + bsize - 1) / bsize;
- do {
- new = old = fp->f_flag;
- new |= FRDAHEAD;
- } while (!atomic_cmpset_rel_int(&fp->f_flag, old, new));
+ atomic_set_int(&fp->f_flag, FRDAHEAD);
} else {
- do {
- new = old = fp->f_flag;
- new &= ~FRDAHEAD;
- } while (!atomic_cmpset_rel_int(&fp->f_flag, old, new));
+ atomic_clear_int(&fp->f_flag, FRDAHEAD);
}
+ VOP_UNLOCK(vp, 0);
fdrop(fp, td);
break;
Modified: head/sys/kern/vfs_vnops.c
==
--- head/sys/kern/vfs_vnops.c Tue Aug 26 08:13:30 2014(r270647)
+++ head/sys/kern/vfs_vnops.c Tue Aug 26 08:17:22 2014(r270648)
@@ -438,7 +438,8 @@ static int
sequential_heuristic(struct uio *uio, struct file *fp)
{
- if (atomic_load_acq_int(&(fp->f_flag)) & FRDAHEAD)
+ ASSERT_VOP_LOCKED(fp->f_vnode, __func__);
+ if (fp->f_flag & FRDAHEAD)
return (fp->f_seqcount << IO_SEQSHIFT);
/*
Modified: head/sys/sys/file.h
==
--- head/sys/sys/file.h Tue Aug 26 08:13:30 2014(r270647)
+++ head/sys/sys/file.h Tue Aug 26 08:17:22 2014(r270648)
@@ -143,6 +143,7 @@ struct fileops {
*
* Below is the list of locks that protects members in struct file.
*
+ * (a) f_vnode lock required (shared allows both reads and writes)
* (f) protected with mtx_lock(mtx_pool_find(fp))
* (d) cdevpriv_mtx
* nonenot locked
@@ -168,7 +169,7 @@ struct file {
/*
* DTYPE_VNODE specific fields.
*/
- int f_seqcount; /* Count of sequential accesses. */
+ int f_seqcount; /* (a) Count of sequential accesses. */
off_t f_nextoff; /* next expected read/write offset. */
union {
struct cdev_privdata *fvn_cdevpriv;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270647 - in head: etc/defaults share/man/man4 share/man/man5 share/man/man7 share/man/man8
Author: se
Date: Tue Aug 26 08:13:30 2014
New Revision: 270647
URL: http://svnweb.freebsd.org/changeset/base/270647
Log:
Add references to vt(4) and the configuration files in /usr7share/vt where
appropriate (i.e. where syscons was already mentioned and vt supports the
feature). Comments in defaults/rc.conf are updated to match the contents
of the modified man-page rc.conf(5).
Reviewed by: pluknet, emaste
MFC after:3 days
Modified:
head/etc/defaults/rc.conf
head/share/man/man4/atkbd.4
head/share/man/man4/kbdmux.4
head/share/man/man4/splash.4
head/share/man/man4/ukbd.4
head/share/man/man4/vkbd.4
head/share/man/man4/vt.4
head/share/man/man5/rc.conf.5
head/share/man/man7/hier.7
head/share/man/man8/nanobsd.8
Modified: head/etc/defaults/rc.conf
==
--- head/etc/defaults/rc.conf Tue Aug 26 06:31:52 2014(r270646)
+++ head/etc/defaults/rc.conf Tue Aug 26 08:13:30 2014(r270647)
@@ -516,15 +516,15 @@ ip6addrctl_policy="AUTO" # A pre-defined
##
keyboard=""# keyboard device to use (default /dev/kbd0).
-keymap="NO"# keymap in /usr/share/syscons/keymaps/* (or NO).
+keymap="NO"# keymap in /usr/share/{syscons,vt}/keymaps/* (or NO).
keyrate="NO" # keyboard rate to: slow, normal, fast (or NO).
keybell="NO" # See kbdcontrol(1) for options. Use "off" to disable.
keychange="NO" # function keys default values (or NO).
cursor="NO"# cursor type {normal|blink|destructive} (or NO).
scrnmap="NO" # screen map in /usr/share/syscons/scrnmaps/* (or NO).
-font8x16="NO" # font 8x16 from /usr/share/syscons/fonts/* (or NO).
-font8x14="NO" # font 8x14 from /usr/share/syscons/fonts/* (or NO).
-font8x8="NO" # font 8x8 from /usr/share/syscons/fonts/* (or NO).
+font8x16="NO" # font 8x16 from /usr/share/{syscons,vt}/fonts/* (or
NO).
+font8x14="NO" # font 8x14 from /usr/share/{syscons,vt}/fonts/* (or
NO).
+font8x8="NO" # font 8x8 from /usr/share/{syscons,vt}/fonts/* (or NO).
blanktime="300"# blank time (in seconds) or "NO" to turn it
off.
saver="NO" # screen saver: Uses /boot/kernel/${saver}_saver.ko
moused_nondefault_enable="YES" # Treat non-default mice as enabled unless
Modified: head/share/man/man4/atkbd.4
==
--- head/share/man/man4/atkbd.4 Tue Aug 26 06:31:52 2014(r270646)
+++ head/share/man/man4/atkbd.4 Tue Aug 26 08:13:30 2014(r270647)
@@ -51,7 +51,9 @@ driver, provides access to the AT 84 key
which is connected to the AT keyboard controller.
.Pp
This driver is required for the console driver
-.Xr syscons 4 .
+.Xr syscons 4
+or
+.Xr vt 4 .
.Pp
There can be only one
.Nm
@@ -211,6 +213,7 @@ In both cases, you also need to have fol
.Xr atkbdc 4 ,
.Xr psm 4 ,
.Xr syscons 4 ,
+.Xr vt 4 ,
.Xr kbdmap 5 ,
.Xr loader 8
.Sh HISTORY
Modified: head/share/man/man4/kbdmux.4
==
--- head/share/man/man4/kbdmux.4Tue Aug 26 06:31:52 2014
(r270646)
+++ head/share/man/man4/kbdmux.4Tue Aug 26 08:13:30 2014
(r270647)
@@ -34,7 +34,8 @@ utility.
.Xr kbdcontrol 1 ,
.Xr atkbd 4 ,
.Xr syscons 4 ,
-.Xr ukbd 4
+.Xr ukbd 4 ,
+.Xr vt 4
.Sh HISTORY
The
.Nm
Modified: head/share/man/man4/splash.4
==
--- head/share/man/man4/splash.4Tue Aug 26 06:31:52 2014
(r270646)
+++ head/share/man/man4/splash.4Tue Aug 26 08:13:30 2014
(r270647)
@@ -245,6 +245,7 @@ bitmap_name="/boot/splash.bin"
.Xr vidcontrol 1 ,
.Xr syscons 4 ,
.Xr vga 4 ,
+.Xr vt 4 ,
.Xr loader.conf 5 ,
.Xr rc.conf 5 ,
.Xr kldload 8 ,
@@ -285,6 +286,8 @@ code.
.Sh CAVEATS
Both the splash screen and the screen saver work with
.Xr syscons 4
+ or
+.Xr vt 4
only.
.Sh BUGS
If you load a screen saver while another screen saver has already
Modified: head/share/man/man4/ukbd.4
==
--- head/share/man/man4/ukbd.4 Tue Aug 26 06:31:52 2014(r270646)
+++ head/share/man/man4/ukbd.4 Tue Aug 26 08:13:30 2014(r270647)
@@ -127,7 +127,9 @@ Make the keyboards available through a c
The above lines will put the French ISO keymap in the ukbd driver.
You can specify any keymap in
.Pa /usr/share/syscons/keymaps
-with this option.
+or
+.Pa /usr/share/vt/keymaps
+(depending on the console driver being used) with this option.
.Pp
.D1 Cd "options KBD_DISABLE_KEYMAP_LOADING"
.Pp
@@ -151,6 +153,7 @@ driver to the kernel.
.Xr syscons 4 ,
.Xr uhci 4 ,
.Xr usb 4 ,
+.Xr vt 4 ,
.Xr config 8
.Sh AUTHORS
.An -nosplit
Modified: head/share/man
Re: svn commit: r270516 - head/sys/dev/drm2/i915
On Mon, Aug 25, 2014 at 05:03:10AM +, Adrian Chadd wrote: A> Author: adrian A> Date: Mon Aug 25 05:03:10 2014 A> New Revision: 270516 A> URL: http://svnweb.freebsd.org/changeset/base/270516 A> A> Log: A> i915 driver - enable opregion handle; program CADL. A> A> add opregion handling for drm2 - which exposes some ACPI video configuration A> pieces that some Lenovo laptop models use to flesh out which video device A> to speak to. This enables the brightness control in ACPI to work these models. A> A> The CADL bits are also important - it's used to figure out which ACPI A> events to hook the brightness buttons into. It doesn't yet seem to work A> for me, but it does for the OP. A> A> Tested: A> A> * Lenovo X230 (mine) A> * OP: ASUS UX51VZ Works on Lenovo X1 Carbon! Thanks a lot, Adrian and Henry!!! -- Totus tuus, Glebius. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
