From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:08:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7192216A548; Thu, 12 Oct 2006 03:08:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1ABED16A494 for ; Thu, 12 Oct 2006 03:08:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54AC143D5C for ; Thu, 12 Oct 2006 03:08:03 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C383eH077311 for ; Thu, 12 Oct 2006 03:08:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C382BU077305 for perforce@freebsd.org; Thu, 12 Oct 2006 03:08:02 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:08:02 GMT Message-Id: <200610120308.k9C382BU077305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Oct 2006 03:08:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=107723 Change 107723 by jb@jb_freebsd8 on 2006/10/12 03:07:43 Remove optional KSE now that it's going on another branch. Affected files ... .. //depot/projects/dtrace/src/sys/sys/rtprio.h#6 edit .. //depot/projects/dtrace/src/sys/sys/sched.h#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/rtprio.h#6 (text+ko) ==== @@ -75,15 +75,9 @@ }; #ifdef _KERNEL -#ifdef KSE struct ksegrp; int rtp_to_pri(struct rtprio *, struct ksegrp *); void pri_to_rtp(struct ksegrp *, struct rtprio *); -#else -struct thread; -int rtp_to_pri(struct rtprio *, struct thread *); -void pri_to_rtp(struct thread *, struct rtprio *); -#endif #endif #endif ==== //depot/projects/dtrace/src/sys/sys/sched.h#7 (text+ko) ==== @@ -52,35 +52,27 @@ * KSE Groups contain scheduling priority information. They record the * behavior of groups of KSEs and threads. */ -#ifdef KSE void sched_class(struct ksegrp *kg, int class); void sched_exit_ksegrp(struct ksegrp *kg, struct thread *childtd); void sched_fork_ksegrp(struct thread *td, struct ksegrp *child); -#else -void sched_class(struct thread *td, int class); -#endif void sched_nice(struct proc *p, int nice); /* * Threads are switched in and out, block on resources, have temporary * priorities inherited from their ksegs, and use up cpu time. */ -#ifdef KSE void sched_exit_thread(struct thread *td, struct thread *child); void sched_fork_thread(struct thread *td, struct thread *child); void sched_lend_prio(struct thread *td, u_char prio); void sched_lend_user_prio(struct thread *td, u_char pri); -#endif fixpt_t sched_pctcpu(struct thread *td); void sched_prio(struct thread *td, u_char prio); void sched_sleep(struct thread *td); void sched_switch(struct thread *td, struct thread *newtd, int flags); void sched_unlend_prio(struct thread *td, u_char prio); -#ifdef KSE void sched_unlend_user_prio(struct thread *td, u_char pri); void sched_user_prio(struct ksegrp *kg, u_char prio); void sched_userret(struct thread *td); -#endif void sched_wakeup(struct thread *td); /* @@ -91,9 +83,6 @@ void sched_rem(struct thread *td); void sched_tick(void); void sched_relinquish(struct thread *td); -#ifndef KSE -void sched_run_ithread(struct thread *td); -#endif /* * Binding makes cpu affinity permanent while pinning is used to temporarily @@ -109,9 +98,7 @@ * These procedures tell the process data structure allocation code how * many bytes to actually allocate. */ -#ifdef KSE int sched_sizeof_ksegrp(void); -#endif int sched_sizeof_proc(void); int sched_sizeof_thread(void); @@ -129,15 +116,11 @@ /* temporarily here */ void schedinit(void); -#ifdef KSE void sched_init_concurrency(struct ksegrp *kg); void sched_set_concurrency(struct ksegrp *kg, int cuncurrency); -#endif void sched_schedinit(void); -#ifdef KSE void sched_newproc(struct proc *p, struct ksegrp *kg, struct thread *td); void sched_thread_exit(struct thread *td); -#endif void sched_newthread(struct thread *td); #endif /* !_SYS_SCHED_H_ */