Dropped unused file and updated documentation.

* doc/reference.texi: * include/glibtop/limits.h: Dropped unused file and updated documentation.
Bumped version number.
2005-12-08 10:25:56 +00:00 · 2005-12-07 09:52:36 +00:00 · 2005-12-07 09:35:50 +00:00 · 2005-12-04 10:08:56 +00:00
8 changed files with 275 additions and 79 deletions
--- a/17
+++ b/17
@@ -1,3 +1,20 @@
+2005-12-08  Benoît Dejean  <benoit@placenet.org>
+
+	* doc/reference.texi:
+	* include/glibtop/limits.h:
+
+	Dropped unused file and updated documentation.
+
+2005-12-07  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+
+	Bumped version number.
+
+2005-12-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* configure.in: Added 'th' (Thai) to ALL_LINGUAS.
+
 2005-11-29  Benoît Dejean  <benoit@placenet.org>

 	* NEWS:
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_CANONICAL_SYSTEM

 LIBGTOP_MAJOR_VERSION=2
 LIBGTOP_MINOR_VERSION=12
-LIBGTOP_MICRO_VERSION=2
+LIBGTOP_MICRO_VERSION=3
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)

@@ -238,7 +238,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)

-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko ku ky lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tr uk vi xh zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko ku ky lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr uk vi xh zh_CN zh_TW"

 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
--- a/doc/reference.texi
+++ b/doc/reference.texi
@@ -111,7 +111,7 @@ The @samp{xcpu_} values are for SMP systems - they are the same than
@code{total}, @code{user}, @code{nice}, @code{sys}, @code{idle},
@code{iowait}, @code{irq} and @code{softirq}
 except that they are arrays of @code{GLIBTOP_NCPU} (defined in
-@file{<glibtop/limits.h>}) elements and contain one value for each CPU
+@file{<glibtop/cpu.h>}) elements and contain one value for each CPU
 in the system.

@table @code
@@ -680,7 +680,7 @@ Standard unix nice level of process.
 Number of additional process groups.
@item groups
 Array of additional process groups@*
-(@code{GLIBTOP_MAX_GROUPS} is defined in @file{<glibtop/limits.h>}).
+(@code{GLIBTOP_MAX_GROUPS} is defined in @file{<glibtop/procuid.h>}).
@end table

@page
@@ -1484,13 +1484,7 @@ struct _glibtop_mountentry
@end cartouche
@end example

-@ifset LIBGTOP-1-1
-@code{GLIBTOP_MOUNTENTRY_LEN} is defined in @file{<glibtop/limits.h>}.
-@end ifset
-@ifclear LIBGTOP-1-1
-@code{GLIBTOP_MOUNTENTRY_LEN} is defined in @file{<glibtop.h>}
-(this was moved to @file{<glibtop/limits.h>} in LibGTop 1.1.0).
-@end ifclear
+@code{GLIBTOP_MOUNTENTRY_LEN} is defined in @file{<glibtop.h>}.

@table @code
@item devname
--- a/include/glibtop/limits.h
+++ b/include/glibtop/limits.h
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, 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.
-*/
-
-#ifndef __GLIBTOP_LIMITS_H__
-#define __GLIBTOP_LIMITS_H__
-
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-/* Nobody should really be using more than 64 processors. */
-#define GLIBTOP_NCPU		64
-
-/* Maximum number of process groups in glibtop_proc_uid. */
-#define GLIBTOP_MAX_GROUPS	32
-
-/* Maximum length of a mountpoint/device name in glibtop_mountlist. */
-#define GLIBTOP_MOUNTENTRY_LEN	79
-
-/* Maximum length of a network interface name. */
-#define GLIBTOP_INTERFACE_LEN	32
-
-/* Length of a network interface address in bytes. */
-#define GLIBTOP_IFADDR_LEN	16
-
-/* This is ((guint64)-1) */
-#define GLIBTOP_UNLIMITED	(~(guint64)0)
-
-/* Maximum length of a backend name. */
-#define GLIBTOP_BACKEND_NAME_LEN	40
-
-G_END_DECLS
-
-#endif
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Added Thai translation.
+
 2005-11-17  Timur Jamakeev  <timurj@cvs.gnome.org>

 	* ky.po: Added Kirghiz translation.
