From owner-p4-projects@FreeBSD.ORG Wed Jul 5 01:51:16 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 780D816A4DF; Wed, 5 Jul 2006 01:51:16 +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 359A516A4DE for ; Wed, 5 Jul 2006 01:51:16 +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 DC8B643D49 for ; Wed, 5 Jul 2006 01:51:15 +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 k651pFbv033265 for ; Wed, 5 Jul 2006 01:51:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k651pFnV033262 for perforce@freebsd.org; Wed, 5 Jul 2006 01:51:15 GMT (envelope-from jb@freebsd.org) Date: Wed, 5 Jul 2006 01:51:15 GMT Message-Id: <200607050151.k651pFnV033262@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 100590 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: Wed, 05 Jul 2006 01:51:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=100590 Change 100590 by jb@jb_freebsd2 on 2006/07/05 01:51:05 A few kse bits that didn't seem to get updated with the bike_sched integration. Affected files ... .. //depot/projects/dtrace/src/lib/libkvm/kvm_proc.c#3 edit .. //depot/projects/dtrace/src/sys/ddb/db_ps.c#5 edit .. //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#4 edit Differences ... ==== //depot/projects/dtrace/src/lib/libkvm/kvm_proc.c#3 (text+ko) ==== @@ -114,7 +114,7 @@ struct prison pr; struct thread mtd; /*struct kse mke;*/ - struct ksegrp mkg; + /*struct ksegrp mkg;*/ struct proc proc; struct proc pproc; struct timeval tv; @@ -137,6 +137,7 @@ TAILQ_FIRST(&proc.p_threads)); return (-1); } +#if 0 if ((proc.p_flag & P_SA) == 0) { if (KREAD(kd, (u_long)TAILQ_FIRST(&proc.p_ksegrps), @@ -146,7 +147,6 @@ TAILQ_FIRST(&proc.p_ksegrps)); return (-1); } -#if 0 if (KREAD(kd, (u_long)TAILQ_FIRST(&mkg.kg_kseq), &mke)) { _kvm_err(kd, kd->program, @@ -154,8 +154,8 @@ TAILQ_FIRST(&mkg.kg_kseq)); return (-1); } + } #endif - } } if (KREAD(kd, (u_long)proc.p_ucred, &ucred) == 0) { kp->ki_ruid = ucred.cr_ruid; @@ -418,13 +418,13 @@ kp->ki_oncpu = mtd.td_oncpu; if (!(proc.p_flag & P_SA)) { +#if 0 /* stuff from the ksegrp */ kp->ki_slptime = mkg.kg_slptime; kp->ki_pri.pri_class = mkg.kg_pri_class; kp->ki_pri.pri_user = mkg.kg_user_pri; kp->ki_estcpu = mkg.kg_estcpu; -#if 0 /* Stuff from the kse */ kp->ki_pctcpu = mke.ke_pctcpu; kp->ki_rqindex = mke.ke_rqindex; ==== //depot/projects/dtrace/src/sys/ddb/db_ps.c#5 (text+ko) ==== @@ -294,8 +294,7 @@ td = kdb_thread; db_printf("Thread %d at %p:\n", td->td_tid, td); - db_printf(" proc (pid %d): %p ", td->td_proc->p_pid, td->td_proc); - db_printf(" ksegrp: %p\n", td->td_ksegrp); + db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc); if (td->td_name[0] != '\0') db_printf(" name: %s\n", td->td_name); db_printf(" flags: %#x ", td->td_flags); ==== //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#4 (text+ko) ==== @@ -728,12 +728,6 @@ mountflagsname ((int)*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_kse_thr_interrupt) { - print_number(ip,narg,c); - (void)putchar(','); - ksethrcmdname ((int)*ip); - ip++; - narg--; } else if (ktr->ktr_code == SYS_thr_create) { print_number(ip,narg,c); print_number(ip,narg,c);