Deleted Added
full compact
kern_intr.c (113629) kern_intr.c (114471)
1/*
2 * Copyright (c) 1997, Stefan Esser <se@freebsd.org>
3 * 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

--- 9 unchanged lines hidden (view full) ---

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
1/*
2 * Copyright (c) 1997, Stefan Esser <se@freebsd.org>
3 * 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

--- 9 unchanged lines hidden (view full) ---

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/kern/kern_intr.c 113629 2003-04-17 22:25:35Z jhb $
26 * $FreeBSD: head/sys/kern/kern_intr.c 114471 2003-05-02 00:33:12Z julian $
27 *
28 */
29
30
31#include <sys/param.h>
32#include <sys/bus.h>
33#include <sys/conf.h>
34#include <sys/rtprio.h>

--- 357 unchanged lines hidden (view full) ---

392 CTR2(KTR_INTR, "%s: setrunqueue %d", __func__, p->p_pid);
393 TD_CLR_IWAIT(td);
394 setrunqueue(td);
395 if (do_switch &&
396 (ctd->td_critnest == 1) ) {
397 KASSERT((TD_IS_RUNNING(ctd)),
398 ("ithread_schedule: Bad state for curthread."));
399 ctd->td_proc->p_stats->p_ru.ru_nivcsw++;
27 *
28 */
29
30
31#include <sys/param.h>
32#include <sys/bus.h>
33#include <sys/conf.h>
34#include <sys/rtprio.h>

--- 357 unchanged lines hidden (view full) ---

392 CTR2(KTR_INTR, "%s: setrunqueue %d", __func__, p->p_pid);
393 TD_CLR_IWAIT(td);
394 setrunqueue(td);
395 if (do_switch &&
396 (ctd->td_critnest == 1) ) {
397 KASSERT((TD_IS_RUNNING(ctd)),
398 ("ithread_schedule: Bad state for curthread."));
399 ctd->td_proc->p_stats->p_ru.ru_nivcsw++;
400 if (ctd->td_kse->ke_flags & KEF_IDLEKSE)
400 if (ctd->td_flags & TDF_IDLETD)
401 ctd->td_state = TDS_CAN_RUN; /* XXXKSE */
402 mi_switch();
403 } else {
404 curthread->td_flags |= TDF_NEEDRESCHED;
405 }
406 } else {
407 CTR4(KTR_INTR, "%s: pid %d: it_need %d, state %d",
408 __func__, p->p_pid, ithread->it_need, td->td_state);

--- 206 unchanged lines hidden ---
401 ctd->td_state = TDS_CAN_RUN; /* XXXKSE */
402 mi_switch();
403 } else {
404 curthread->td_flags |= TDF_NEEDRESCHED;
405 }
406 } else {
407 CTR4(KTR_INTR, "%s: pid %d: it_need %d, state %d",
408 __func__, p->p_pid, ithread->it_need, td->td_state);

--- 206 unchanged lines hidden ---