--- a/po/th.po
+++ b/po/th.po
@@ -0,0 +1,208 @@
+# Thai translation of libgtop.
+# Copyright (C) 2005 Free Software Foundation
+# This file is distributed under the same license as the libgtop package.
+# Theppitak Karoonboonyanan <thep@linux.thai.net>, 2005.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: libgtop 2.11.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-12-04 16:30+0700\n"
+"PO-Revision-Date: 2005-12-04 17:01+0700\n"
+"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
+"Language-Team: Thai <l10n@opentle.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: lib/read.c:65
+#, c-format
+msgid "read %d byte"
+msgid_plural "read %d bytes"
+msgstr[0] "อ่าน %d ไบต์"
+msgstr[1] "อ่าน %d ไบต์"
+
+#: lib/read_data.c:53
+msgid "read data size"
+msgstr "อ่านขนาดข้อมูล"
+
+#: lib/read_data.c:72
+#, c-format
+msgid "read %lu byte of data"
+msgid_plural "read %lu bytes of data"
+msgstr[0] "อ่านข้อมูล %lu ไบต์"
+msgstr[1] "อ่านข้อมูล %lu ไบต์"
+
+#: lib/write.c:52
+#, c-format
+msgid "wrote %d byte"
+msgid_plural "wrote %d bytes"
+msgstr[0] "เขียน %d ไบต์"
+msgstr[1] "เขียน %d ไบต์"
+
+#: src/daemon/gnuserv.c:460
+msgid "Enable debugging"
+msgstr "เปิดใช้การดีบั๊ก"
+
+#: src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: src/daemon/gnuserv.c:462
+msgid "Enable verbose output"
+msgstr "เปิดข้อความเอาต์พุตละเอียด"
+
+#: src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "VERBOSE"
+
+#: src/daemon/gnuserv.c:464
+msgid "Don't fork into background"
+msgstr "ไม่ต้อง fork ไปทำงานเบื้องหลัง"
+
+#: src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "NO-DAEMON"
+
+#: src/daemon/gnuserv.c:466
+msgid "Invoked from inetd"
+msgstr "เรียกจาก inetd"
+
+#: src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "INETD"
+
+#: src/daemon/gnuserv.c:500
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"มีข้อผิดพลาดในตัวเลือก %s: %s\n"
+"เรียก '%s --help' เพื่อดูรายการตัวเลือกบรรทัดคำสั่งทั้งหมดที่ใช้ได้\n"
+
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+msgid "Hangup"
+msgstr "ตัดการเชื่อมต่อ"
+
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+msgid "Interrupt"
+msgstr "ขัดจังหวะ"
+
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+msgid "Quit"
+msgstr "ออกทันที"
+
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+msgid "Illegal instruction"
+msgstr "รหัสคำสั่งผิดพลาด"
+
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+msgid "Trace trap"
+msgstr "หยุดเพื่อตรวจสอบ"
+
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+msgid "Abort"
+msgstr "เลิกทำงาน"
+
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+msgid "EMT error"
+msgstr "ข้อผิดพลาด EMT"
+
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+msgid "Floating-point exception"
+msgstr "ความผิดพลาดเลขคณิตทศนิยม"
+
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+msgid "Kill"
+msgstr "ฆ่า"
+
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+msgid "Bus error"
+msgstr "บัสผิดพลาด"
+
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+msgid "Segmentation violation"
+msgstr "การละเมิดพื้นที่หน่วยความจำ"
+
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+msgid "Bad argument to system call"
+msgstr "การเรียกฟังก์ชันระบบผิดพลาด"
+
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+msgid "Broken pipe"
+msgstr "ไปป์หลุด"
+
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+msgid "Alarm clock"
+msgstr "นาฬิกาปลุก"
+
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+msgid "Termination"
+msgstr "จบการทำงาน"
+
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+msgid "Urgent condition on socket"
+msgstr "เงื่อนไขเร่งด่วนของซ็อกเก็ต"
+
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+msgid "Stop"
+msgstr "หยุด"
+
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+msgid "Keyboard stop"
+msgstr "หยุดด้วยแป้นพิมพ์"
+
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+msgid "Continue"
+msgstr "ทำงานต่อ"
+
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+msgid "Child status has changed"
+msgstr "โพรเซสลูกเปลี่ยนสถานะ"
+
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+msgid "Background read from tty"
+msgstr "โพรเซสเบื้องหลังอ่านเทอร์มินัล"
+
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+msgid "Background write to tty"
+msgstr "โพรเซสเบื้องหลังเขียนเทอร์มินัล"
+
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+msgid "I/O now possible"
+msgstr "ข้อมูลเข้า/ออกพร้อม"
+
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+msgid "CPU limit exceeded"
+msgstr "ทะลุขีดจำกัด CPU"
+
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+msgid "File size limit exceeded"
+msgstr "ทะลุขีดจำกัดขนาดแฟ้ม"
+
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+msgid "Virtual alarm clock"
+msgstr "นาฬิกาปลุกเสมือน"
+
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+msgid "Profiling alarm clock"
+msgstr "นาฬิกาปลุกวัดประสิทธิภาพ"
+
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+msgid "Window size change"
+msgstr "ขนาดหน้าต่างเทอร์มินัลเปลี่ยน"
+
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+msgid "Information request"
+msgstr "ร้องขอข้อมูล"
+
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+msgid "User defined signal 1"
+msgstr "สัญญาณผู้ใช้กำหนด 1"
+
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+msgid "User defined signal 2"
+msgstr "สัญญาณผู้ใช้กำหนด 2"
--- a/sysdeps/linux/ChangeLog
+++ b/sysdeps/linux/ChangeLog
@@ -1,3 +1,18 @@
+2005-12-07  Benoît Dejean  <benoit@placenet.org>
+
+	* procmap.c: (glibtop_get_proc_map_s):
+
+	Small improvements.
+	Use g_array_sized_new instead of g_array_new with
+	reserved_size = 100.
+	Don't use g_array_append_val to avoid copying
+	glibtop_map_entries. Use g_array_set_size(size + 1) instead.
+
+	I've run a little python benchmark and this shows a little
+	speedup. I hope this would be more sensible in
+	gnome-system-monitor (glibtop_get_procmap is intensively used for
+	the 'Writable Memory' column).
+
 2005-10-29  Benoît Dejean  <benoit@placenet.org>

 	* glibtop_private.c: (read_boot_time):
