Compare commits

..

12 Commits

Author SHA1 Message Date
Benoît Dejean
580558333e Released 2.14.0.
* NEWS:
	* configure.in:

	Released 2.14.0.
2006-03-13 09:14:52 +00:00
Žygimantas Beručka
702e3775c3 Updated Lithuanian translation.
2006-03-03  Žygimantas Beručka  <zygis@gnome.org>

	* lt.po: Updated Lithuanian translation.
2006-03-03 10:25:08 +00:00
Clytie Siddall
a597640830 lv.po: Updated Latvian translation. 2006-02-28 05:15:51 +00:00
Benoît Dejean
a956784797 Released 2.13.92.
* NEWS:
        * configure.in:

        Released 2.13.92.
2006-02-27 08:26:56 +00:00
Benoît Dejean
e71023b362 Added proc_mem example.
* pprint.c: (pprint_get_proc_mem), (main):

        Added proc_mem example.
2006-02-27 08:14:12 +00:00
Benoît Dejean
89f9c1d43a Fixed glibtop_get_proc_state doc. Patch by Emil Nowak <emil5@go2.pl>.
* reference.texi: Fixed glibtop_get_proc_state doc.
        Patch by Emil Nowak <emil5@go2.pl>.
2006-02-21 10:17:21 +00:00
Benoît Dejean
29adf02352 Also ignores linprocfs, mfs and devfs. Closes #331856. Patch by Andreas
* mountlist.c: (ignore_mount_entry): Also ignores linprocfs, mfs
	and devfs.
	Closes #331856.
	Patch by Andreas Kohn <andreas.kohn@gmail.com>
2006-02-21 09:06:40 +00:00
Benoît Dejean
35030c878b Bump version to 2.13.4. Reordered libs. Closes #329153.
* configure.in:

	Bump version to 2.13.4.
	Reordered libs. Closes #329153.
2006-02-20 18:58:41 +00:00
Benoît Dejean
9b916ee402 Released 2.13.3.
* configure.in:
	* NEW:

	Released 2.13.3.
2006-01-23 18:02:22 +00:00
Benoît Dejean
23ca9669ae I can't believe i've been so stupid :) Uses smaps if linux > 2.6.14.
* procmap.c: (glibtop_get_proc_map_s):

	I can't believe i've been so stupid :)
	Uses smaps if linux > 2.6.14.
2006-01-23 16:41:10 +00:00
Benoît Dejean
d66ae501f9 /me stupid. Revert last commit. Sorry 2006-01-02 17:43:45 +00:00
Benoît Dejean
ccb10a7b33 Updated. 2006-01-02 17:13:18 +00:00
15 changed files with 188 additions and 83 deletions

View File

@@ -1,3 +1,31 @@
2006-03-13 Benoît Dejean <benoit@placenet.org>
* NEWS:
* configure.in:
Released 2.14.0.
2006-02-27 Benoît Dejean <benoit@placenet.org>
* NEWS:
* configure.in:
Released 2.13.92.
2006-02-20 Benoît Dejean <benoit@placenet.org>
* configure.in:
Bump version to 2.13.4.
Reordered libs. Closes #329153.
2006-01-23 Benoît Dejean <benoit@placenet.org>
* configure.in:
* NEW:
Released 2.13.3.
2006-01-02 Benoît Dejean <benoit@placenet.org>
* NEWS:

View File

@@ -1,3 +1,3 @@
Email: martin@home-of-linux.org
Email: dave@srce.hr
Benoît Dejean (tazforever@dlfp.org)
Current maintainer : Benoît Dejean (benoit@placenet.org)

14
NEWS
View File

@@ -1,3 +1,17 @@
Mars 13, 2006: Overview of changes in 2.14.0
============================================
* Updated translations.
February 27, 2006: Overview of changes in 2.13.92
=================================================
* Fixed proc_state documentation.
* Updated mountlist ignore list.
January 23, 2006: Overview of changes in 2.13.3
===============================================
* linux:
- fixe get_procmap for linux < 2.6.14.
January 2, 2006: Overview of changes in 2.13.2
==============================================
* Fixed libtool versioning (James Henstridge)

View File

@@ -3,8 +3,8 @@ dnl Configure script for the Gnome library
dnl
m4_define([libgtop_major_version], [2])
m4_define([libgtop_minor_version], [13])
m4_define([libgtop_micro_version], [2])
m4_define([libgtop_minor_version], [14])
m4_define([libgtop_micro_version], [0])
m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
dnl increment if the interface has additions, changes, removals.
@@ -318,7 +318,7 @@ else
LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $libs_xauth"
fi
LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
LIBGTOP_EXTRA_LIBS="$GLIB_LIBS $LIBGTOP_EXTRA_LIBS"
LIBGTOP_LIBS="$LIBGTOP_LIBS"

