From owner-p4-projects@FreeBSD.ORG Sun Sep 5 22:32:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2270B16A4D1; Sun, 5 Sep 2004 22:32:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBF1416A4CE for ; Sun, 5 Sep 2004 22:32:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B672643D39 for ; Sun, 5 Sep 2004 22:32:51 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i85MWpau048566 for ; Sun, 5 Sep 2004 22:32:51 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i85MWpON048563 for perforce@freebsd.org; Sun, 5 Sep 2004 22:32:51 GMT (envelope-from julian@freebsd.org) Date: Sun, 5 Sep 2004 22:32:51 GMT Message-Id: <200409052232.i85MWpON048563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 61065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Sep 2004 22:32:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=61065 Change 61065 by julian@julian_ref on 2004/09/05 22:31:50 fix mismerges Affected files ... .. //depot/projects/nsched/sys/i386/i386/mp_machdep.c#8 edit .. //depot/projects/nsched/sys/kern/kern_synch.c#11 edit .. //depot/projects/nsched/sys/kern/sched_4bsd.c#37 edit .. //depot/projects/nsched/sys/sys/proc.h#26 edit Differences ... ==== //depot/projects/nsched/sys/i386/i386/mp_machdep.c#8 (text+ko) ==== @@ -555,7 +555,7 @@ binuptime(PCPU_PTR(switchtime)); PCPU_SET(switchticks, ticks); - cpu_throw(NULL, choosethread(SW_VOL)); /* doesn't return */ + cpu_throw(NULL, choosethread()); /* doesn't return */ panic("scheduler returned us to %s", __func__); /* NOTREACHED */ ==== //depot/projects/nsched/sys/kern/kern_synch.c#11 (text+ko) ==== @@ -337,7 +337,7 @@ (void *)td, td->td_sched, (long)p->p_pid, p->p_comm); if (td->td_proc->p_flag & P_SA) newtd = thread_switchout(td, flags, newtd); - sched_switch(td, flags, newtd); + sched_switch(td, newtd); CTR4(KTR_PROC, "mi_switch: new thread %p (kse %p, pid %ld, %s)", (void *)td, td->td_sched, (long)p->p_pid, p->p_comm); ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#37 (text+ko) ==== @@ -432,20 +432,20 @@ * stop recalculating its priority until * it wakes up. */ - if (ke->ke_sched->ske_cpticks == 0) + if (ke->ke_cpticks == 0) continue; #if (FSHIFT >= CCPU_SHIFT) ke->ke_pctcpu += (realstathz == 100) - ? ((fixpt_t) ke->ke_sched->ske_cpticks) << + ? ((fixpt_t) ke->ke_cpticks) << (FSHIFT - CCPU_SHIFT) : - 100 * (((fixpt_t) ke->ke_sched->ske_cpticks) + 100 * (((fixpt_t) ke->ke_cpticks) << (FSHIFT - CCPU_SHIFT)) / realstathz; #else ke->ke_pctcpu += ((FSCALE - ccpu) * - (ke->ke_sched->ske_cpticks * + (ke->ke_cpticks * FSCALE / realstathz)) >> FSHIFT; #endif - ke->ke_sched->ske_cpticks = 0; + ke->ke_cpticks = 0; } /* end of kse loop */ /* * If there are ANY running threads in this KSEGRP, @@ -627,7 +627,7 @@ kg = td->td_ksegrp; ke = td->td_kse; - ke->ke_sched->ske_cpticks++; + ke->ke_cpticks++; kg->kg_estcpu = ESTCPULIM(kg->kg_estcpu + 1); if ((kg->kg_estcpu % INVERSE_ESTCPU_WEIGHT) == 0) { resetpriority(kg); @@ -997,7 +997,7 @@ if ((td->td_proc->p_flag & P_NOLOAD) == 0) sched_tdcnt--; - runq_remove(ke->ke_sched->ske_runq, ke); + runq_remove(ke->ke_runq, ke); ke->ke_state = KES_THREAD; ke->ke_ksegrp->kg_runq_kses--; ==== //depot/projects/nsched/sys/sys/proc.h#26 (text+ko) ==== @@ -320,7 +320,6 @@ vm_offset_t td_altkstack; /* (a) Kernel VA of alternate kstack. */ int td_altkstack_pages; /* (a) Size of the alt kstack */ u_int td_critnest; /* (k) Critical section nest level. */ - struct kse *td_kse; /* (j) Current KSE if any. */ struct mdthread td_md; /* (k) Any machine-dependent fields. */ struct td_sched *td_sched; /* (*) Scheduler-specific data. */ };