svn commit: r246480 - in user/attilio/vmcontention: contrib/libcxxrt lib/libc/sys share/misc sys/fs/devfs sys/kern
Attilio Rao
attilio at FreeBSD.org
Thu Feb 7 15:16:20 UTC 2013
Author: attilio
Date: Thu Feb 7 15:16:18 2013
New Revision: 246480
URL: http://svnweb.freebsd.org/changeset/base/246480
Log:
MFC
Modified:
user/attilio/vmcontention/contrib/libcxxrt/exception.cc
user/attilio/vmcontention/lib/libc/sys/open.2
user/attilio/vmcontention/share/misc/committers-src.dot
user/attilio/vmcontention/sys/fs/devfs/devfs_vnops.c
user/attilio/vmcontention/sys/kern/vfs_syscalls.c
Directory Properties:
user/attilio/vmcontention/ (props changed)
user/attilio/vmcontention/contrib/libcxxrt/ (props changed)
user/attilio/vmcontention/lib/libc/ (props changed)
user/attilio/vmcontention/sys/ (props changed)
Modified: user/attilio/vmcontention/contrib/libcxxrt/exception.cc
==============================================================================
--- user/attilio/vmcontention/contrib/libcxxrt/exception.cc Thu Feb 7 15:15:34 2013 (r246479)
+++ user/attilio/vmcontention/contrib/libcxxrt/exception.cc Thu Feb 7 15:16:18 2013 (r246480)
@@ -1387,7 +1387,7 @@ namespace std
{
if (thread_local_handlers) { return pathscale::set_unexpected(f); }
- return ATOMIC_SWAP(&terminateHandler, f);
+ return ATOMIC_SWAP(&unexpectedHandler, f);
}
/**
* Sets the function that is called to terminate the program.
Modified: user/attilio/vmcontention/lib/libc/sys/open.2
==============================================================================
--- user/attilio/vmcontention/lib/libc/sys/open.2 Thu Feb 7 15:15:34 2013 (r246479)
+++ user/attilio/vmcontention/lib/libc/sys/open.2 Thu Feb 7 15:16:18 2013 (r246480)
@@ -28,7 +28,7 @@
.\" @(#)open.2 8.2 (Berkeley) 11/16/93
.\" $FreeBSD$
.\"
-.Dd March 25, 2011
+.Dd February 7, 2013
.Dt OPEN 2
.Os
.Sh NAME
@@ -244,6 +244,17 @@ It returns \-1 on failure.
The file pointer used to mark the current position within the
file is set to the beginning of the file.
.Pp
+If a sleeping open of a device node from
+.Xr devfs 5
+is interrupted by a signal, the call always fails with
+.Er EINTR ,
+even if the
+.Dv SA_RESTART
+flag is set for the signal.
+A sleeping open of a fifo (see
+.Xr mkfifo 2 )
+is restarted as normal.
+.Pp
When a new file is created it is given the group of the directory
which contains it.
.Pp
Modified: user/attilio/vmcontention/share/misc/committers-src.dot
==============================================================================
--- user/attilio/vmcontention/share/misc/committers-src.dot Thu Feb 7 15:15:34 2013 (r246479)
+++ user/attilio/vmcontention/share/misc/committers-src.dot Thu Feb 7 15:16:18 2013 (r246480)
@@ -93,6 +93,7 @@ node [color=lightblue2, style=filled, bg
# Current src committers go here. Try to keep things sorted.
ache [label="Andrey Chernov\nache at FreeBSD.org\n1993/10/31"]
+achim [label="Achim Leubner\nachim at FreeBSD.org\n2013/01/23"]
adrian [label="Adrian Chadd\nadrian at FreeBSD.org\n2000/07/03"]
ae [label="Andrey V. Elsukov\nae at FreeBSD.org\n2010/06/03"]
akiyama [label="Shunsuke Akiyama\nakiyama at FreeBSD.org\n2000/06/19"]
@@ -380,6 +381,7 @@ ed -> uqs
eivind -> des
eivind -> rwatson
+emaste -> achim
emaste -> rstone
emaste -> dteske
emaste -> markj
@@ -616,6 +618,7 @@ sbruno -> jimharris
schweikh -> dds
+scottl -> achim
scottl -> jimharris
scottl -> pjd
scottl -> sah
Modified: user/attilio/vmcontention/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- user/attilio/vmcontention/sys/fs/devfs/devfs_vnops.c Thu Feb 7 15:15:34 2013 (r246479)
+++ user/attilio/vmcontention/sys/fs/devfs/devfs_vnops.c Thu Feb 7 15:16:18 2013 (r246480)
@@ -1089,8 +1089,11 @@ devfs_open(struct vop_open_args *ap)
vn_lock(vp, vlocked | LK_RETRY);
dev_relthread(dev, ref);
- if (error)
+ if (error != 0) {
+ if (error == ERESTART)
+ error = EINTR;
return (error);
+ }
#if 0 /* /dev/console */
KASSERT(fp != NULL, ("Could not vnode bypass device on NULL fp"));
Modified: user/attilio/vmcontention/sys/kern/vfs_syscalls.c
==============================================================================
--- user/attilio/vmcontention/sys/kern/vfs_syscalls.c Thu Feb 7 15:15:34 2013 (r246479)
+++ user/attilio/vmcontention/sys/kern/vfs_syscalls.c Thu Feb 7 15:16:18 2013 (r246480)
@@ -1106,8 +1106,6 @@ kern_openat(struct thread *td, int fd, c
goto success;
}
- if (error == ERESTART)
- error = EINTR;
goto bad;
}
td->td_dupfd = 0;
More information about the svn-src-user
mailing list