View File

@@ -1,3 +1,8 @@
2006-02-21 Benoît Dejean <benoit@placenet.org>
* reference.texi: Fixed glibtop_get_proc_state doc.
Patch by Emil Nowak <emil5@go2.pl>.
2005-01-03 Benoît Dejean <TazForEver@dlfp.org>
* reference.texi: Updated.

View File

@@ -493,7 +493,7 @@ glibtop_get_proc_state_l (glibtop *server, glibtop_proc_state *buf,
@end cartouche
@end example
Declaration of @code{glibtop_proc_state} in @file{<glibtop/proc_state.h>}:
Declaration of @code{glibtop_proc_state} in @file{<glibtop/procstate.h>}:
@example
@cartouche

View File

@@ -1,3 +1,9 @@
2006-02-27 Benoît Dejean <benoit@placenet.org>
* pprint.c: (pprint_get_proc_mem), (main):
Added proc_mem example.
2005-12-15 Benoît Dejean <benoit@placenet.org>
* proclist.c: (print_pids), (main):

View File

@@ -268,6 +268,24 @@ static void pprint_get_proc_kernel(pid_t pid)
}
static void pprint_get_proc_mem(pid_t pid)
{
glibtop_proc_mem buf;
glibtop_get_proc_mem(&buf, pid);
HEADER_PPRINT(glibtop_get_proc_mem);
PPRINT(flags, "%#llx");
PPRINT(size, "%llu");
PPRINT(vsize, "%llu");
PPRINT(resident, "%llu");
PPRINT(share, "%llu");
PPRINT(rss, "%llu");
PPRINT(rss_rlim, "%llu");
FOOTER_PPRINT();
}
int main()
{
@@ -298,6 +316,7 @@ int main()
pprint_get_uptime();
pprint_get_proc_kernel(getpid());
pprint_get_proc_mem(getpid());
glibtop_close();

View File

@@ -1,3 +1,11 @@
2006-03-03 Žygimantas Beručka <zygis@gnome.org>
* lt.po: Updated Lithuanian translation.
2006-02-28 Clytie Siddall <clytie@riverland.net.au>
* lv.po: Updated Latvian translation by Raivis Dejus <orvils@gmail.com>.
2005-12-04 Theppitak Karoonboonyanan <thep@linux.thai.net>
* th.po: Added Thai translation.

View File

@@ -1,8 +1,8 @@
# Lithuanian translation of libgtop library.
# Copyright (C) 2003-2005 Free Software Foundation.
# Copyright (C) 2003-2006 Free Software Foundation.
# This file is distributed under the same license as the libgtop package.
# Tomas Kuliavas <tokul@users.sourceforge.net>, 2003.
# Žygimantas Beručka <uid0@akl.lt>, 2003-2005
# Žygimantas Beručka <zygis@gnome.org>, 2003-2006.
#
#
msgid ""
@@ -10,21 +10,20 @@ msgstr ""
"Project-Id-Version: libgtop\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-09-25 18:15+0200\n"
"PO-Revision-Date: 2005-01-30 03:52+0200\n"
"Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n"
"PO-Revision-Date: 2006-03-03 12:24+0200\n"
"Last-Translator: Žygimantas Beručka <zygis@gnome.org>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
"100<10 || n%100>=20) ? 1 : 2);\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: lib/read.c:65
#, c-format
msgid "read %d byte"
msgid_plural "read %d bytes"
msgstr[0] "perskaityta %d baitas"
msgstr[1] "perskaityta %d baitai"
msgstr[0] "perskaitytas %d baitas"
msgstr[1] "perskaityti %d baitai"
msgstr[2] "perskaityta %d baitų"
#: lib/read_data.c:53
@@ -35,16 +34,16 @@ msgstr "perskaitytų duomenų dydis"
#, c-format
msgid "read %lu byte of data"
msgid_plural "read %lu bytes of data"
msgstr[0] "perskaityta %lu baitas duomenų"
msgstr[1] "perskaityta %lu baitai duomenų"
msgstr[0] "perskaitytas %lu baitas duomenų"
msgstr[1] "perskaityti %lu baitai duomenų"
msgstr[2] "perskaityta %lu baitų duomenų"
#: lib/write.c:52
#, c-format
msgid "wrote %d byte"
msgid_plural "wrote %d bytes"
msgstr[0] "įrašyta %d baitas"
msgstr[1] "įrašyta %d baitai"
msgstr[0] "įrašytas %d baitas"
msgstr[1] "įrašyti %d baitai"
msgstr[2] "įrašyta %d baitų"
#: src/daemon/gnuserv.c:460
@@ -86,7 +85,7 @@ msgid ""
"Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
"Klaidingi parametrai %s: %s.\n"
"Paleiskite '%s --help' norėdami pamatyti visus galimus komandinės eilutės "
"Paleiskite %s --help norėdami pamatyti visus galimus komandinės eilutės "
"parametrus.\n"
#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
@@ -187,7 +186,7 @@ msgstr "CPU apribojimai viršyti"
#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
msgid "File size limit exceeded"
msgstr "Bylų dydžio apribojimai viršyti"
msgstr "Rinkmenų dydžio apribojimai viršyti"
#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
msgid "Virtual alarm clock"
@@ -207,8 +206,8 @@ msgstr "Informacijos užklausa"
#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
msgid "User defined signal 1"
msgstr "Pirmas vartotojiškas signalas (USR1)"
msgstr "Pirmas naudotojo nurodytas signalas (USR1)"
#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
msgid "User defined signal 2"
msgstr "Antras vartotojiškas signalas (USR2)"
msgstr "Antras naudotojo nurodytas signalas (USR2)"

126
po/lv.po
View File

@@ -1,77 +1,83 @@
# libgtop for Latvian.
# Copyright (C) 2002 Free Software Foundation, Inc.
# Latvian translation for LibGTop
# Copyright © 2006 Gnome i18n Project for Latvian.
# Peteris Krisjanis <peteris.krisjanis@os.lv>, 2002.
# Raivis Dejus <orvils@gmail.com>, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: libgtop\n"
"Project-Id-Version: libgtop HEAD\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-09-25 18:15+0200\n"
"PO-Revision-Date: 2002-08-31 09:57+0200\n"
"Last-Translator: Artis Trops <hornet@navigators.lv>\n"
"Language-Team: Latvian <ll10nt@os.lv>\n"
"POT-Creation-Date: 2006-02-24 08:54+0100\n"
"PO-Revision-Date: 2006-02-24 21:20+0200\n"
"Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
"Language-Team: Latvian <locale@laka.lv>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
"X-Generator: KBabel 1.10.2\n"
#: lib/read.c:65
#, fuzzy, c-format
#: ../lib/read.c:65
#, c-format
msgid "read %d byte"
msgid_plural "read %d bytes"
msgstr[0] "lasīt %d baitus"
msgstr[0] "lasīt %d baitu"
msgstr[1] "lasīt %d baitus"
msgstr[2] "lasīt %d baitu"
#: lib/read_data.c:53
#: ../lib/read_data.c:53
msgid "read data size"
msgstr "lasīt datu izmēru"
#: lib/read_data.c:72
#, fuzzy, c-format
#: ../lib/read_data.c:72
#, c-format
msgid "read %lu byte of data"
msgid_plural "read %lu bytes of data"
msgstr[0] "lasīt %d baitus"
msgstr[1] "lasīt %d baitus"
msgstr[0] "lasīt %lu baitu"
msgstr[1] "lasīt %lu baitus"
msgstr[2] "lasīt %lu baitu"
#: lib/write.c:52
#, fuzzy, c-format
#: ../lib/write.c:52
#, c-format
msgid "wrote %d byte"
msgid_plural "wrote %d bytes"
msgstr[0] "rakstīt %d baitus"
msgstr[1] "rakstīt %d baitus"
msgstr[0] "ierakstīju %d baitu"
msgstr[1] "ierakstīju %d baitus"
msgstr[2] "ierakstīju %d baitu"
#: src/daemon/gnuserv.c:460
#: ../src/daemon/gnuserv.c:460
msgid "Enable debugging"
msgstr "Aktivizēt atkļūdošanu"
#: src/daemon/gnuserv.c:460
#: ../src/daemon/gnuserv.c:460
msgid "DEBUG"
msgstr "DEBUG"
#: src/daemon/gnuserv.c:462
#: ../src/daemon/gnuserv.c:462
msgid "Enable verbose output"
msgstr "Aktivizēt vārdisku izvadi"
#: src/daemon/gnuserv.c:462
#: ../src/daemon/gnuserv.c:462
msgid "VERBOSE"
msgstr "VERBOSE"
#: src/daemon/gnuserv.c:464
#: ../src/daemon/gnuserv.c:464
msgid "Don't fork into background"
msgstr "Nesadalīties fona"
#: src/daemon/gnuserv.c:464
#: ../src/daemon/gnuserv.c:464
msgid "NO-DAEMON"
msgstr "NO-DAEMON"
#: src/daemon/gnuserv.c:466
#: ../src/daemon/gnuserv.c:466
msgid "Invoked from inetd"
msgstr "Izsaukt no inetd"
#: src/daemon/gnuserv.c:466
#: ../src/daemon/gnuserv.c:466
msgid "INETD"
msgstr "INETD"
#: src/daemon/gnuserv.c:500
#: ../src/daemon/gnuserv.c:500
#, c-format
msgid ""
"Error on option %s: %s.\n"
@@ -81,126 +87,126 @@ msgstr ""
"Palaidiet '%s --help' lai redzētu pilnu pieejamo komandu rindas opciju "
"sarakstu.\n"
#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
msgid "Hangup"
msgstr "Iekārt"
#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
msgid "Interrupt"
msgstr "Pātraukt"
#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
msgid "Quit"
msgstr "Iziet"
#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
msgid "Illegal instruction"
msgstr "Neatļauta instrukcija"
#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
msgid "Trace trap"
msgstr "Izsekot slazdu"
#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
msgid "Abort"
msgstr "Pātraukt"
#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
msgid "EMT error"
msgstr "EMT kļūda"
#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
msgid "Floating-point exception"
msgstr "Peldošā punkta izņēmums"
#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
msgid "Kill"
msgstr "Nobeigt"
#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
msgid "Bus error"
msgstr "Šinas kļūda"
#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
msgid "Segmentation violation"
msgstr "Segmentācijas pārkāpums"
#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
msgid "Bad argument to system call"
msgstr "Slikts arguments sistēmas izsaukumam"
#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
msgid "Broken pipe"
msgstr "Pātraukts kanāls"
#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
msgid "Alarm clock"
msgstr "Brīdinājuma pulkstenis"
#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
msgid "Termination"
msgstr "Pātraukšana"
#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
msgid "Urgent condition on socket"
msgstr "Steidzama situācija kontaktā"
#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
msgid "Stop"
msgstr "Stop"
#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
msgid "Keyboard stop"
msgstr "Tastatūra stop"
#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
msgid "Continue"
msgstr "Turpināt"
#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
msgid "Child status has changed"
msgstr "Bērna statuss ir izmainījies"
#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
msgid "Background read from tty"
msgstr "Fona lasīšana no tty"
#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
msgid "Background write to tty"
msgstr "Fona rakstīšana uz tty"
#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
msgid "I/O now possible"
msgstr "I/O tagad iespējams"
#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
msgid "CPU limit exceeded"
msgstr "CPU limits pārsniegts"
#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
msgid "File size limit exceeded"
msgstr "Faila izmēra limits pārsniegts"
#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
msgid "Virtual alarm clock"
msgstr "Virtuāls brīdinājuma pulkstenis"
#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
msgid "Profiling alarm clock"
msgstr "Profilēšanas modinātājs"
#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
msgid "Window size change"
msgstr "Loga izmēru maiņa"
#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
msgid "Information request"
msgstr "Informācijas pieprasījums"
#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
msgid "User defined signal 1"
msgstr "Lietotāja definēts signāls 1"
#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
msgid "User defined signal 2"
msgstr "Lietotāja definēts signāls 2"
msgstr "Lietotāja definēts signāls 2"

View File

@@ -1,3 +1,10 @@
2006-02-21 Benoît Dejean <benoit@placenet.org>
* mountlist.c: (ignore_mount_entry): Also ignores linprocfs, mfs
and devfs.
Closes #331856.
Patch by Andreas Kohn <andreas.kohn@gmail.com>
2005-04-26 Jörgen Scheibengruber <mfcn@gmx.de>
* mountlist.c: (ignore_mount_entry): Added tmpfs to ignore list.

View File

@@ -540,7 +540,10 @@ static gboolean ignore_mount_entry(const struct mount_entry *me)
static const char ignored[][12] = {
"autofs",
"binfmt_misc",
"devfs",
"devpts",
"linprocfs",
"mfs",
"mntfs",
"mqueue",
"none",

View File

@@ -1,3 +1,10 @@
2006-01-23 Benoît Dejean <benoit@placenet.org>
* procmap.c: (glibtop_get_proc_map_s):
I can't believe i've been so stupid :)
Uses smaps if linux > 2.6.14.
2005-12-15 Benoît Dejean <benoit@placenet.org>
* proclist.c: (glibtop_get_proclist_s):

View File

@@ -133,12 +133,15 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid)
100);
FILE *maps;
const char *filename;
gboolean has_smaps;
glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_MAP, 0);
memset (buf, 0, sizeof (glibtop_proc_map));
if (server->os_version_code >= LINUX_VERSION_CODE(2, 6, 0))
has_smaps = server->os_version_code >= LINUX_VERSION_CODE(2, 6, 14);
if (has_smaps)
filename = SMAPS_FILE;
else
filename = MAPS_FILE;
@@ -211,7 +214,7 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid)
entry->inode = (guint64) inode;
g_strlcpy(entry->filename, filename, sizeof entry->filename);
if (server->os_version_code >= LINUX_VERSION_CODE(2, 6, 0))
if (has_smaps)
add_smaps(server, maps, entry);
}