From owner-freebsd-current@FreeBSD.ORG Tue Oct 21 15:02:26 2008 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71F141065675 for ; Tue, 21 Oct 2008 15:02:26 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-gx0-f16.google.com (mail-gx0-f16.google.com [209.85.217.16]) by mx1.freebsd.org (Postfix) with ESMTP id 132A98FC0C for ; Tue, 21 Oct 2008 15:02:25 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: by gxk9 with SMTP id 9so5293510gxk.19 for ; Tue, 21 Oct 2008 08:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:mime-version:content-type:content-transfer-encoding :content-disposition; bh=AT3RxhAAkZYdrFPrUFcmx27kkifgRAk3mrpVAd6mpjU=; b=DGcEDTj8bOp0bvuRgiLyPcbLQfiJrYN39N8uXcFYOhA3cYtb8V3pRaM6MDOyeELLFG POwy+aJohvqedGEYylXBV/qjoJXOd4phRIbMNYAiR3cidbQ1e3G+Jf7fFOzM4irk+DiI fF+Gmva6W8Eds1+CE2A1xKHSPo5yhjIBOpsjU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:mime-version:content-type :content-transfer-encoding:content-disposition; b=BjcxjNX+jgkMelRsx1hEBWlX3WnNwfoeyEYi74Uu2Dt5usZA5lK7W3eh2Cb9Hl2N0Z iGn8ts4nEhS8NRQ6xIYdy5NAhCpEGP/84V1ogLyFNM7R6GR043mavygX7EVcu+3UDBoB 0mqEujdudsWGi372VqTIIIDKNIljnerCmXJlc= Received: by 10.90.35.9 with SMTP id i9mr8939627agi.74.1224601344749; Tue, 21 Oct 2008 08:02:24 -0700 (PDT) Received: by 10.90.81.10 with HTTP; Tue, 21 Oct 2008 08:02:24 -0700 (PDT) Message-ID: Date: Tue, 21 Oct 2008 19:02:24 +0400 From: pluknet To: "FreeBSD Current" , "John Baldwin" MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Cc: Subject: (possible) mis-merge of per-cpu stats to 6.x X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2008 15:02:26 -0000 Hi! It seems that after John's partial backup to restore 6.x ABI read_cpu_time() became useless. It's no more called from sysctl_kern_cp_time(). wbr, pluknet --- kern_clock.c.orig Tue Oct 21 18:56:09 2008 +++ kern_clock.c Tue Oct 21 18:57:12 2008 @@ -91,9 +91,7 @@ sysctl_kern_cp_time(SYSCTL_HANDLER_ARGS) #ifdef SCTL_MASK32 int i; unsigned int cp_time32[CPUSTATES]; -#endif -#ifdef SCTL_MASK32 if (req->flags & SCTL_MASK32) { if (!req->oldptr) return SYSCTL_OUT(req, 0, sizeof(cp_time32)); @@ -156,23 +154,6 @@ sysctl_kern_cp_times(SYSCTL_HANDLER_ARGS SYSCTL_PROC(_kern, OID_AUTO, cp_times, CTLTYPE_LONG|CTLFLAG_RD, 0,0, sysctl_kern_cp_times, "LU", "per-CPU time statistics"); - -void -read_cpu_time(long *cp_time) -{ - struct pcpu *pc; - int i, j; - - /* Sum up global cp_time[]. */ - bzero(cp_time, sizeof(long) * CPUSTATES); - for (i = 0; i <= mp_maxid; i++) { - if (CPU_ABSENT(i)) - continue; - pc = pcpu_find(i); - for (j = 0; j < CPUSTATES; j++) - cp_time[j] += pc->pc_cp_time[j]; - } -} #ifdef SW_WATCHDOG #include EOF