From owner-p4-projects@FreeBSD.ORG Sun Sep 16 10:16:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52B0616A468; Sun, 16 Sep 2007 10:16:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F5FE16A418 for ; Sun, 16 Sep 2007 10:16:11 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E31AE13C45E for ; Sun, 16 Sep 2007 10:16:10 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8GAGAov099637 for ; Sun, 16 Sep 2007 10:16:10 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8GAGAJI099634 for perforce@freebsd.org; Sun, 16 Sep 2007 10:16:10 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 16 Sep 2007 10:16:10 GMT Message-Id: <200709161016.l8GAGAJI099634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 126463 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: Sun, 16 Sep 2007 10:16:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=126463 Change 126463 by zec@zec_tpx32 on 2007/09/16 10:15:51 Sync the userland management utility with the kernel-level changes, and stop displaying unused fields (CPU limits / accounting / vimage parent info). Affected files ... .. //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#3 edit Differences ... ==== //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#3 (text+ko) ==== @@ -62,21 +62,21 @@ void vi_print(struct vi_req *vi_req) { +#if 0 double lf = 1.0/vi_req->averunnable.fscale; +#endif printf ("\"%s\":\n", vi_req->vi_name); - printf (" %d processes, ", vi_req->vi_proc_count); - printf ("load averages: %3.2f, %3.2f, %3.2f\n", + printf (" Processes (current/max): %d/%d\n", + vi_req->vi_proc_count, vi_req->vi_proc_limit); +#if 0 + printf (" load averages: %3.2f, %3.2f, %3.2f\n", lf * vi_req->averunnable.ldavg[0], lf * vi_req->averunnable.ldavg[1], lf * vi_req->averunnable.ldavg[2]); -#if 0 printf (" CPU usage: %3.2f%% (", 0.0001 * vi_req->cp_time_avg[CP_ALL]); -#else - printf (" CPU usage: ("); -#endif printf ("%3.2f%% user, ", 0.0001 * vi_req->cp_time_avg[CP_USER]); printf ("%3.2f%% nice, ", 0.0001 * vi_req->cp_time_avg[CP_NICE]); printf ("%3.2f%% sys, ",0.0001 * vi_req->cp_time_avg[CP_SYS]); @@ -92,22 +92,15 @@ 0.0001 * vi_req->vi_intr_limit); else printf ("no intr limit\n"); +#endif - if (vi_req->vi_proc_limit) - printf (" Proc limit: %d", vi_req->vi_proc_limit); - else - printf (" No proc limit"); if (vi_req->vi_child_limit) - printf (", child limit: %d", vi_req->vi_child_limit); - printf("\n Sockets (current/max): %d/%d\n", vi_req->vi_sock_count, + printf (" child limit: %d\n", vi_req->vi_child_limit); + printf(" Sockets (current/max): %d/%d\n", vi_req->vi_sock_count, vi_req->vi_maxsockets); - printf (" %d network interfaces", vi_req->vi_if_count); + printf (" %d network interfaces\n", vi_req->vi_if_count); if (vi_req->vi_child_count) - printf (", %d child vimages", - vi_req->vi_child_count); - if (vi_req->vi_parent_name[0]) - printf (", parent vimage: \"%s\"", - vi_req->vi_parent_name); printf ("\n"); + printf (" %d child vimages\n", vi_req->vi_child_count); if (vi_req->vi_chroot[0]) printf (" Chroot dir: %s\n", vi_req->vi_chroot); } @@ -185,11 +178,10 @@ /* here vi_chroot stores the current ifc name */ strncpy(vi_req.vi_chroot, argv[3], sizeof (vi_req.vi_chroot)); if (argc >= 5) - /* here vi_parent_name stores the target ifc name */ - strncpy(vi_req.vi_parent_name, argv[4], - sizeof (vi_req.vi_parent_name)); + strncpy(vi_req.vi_if_xname, argv[4], + sizeof (vi_req.vi_if_xname)); else - vi_req.vi_parent_name[0] = 0; + vi_req.vi_if_xname[0] = 0; if (ioctl(s, SIOCSIFVIMAGE, (caddr_t)&vi_req) < 0) goto abort; printf("%s@%s\n", vi_req.vi_chroot, vi_req.vi_name);