| kern_synch.c (50477) | kern_synch.c (51791) |
|---|---|
| 1/*- 2 * Copyright (c) 1982, 1986, 1990, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 | 1/*- 2 * Copyright (c) 1982, 1986, 1990, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 |
| 39 * $FreeBSD: head/sys/kern/kern_synch.c 50477 1999-08-28 01:08:13Z peter $ | 39 * $FreeBSD: head/sys/kern/kern_synch.c 51791 1999-09-29 15:03:48Z marcel $ |
| 40 */ 41 42#include "opt_ktrace.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/proc.h> 47#include <sys/kernel.h> --- 406 unchanged lines hidden (view full) --- 454 } 455 } else if (timo) 456 untimeout(endtsleep, (void *)p, thandle); 457 if (catch && (sig != 0 || (sig = CURSIG(p)))) { 458#ifdef KTRACE 459 if (KTRPOINT(p, KTR_CSW)) 460 ktrcsw(p->p_tracep, 0, 0); 461#endif | 40 */ 41 42#include "opt_ktrace.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/proc.h> 47#include <sys/kernel.h> --- 406 unchanged lines hidden (view full) --- 454 } 455 } else if (timo) 456 untimeout(endtsleep, (void *)p, thandle); 457 if (catch && (sig != 0 || (sig = CURSIG(p)))) { 458#ifdef KTRACE 459 if (KTRPOINT(p, KTR_CSW)) 460 ktrcsw(p->p_tracep, 0, 0); 461#endif |
| 462 if (p->p_sigacts->ps_sigintr & sigmask(sig)) | 462 if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) |
| 463 return (EINTR); 464 return (ERESTART); 465 } 466#ifdef KTRACE 467 if (KTRPOINT(p, KTR_CSW)) 468 ktrcsw(p->p_tracep, 0, 0); 469#endif 470 return (0); --- 123 unchanged lines hidden (view full) --- 594 } 595 } else if (timo) 596 untimeout(endtsleep, (void *)p, thandle); 597 if (catch && (sig != 0 || (sig = CURSIG(p)))) { 598#ifdef KTRACE 599 if (KTRPOINT(p, KTR_CSW)) 600 ktrcsw(p->p_tracep, 0, 0); 601#endif | 463 return (EINTR); 464 return (ERESTART); 465 } 466#ifdef KTRACE 467 if (KTRPOINT(p, KTR_CSW)) 468 ktrcsw(p->p_tracep, 0, 0); 469#endif 470 return (0); --- 123 unchanged lines hidden (view full) --- 594 } 595 } else if (timo) 596 untimeout(endtsleep, (void *)p, thandle); 597 if (catch && (sig != 0 || (sig = CURSIG(p)))) { 598#ifdef KTRACE 599 if (KTRPOINT(p, KTR_CSW)) 600 ktrcsw(p->p_tracep, 0, 0); 601#endif |
| 602 if (p->p_sigacts->ps_sigintr & sigmask(sig)) | 602 if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) |
| 603 return (EINTR); 604 return (ERESTART); 605 } 606#ifdef KTRACE 607 if (KTRPOINT(p, KTR_CSW)) 608 ktrcsw(p->p_tracep, 0, 0); 609#endif 610 } else { --- 291 unchanged lines hidden --- | 603 return (EINTR); 604 return (ERESTART); 605 } 606#ifdef KTRACE 607 if (KTRPOINT(p, KTR_CSW)) 608 ktrcsw(p->p_tracep, 0, 0); 609#endif 610 } else { --- 291 unchanged lines hidden --- |