head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.32 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.30 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.28 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.26 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.24 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.22 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.20 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.18 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.16 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.14 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.12 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.10 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.8 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.6 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.6 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2; locks; strict; comment @# @; 1.3 date 2006.08.06.19.06.44; author jmmv; state dead; branches; next 1.2; 1.2 date 2005.11.15.14.26.44; author rillig; state Exp; branches; next 1.1; 1.1 date 2005.10.12.21.49.39; author jmmv; state Exp; branches; next ; desc @@ 1.3 log @Update to 2.14.2. Grrr, how much I hate this package -- and its collection of patches --, you can't imagine. July 27, 2006: Overview of changes in 2.14.2 ============================================ * Updated solaris support (hua.zhang@@sun.com) * Small linux updates and improvments. April 10, 2006: Overview of changes in 2.14.1 ============================================= * Updated translations. * Fixed NetBSD port (Julio M. Merino Vidal ). * Fixed some warnings. @ text @$NetBSD: patch-bf,v 1.2 2005/11/15 14:26:44 rillig Exp $ From FreeBSD's GNOME development repository. --- sysdeps/freebsd/sysinfo.c.orig Thu Jun 9 22:56:29 2005 +++ sysdeps/freebsd/sysinfo.c Thu Jun 9 22:58:36 2005 @@@@ -0,0 +1,91 @@@@ +/* Copyright (C) 1998-99 Martin Baulig + This file is part of LibGTop 1.0. + + Contributed by Martin Baulig , April 1998. + + LibGTop is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + LibGTop is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with LibGTop; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ + +#include +#include +#include +#include +#include +#include +#include + +static const unsigned long _glibtop_sysdeps_sysinfo = +(1L << GLIBTOP_SYSINFO_CPUINFO); + +static glibtop_sysinfo sysinfo = { .flags = 0 }; + +static void +init_sysinfo (glibtop *server) +{ + char *model; + int ncpus = 1; + int mhz = 0; + size_t len; + + if(G_LIKELY(sysinfo.flags)) return; + + glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); + + len = sizeof (ncpus); + sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); + len = 0; + sysctlbyname ("hw.model", NULL, &len, NULL, 0); + model = malloc (len); + sysctlbyname ("hw.model", model, &len, NULL, 0); + len = sizeof (mhz); + sysctlbyname ("hw.clockrate", &mhz, &len, NULL, 0); + + for(sysinfo.ncpu = 0; + sysinfo.ncpu < GLIBTOP_NCPU && sysinfo.ncpu < ncpus; + sysinfo.ncpu++) { + + glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu]; + + cpuinfo->labels = g_ptr_array_new (); + + cpuinfo->values = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, g_free); + + cpuinfo->descriptions = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, g_free); + + g_ptr_array_add (cpuinfo->labels, "processor"); + g_hash_table_insert (cpuinfo->values, "processor", &sysinfo.ncpu); + + g_ptr_array_add (cpuinfo->labels, "vendor_id"); + g_hash_table_insert (cpuinfo->values, "vendor_id", model); + + g_ptr_array_add (cpuinfo->labels, "cpu MHz"); + g_hash_table_insert (cpuinfo->values, "cpu MHz", &mhz); + + } + + free (model); + + sysinfo.flags = _glibtop_sysdeps_sysinfo; +} + +const glibtop_sysinfo * +glibtop_get_sysinfo_s (glibtop *server) +{ + init_sysinfo (server); + return &sysinfo; +} @ 1.2 log @Removed CVS Id from patch-bf. @ text @d1 1 a1 1 $NetBSD: patch-bf,v 1.1 2005/10/12 21:49:39 jmmv Exp $ @ 1.1 log @Update to 2.12.0. Thanks go to the FreeBSD GNOME developers for all the patches I borrowed from them (patch-b*). September 4, 2005: Overview of changes from 2.11.92 to 2.12.0 ============================================================= * Updated translations. August 22, 2005: Overview of changes from 2.11.91 to 2.11.92 ============================================================ * Linux: - fixed for 2.6 without /sys - glibtop_get_cpu() : Do not add irq, softirq and iowait to idle. August 9, 2005: Overview of changes from 2.11.90 to 2.11.91 =========================================================== * All: - cleaned some headers. - removed static examples. * Linux: - fixed some issues with 2.6 without /sys July 24, 2005: Overview of changes from 2.11.2 to 2.11.90 ========================================================= * Linux: - fixed glibtop_uptime .flags. July &3, 2005: Overview of changes from 2.11.1 to 2.11.2 ======================================================== * Linux: - little improvements for 2.6. July 3, 2005: Overview of changes from 2.11.0 to 2.11.1 ======================================================= * Linux: - glibtop_get_swap : added page(in|out) for linux 2.6. June 8, 2005: Overview of changes from 2.10.x to 2.11.0 ======================================================= * Replaced a lot of macros by functions * Got rid of dozens of useless files. * libgtop 2.11.x are and will stay API and ABI compatible with 2.10.x, i swear. @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 3 @@@@ -0,0 +1,93 @@@@ +/* $Id$ */ + @