--- a/sysdeps/linux/procmap.c
+++ b/sysdeps/linux/procmap.c
@@ -59,8 +59,15 @@ glibtop_map_entry *
 glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 {
 	char procfilename[GLIBTOP_MAP_FILENAME_LEN+1];
-	GArray *entry_list = g_array_new(FALSE, FALSE,
-					 sizeof(glibtop_map_entry));
+
+	/*
+	  default size of 100 maybe inaccurate.
+	  It's the average number of entry per process on my laptop
+	*/
+
+	GArray *entry_list = g_array_sized_new(FALSE, FALSE,
+					       sizeof(glibtop_map_entry),
+					       100);
 	FILE *maps;

 	glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_MAP, 0);
@@ -77,13 +84,14 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 	{
 		unsigned long perm = 0;
 		int rv;
+		guint len;

 		unsigned short dev_major, dev_minor;
 		unsigned long start, end, offset, inode;
 		char flags[4];
 		char filename [GLIBTOP_MAP_FILENAME_LEN+1];

-		glibtop_map_entry entry;
+		glibtop_map_entry *entry;


 		/* 8 arguments */
@@ -113,16 +121,22 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 		else if (flags [3] == 'p')
 			perm |= GLIBTOP_MAP_PERM_PRIVATE;

-		entry.flags = _glibtop_sysdeps_map_entry;
-		entry.start = (guint64) start;
-		entry.end = (guint64) end;
-		entry.offset = (guint64) offset;
-		entry.perm = (guint64) perm;
-		entry.device = (guint64) MKDEV(dev_major, dev_minor);
-		entry.inode = (guint64) inode;
-		g_strlcpy (entry.filename, filename, sizeof entry.filename);
+		/*
+		  avoid copying the entry, grow by 1 and point to the last
+		  element.
+		*/
+		len = entry_list->len;
+		g_array_set_size(entry_list, len + 1);
+		entry = &g_array_index(entry_list, glibtop_map_entry, len);

-		g_array_append_val(entry_list, entry);
+		entry->flags = _glibtop_sysdeps_map_entry;
+		entry->start = (guint64) start;
+		entry->end = (guint64) end;
+		entry->offset = (guint64) offset;
+		entry->perm = (guint64) perm;
+		entry->device = (guint64) MKDEV(dev_major, dev_minor);
+		entry->inode = (guint64) inode;
+		g_strlcpy(entry->filename, filename, sizeof entry->filename);
 	}

 	fclose (maps);
Author	SHA1	Message	Date
Benoît Dejean	91a312768d	Dropped unused file and updated documentation. * doc/reference.texi: * include/glibtop/limits.h: Dropped unused file and updated documentation.	2005-12-08 10:25:56 +00:00
Benoît Dejean	d9a666470c	Bumped version number. * configure.in: Bumped version number.	2005-12-07 09:52:36 +00:00
Benoît Dejean	79fc0e70c0	Small improvements. Use g_array_sized_new instead of g_array_new with * procmap.c: (glibtop_get_proc_map_s): Small improvements. Use g_array_sized_new instead of g_array_new with reserved_size = 100. Don't use g_array_append_val to avoid copying glibtop_map_entries. Use g_array_set_size(size + 1) instead. I've run a little python benchmark and this shows a little speedup. I hope this would be more sensible in gnome-system-monitor (glibtop_get_procmap is intensively used for the 'Writable Memory' column).	2005-12-07 09:35:50 +00:00
Theppitak Karoonboonyanan	532f5ceb4f	Added 'th' (Thai) to ALL_LINGUAS. Added Thai translation. 2005-12-04 Theppitak Karoonboonyanan <thep@linux.thai.net> * configure.in: Added 'th' (Thai) to ALL_LINGUAS. * po/th.po: Added Thai translation.	2005-12-04 10:08:56 +00:00