subr_log.c (41591) | subr_log.c (46568) |
---|---|
1/* 2 * Copyright (c) 1982, 1986, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)subr_log.c 8.1 (Berkeley) 6/10/93 | 1/* 2 * Copyright (c) 1982, 1986, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)subr_log.c 8.1 (Berkeley) 6/10/93 |
34 * $Id: subr_log.c,v 1.32 1998/11/11 10:55:56 truckman Exp $ | 34 * $Id: subr_log.c,v 1.33 1998/12/07 21:58:29 archie Exp $ |
35 */ 36 37/* 38 * Error log buffer for kernel printf's. 39 */ 40 41#include "opt_devfs.h" 42 --- 119 unchanged lines hidden (view full) --- 162 int events; 163 struct proc *p; 164{ 165 int s; 166 int revents = 0; 167 168 s = splhigh(); 169 | 35 */ 36 37/* 38 * Error log buffer for kernel printf's. 39 */ 40 41#include "opt_devfs.h" 42 --- 119 unchanged lines hidden (view full) --- 162 int events; 163 struct proc *p; 164{ 165 int s; 166 int revents = 0; 167 168 s = splhigh(); 169 |
170 if (events & (POLLIN | POLLRDNORM)) | 170 if (events & (POLLIN | POLLRDNORM)) { |
171 if (msgbufp->msg_bufr != msgbufp->msg_bufx) 172 revents |= events & (POLLIN | POLLRDNORM); 173 else 174 selrecord(p, &logsoftc.sc_selp); | 171 if (msgbufp->msg_bufr != msgbufp->msg_bufx) 172 revents |= events & (POLLIN | POLLRDNORM); 173 else 174 selrecord(p, &logsoftc.sc_selp); |
175 | 175 } |
176 splx(s); 177 return (revents); 178} 179 180void 181logwakeup() 182{ 183 if (!log_open) --- 91 unchanged lines hidden --- | 176 splx(s); 177 return (revents); 178} 179 180void 181logwakeup() 182{ 183 if (!log_open) --- 91 unchanged lines hidden --- |