From owner-p4-projects@FreeBSD.ORG Sat Jul 1 07:31:36 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 82D1F16A494; Sat, 1 Jul 2006 07:31:36 +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 4123116A407 for ; Sat, 1 Jul 2006 07:31:36 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD3724407E for ; Sat, 1 Jul 2006 07:31:35 +0000 (GMT) (envelope-from cdjones@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 k617VZEV046055 for ; Sat, 1 Jul 2006 07:31:35 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k617VZsB046052 for perforce@freebsd.org; Sat, 1 Jul 2006 07:31:35 GMT (envelope-from cdjones@FreeBSD.org) Date: Sat, 1 Jul 2006 07:31:35 GMT Message-Id: <200607010731.k617VZsB046052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 100385 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: Sat, 01 Jul 2006 07:31:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=100385 Change 100385 by cdjones@cdjones-impulse on 2006/07/01 07:30:58 Reduce console output's obnoxiousness, remove dead code. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#8 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#8 (text+ko) ==== @@ -99,18 +99,14 @@ struct prison *pr; pr = arg; - printf("Starting jail scheduler for JID %d\n", pr->pr_id); - for (;;) { if (pr->pr_scheduler_flags & J_SCHED_TD_DIE) break; - printf("jsched: foo\n"); - - tsleep(pr, 0, '-', hz); + /* Scheduling stuff goes here. */ + tsleep(pr, 0, "-", hz); } - printf("Killing jail scheduler for JID %d\n", pr->pr_id); pr->pr_scheduler_flags = J_SCHED_TD_DEAD; kthread_exit(0); } @@ -129,15 +125,9 @@ struct prison *pr, *tpr; struct jail j; struct jail_attach_args jaa; + struct proc *j_sched_proc; int vfslocked, error, tryprid; - static struct proc *j_sched_proc; - /* static struct kproc_desc *j_sched_kp = { - "j_sched", - jsched_dummy, - &j_sched_proc - }; */ - error = copyin(uap->jail, &j, sizeof(j)); if (error) return (error); @@ -192,7 +182,7 @@ /* TODO #ifdef SCHED_HIER */ pr->pr_scheduler_flags = J_SCHED_TD_ACTIVE; - if (kthread_create(jsched_td, pr, (void *) j_sched_proc, 0, 0, "jsched '%d'", pr->pr_id)) + if (kthread_create(jsched_td, pr, (void *) j_sched_proc, 0, 0, "jsched %d", pr->pr_id)) goto e_dropprref; KASSERT(j_sched_proc != NULL, ("NULL j_sched_proc")); pr->pr_scheduler = j_sched_proc;