New upstream version 2.41.3

Also add units to headers

AUTHORS

@@ -1,3 +1,4 @@
 Martin Baulig (martin@home-of-linux.org)
 Drazen Kacar (dave@srce.hr)
-Benoît Dejean (tazforever@dlfp.org)
+Benoît Dejean (bdejean@gmail.com)
+Robert Roth (robert.roth.off@gmail.com)

INSTALL

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+   Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
-Inc.
+Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,97 +12,96 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell command `./configure && make && make install'
+   Briefly, the shell command './configure && make && make install'
 should configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
+more-detailed instructions are generic; see the 'README' file for
 instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
+'INSTALL' file but do not implement all of the features documented
 below.  The lack of an optional feature in a given package is not
 necessarily a bug.  More recommendations for GNU packages can be found
 in *note Makefile Conventions: (standards)Makefile Conventions.
 
-   The `configure' shell script attempts to guess correct values for
+   The 'configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
+those values to create a 'Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
+It may also create one or more '.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
+definitions.  Finally, it creates a shell script 'config.status' that
 you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
+file 'config.log' containing compiler output (useful mainly for
-debugging `configure').
+debugging 'configure').
 
-   It can also use an optional file (typically called `config.cache'
+   It can also use an optional file (typically called 'config.cache' and
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
-the results of its tests to speed up reconfiguring.  Caching is
+results of its tests to speed up reconfiguring.  Caching is disabled by
-disabled by default to prevent problems with accidental use of stale
+default to prevent problems with accidental use of stale cache files.
-cache files.
 
    If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
+to figure out how 'configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+diffs or instructions to the address given in the 'README' so they can
 be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
-   The file `configure.ac' (or `configure.in') is used to create
+   The file 'configure.ac' (or 'configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
+'configure' by a program called 'autoconf'.  You need 'configure.ac' if
-you want to change it or regenerate `configure' using a newer version
+you want to change it or regenerate 'configure' using a newer version of
-of `autoconf'.
+'autoconf'.
 
    The simplest way to compile this package is:
 
-  1. `cd' to the directory containing the package's source code and type
+  1. 'cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
+     './configure' to configure the package for your system.
 
-     Running `configure' might take a while.  While running, it prints
+     Running 'configure' might take a while.  While running, it prints
      some messages telling which features it is checking for.
 
-  2. Type `make' to compile the package.
+  2. Type 'make' to compile the package.
 
-  3. Optionally, type `make check' to run any self-tests that come with
+  3. Optionally, type 'make check' to run any self-tests that come with
      the package, generally using the just-built uninstalled binaries.
 
-  4. Type `make install' to install the programs and any data files and
+  4. Type 'make install' to install the programs and any data files and
      documentation.  When installing into a prefix owned by root, it is
      recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
+     user, and only the 'make install' phase executed with root
      privileges.
 
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
+  5. Optionally, type 'make installcheck' to repeat any self-tests, but
      this time using the binaries in their final installed location.
      This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
+     regular user, particularly if the prior 'make install' required
      root privileges, verifies that the installation completed
      correctly.
 
   6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
+     source code directory by typing 'make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
+     files that 'configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
+     a different kind of computer), type 'make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
+     also a 'make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  7. Often, you can also type `make uninstall' to remove the installed
+  7. Often, you can also type 'make uninstall' to remove the installed
      files again.  In practice, not all packages have tested that
      uninstallation works correctly, even though it is required by the
      GNU Coding Standards.
 
-  8. Some packages, particularly those that use Automake, provide `make
+  8. Some packages, particularly those that use Automake, provide 'make
      distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
+     targets like 'make install' and 'make uninstall' work correctly.
      This target is generally not run by end users.
 
 Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
+the 'configure' script does not know about.  Run './configure --help'
 for details on some of the pertinent environment variables.
 
-   You can give `configure' initial values for configuration parameters
+   You can give 'configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
+by setting variables in the command line or in the environment.  Here is
-is an example:
+an example:
 
      ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
@@ -113,21 +112,21 @@ Compiling For Multiple Architectures
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU 'make'.  'cd' to the
 directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
+the 'configure' script.  'configure' automatically checks for the source
-source code in the directory that `configure' is in and in `..'.  This
+code in the directory that 'configure' is in and in '..'.  This is known
-is known as a "VPATH" build.
+as a "VPATH" build.
 
-   With a non-GNU `make', it is safer to compile the package for one
+   With a non-GNU 'make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
+installed the package for one architecture, use 'make distclean' before
 reconfiguring for another architecture.
 
    On MacOS X 10.5 and later systems, you can create libraries and
 executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
+"universal" binaries--by specifying multiple '-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
+compiler but only a single '-arch' option to the preprocessor.  Like
 this:
 
      ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
@@ -136,105 +135,104 @@ this:
 
    This is not guaranteed to produce working output in all cases, you
 may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
+using the 'lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-   By default, `make install' installs the package's commands under
+   By default, 'make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
+'/usr/local/bin', include files under '/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
+can specify an installation prefix other than '/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
 absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
+options like '--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
+kinds of files.  Run 'configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
+you can set and what kinds of files go in them.  In general, the default
-default for these options is expressed in terms of `${prefix}', so that
+for these options is expressed in terms of '${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
+specifying just '--prefix' will affect all of the other directory
 specifications that were not explicitly provided.
 
    The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
+correct locations to 'configure'; however, many packages provide one or
 both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
+'make install' command line to change installation locations without
 having to reconfigure or recompile.
 
    The first method involves providing an override variable for each
-affected directory.  For example, `make install
+affected directory.  For example, 'make install
 prefix=/alternate/directory' will choose an alternate location for all
 directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
+'${prefix}'.  Any directories that were specified during 'configure',
-but not in terms of `${prefix}', must each be overridden at install
+but not in terms of '${prefix}', must each be overridden at install time
-time for the entire installation to be relocated.  The approach of
+for the entire installation to be relocated.  The approach of makefile
-makefile variable overrides for each directory variable is required by
+variable overrides for each directory variable is required by the GNU
-the GNU Coding Standards, and ideally causes no recompilation.
+Coding Standards, and ideally causes no recompilation.  However, some
-However, some platforms have known limitations with the semantics of
+platforms have known limitations with the semantics of shared libraries
-shared libraries that end up requiring recompilation when using this
+that end up requiring recompilation when using this method, particularly
-method, particularly noticeable in packages that use GNU Libtool.
+noticeable in packages that use GNU Libtool.
 
-   The second method involves providing the `DESTDIR' variable.  For
+   The second method involves providing the 'DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
+example, 'make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
+'/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
 does not work on platforms that have drive letters.  On the other hand,
 it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
+when some directory options were not specified in terms of '${prefix}'
-at `configure' time.
+at 'configure' time.
 
 Optional Features
 =================
 
    If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
+with an extra prefix or suffix on their names by giving 'configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
 
-   Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to '--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
+'configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
+is something like 'gnu-as' or 'x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
+'README' should mention any '--enable-' and '--with-' options that the
 package recognizes.
 
-   For packages that use the X Window System, `configure' can usually
+   For packages that use the X Window System, 'configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
+you can use the 'configure' options '--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+'--x-libraries=DIR' to specify their locations.
 
    Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
+execution of 'make' will be.  For these packages, running './configure
 --enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
+overridden with 'make V=1'; while running './configure
 --disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
+overridden with 'make V=0'.
 
 Particular systems
 ==================
 
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC
-CC is not installed, it is recommended to use the following options in
+is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
      ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
-   HP-UX `make' updates targets which have the same time stamps as
+   HP-UX 'make' updates targets which have the same timestamps as their
-their prerequisites, which makes it generally unusable when shipped
+prerequisites, which makes it generally unusable when shipped generated
-generated files such as `configure' are involved.  Use GNU `make'
+files such as 'configure' are involved.  Use GNU 'make' instead.
-instead.
 
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+parse its '<wchar.h>' header file.  The option '-nodtk' can be used as a
-a workaround.  If GNU CC is not installed, it is therefore recommended
+workaround.  If GNU CC is not installed, it is therefore recommended to
-to try
+try
 
      ./configure CC="cc"
 
@@ -242,26 +240,26 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This
 directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+these programs are available in '/usr/bin'.  So, if you need '/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
+in your 'PATH', put it _after_ '/usr/bin'.
 
-   On Haiku, software installed for all users goes in `/boot/common',
+   On Haiku, software installed for all users goes in '/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
+not '/usr/local'.  It is recommended to use the following options:
 
      ./configure --prefix=/boot/common
 
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
+   There may be some features 'configure' cannot figure out
 automatically, but needs to determine by the type of machine the package
 will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
+_same_ architectures, 'configure' can figure that out, but if it prints
 a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
+'--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+type, such as 'sun4', or a canonical name which has the form:
 
      CPU-COMPANY-SYSTEM
 
@@ -270,101 +268,101 @@ where SYSTEM can have one of these forms:
      OS
      KERNEL-OS
 
-   See the file `config.sub' for the possible values of each field.  If
+   See the file 'config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
+'config.sub' isn't included in this package, then this package doesn't
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the option '--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
 platform different from the build platform, you should specify the
 "host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+eventually be run) with '--host=TYPE'.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
+   If you want to set default values for 'configure' scripts to share,
-you can create a site shell script called `config.site' that gives
+you can create a site shell script called 'config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+default values for variables like 'CC', 'cache_file', and 'prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
+'PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
+'CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
+A warning: not all 'configure' scripts look for a site script.
 
 Defining Variables
 ==================
 
    Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
+environment passed to 'configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
+them in the 'configure' command line, using 'VAR=value'.  For example:
 
      ./configure CC=/usr/local2/bin/gcc
 
-causes the specified `gcc' to be used as the C compiler (unless it is
+causes the specified 'gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
-an Autoconf limitation.  Until the limitation is lifted, you can use
+Autoconf limitation.  Until the limitation is lifted, you can use this
-this workaround:
+workaround:
 
      CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
-`configure' Invocation
+'configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
+   'configure' recognizes the following options to control how it
 operates.
 
-`--help'
+'--help'
-`-h'
+'-h'
-     Print a summary of all of the options to `configure', and exit.
+     Print a summary of all of the options to 'configure', and exit.
 
-`--help=short'
+'--help=short'
-`--help=recursive'
+'--help=recursive'
      Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
+     'configure', and exit.  The 'short' variant lists options used only
-     only in the top level, while the `recursive' variant lists options
+     in the top level, while the 'recursive' variant lists options also
-     also present in any nested packages.
+     present in any nested packages.
 
-`--version'
+'--version'
-`-V'
+'-V'
-     Print the version of Autoconf used to generate the `configure'
+     Print the version of Autoconf used to generate the 'configure'
      script, and exit.
 
-`--cache-file=FILE'
+'--cache-file=FILE'
      Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     traditionally 'config.cache'.  FILE defaults to '/dev/null' to
      disable caching.
 
-`--config-cache'
+'--config-cache'
-`-C'
+'-C'
-     Alias for `--cache-file=config.cache'.
+     Alias for '--cache-file=config.cache'.
 
-`--quiet'
+'--quiet'
-`--silent'
+'--silent'
-`-q'
+'-q'
      Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
+     suppress all normal output, redirect it to '/dev/null' (any error
      messages will still be shown).
 
-`--srcdir=DIR'
+'--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
+     'configure' can determine that directory automatically.
 
-`--prefix=DIR'
+'--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names:: for
-     for more details, including other options available for fine-tuning
+     more details, including other options available for fine-tuning the
-     the installation locations.
+     installation locations.
 
-`--no-create'
+'--no-create'
-`-n'
+'-n'
      Run the configure checks, but stop before creating any output
      files.
 
-`configure' also accepts some other, not widely useful, options.  Run
+'configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
+'configure --help' for more details.

Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -91,17 +91,18 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/build-to-host.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -178,9 +179,9 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope distdir distdir-am dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
-	$(LISP)config.h.in
+	config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -197,14 +198,11 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = po misc include sysdeps lib src examples doc
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/libgtop-2.0.pc.in $(srcdir)/libgtop.spec.in \
 	$(srcdir)/libgtopconfig.h.in ABOUT-NLS AUTHORS COPYING \
-	ChangeLog INSTALL NEWS README TODO compile config.guess \
+	ChangeLog INSTALL NEWS README compile config.guess \
 	config.rpath config.sub install-sh ltconfig ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -244,6 +242,8 @@ am__relativize = \
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.xz
 DIST_TARGETS = dist-xz
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -265,6 +265,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -276,8 +278,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
@@ -328,6 +332,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LSBLK = @LSBLK@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -337,8 +342,8 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -363,6 +368,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TR = @TR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -415,6 +421,8 @@ libgtop_sysdeps_dir = @libgtop_sysdeps_dir@
 libgtop_top_builddir = @libgtop_top_builddir@
 libs_xauth = @libs_xauth@
 localedir = @localedir@
+localedir_c = @localedir_c@
+localedir_c_make = @localedir_c_make@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -423,6 +431,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 server_programs = @server_programs@
 sharedstatedir = @sharedstatedir@
@@ -474,8 +483,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -664,8 +673,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -747,6 +758,10 @@ dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
 
+dist-zstd: distdir
+	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+	$(am__post_remove_distdir)
+
 dist-tarZ: distdir
 	@echo WARNING: "Support for distribution archives compressed with" \
 		       "legacy program 'compress' is deprecated." >&2
@@ -789,6 +804,8 @@ distcheck: dist
 	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
+	*.tar.zst*) \
+	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
@@ -804,7 +821,7 @@ distcheck: dist
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -969,7 +986,7 @@ uninstall-am: uninstall-libgtopincludeHEADERS uninstall-pkgconfigDATA
 	am--refresh check check-am clean clean-cscope clean-generic \
 	clean-libtool cscope cscopelist-am ctags ctags-am dist \
 	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
-	dist-tarZ dist-xz dist-zip distcheck distclean \
+	dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \

NEWS

@@ -1,3 +1,58 @@
+16 February 2024: Overview of changes in 2.41.3
+================================================
+
+* Fixed daemon buffer overflow #72
+* Updated translations
+
+15 October 2023: Overview of changes in 2.41.2
+================================================
+
+* Solaris
+  - Fix build #47
+* Linux
+  - Change disk example read/write unit to bytes
+  - Fixed potential Buffer overflow when reading disk stats
+  - Changed disk read/write unit to bytes in example
+* CI
+  - Fixed CI by adding missing dependency
+
+
+10 January 2023 : Overview of changes in 2.41.1
+================================================
+
+* FreeBSD
+  - Build fixes
+  - Support FreeBSD 13.0-CURRENT >= 1300062 vm_map_entry
+* OpenBSD
+  - Build fixes
+* Linux
+  - skip loop and rom devices
+* Allow building with gettext >= 0.20
+* Updated translations
+* CI build setup
+
+
+11 March 2019: Overview of changes in 2.40.0
+================================================
+
+* Fixed array and transfer annotations for documentation
+
+18 February 2019: Overview of changes in 2.39.91
+
+* Replace deprecated gnome-common with autoreconf
+
+04 February 2019: Overview of changes in 2.39.90
+================================================
+
+* Updated translations
+* FreeBSD:
+  - added support for laundry memory
+  - added support for ZFS ARC
+* Fixed compile warnings
+* Fix build on FreeBSD and darwin
+* Linux:
+  - get procmap doesn't need suid
+
 11 September 2017: Overview of changes in 2.38.0
 ================================================
 

acinclude.m4

@@ -263,8 +263,7 @@ AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
 [
 ok=
 if test $ac_cv_func_getmntinfo = yes; then
-AC_EGREP_HEADER(f_type;, sys/mount.h,
+AC_EGREP_HEADER(getmntinfo, sys/mount.h, ok=yes)
-ok=yes)
 fi
 test -n "$ok" \
 && fu_cv_sys_mounted_getmntinfo=yes \

aclocal.m4

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,357 +14,13 @@
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
-[m4_warning([this file was generated for autoconf 2.69.
+[m4_warning([this file was generated for autoconf 2.71.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
-# serial 11 (pkg-config-0.29.1)
-
-dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl As a special exception to the GNU General Public License, if you
-dnl distribute this file as part of a program that contains a
-dnl configuration script generated by Autoconf, you may include it under
-dnl the same distribution terms that you use for the rest of that
-dnl program.
-
-dnl PKG_PREREQ(MIN-VERSION)
-dnl -----------------------
-dnl Since: 0.29
-dnl
-dnl Verify that the version of the pkg-config macros are at least
-dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-dnl installed version of pkg-config, this checks the developer's version
-dnl of pkg.m4 when generating configure.
-dnl
-dnl To ensure that this macro is defined, also add:
-dnl m4_ifndef([PKG_PREREQ],
-dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-dnl
-dnl See the "Since" comment for each macro you use to see what version
-dnl of the macros you require.
-m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
-m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
-    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-])dnl PKG_PREREQ
-
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-dnl ----------------------------------
-dnl Since: 0.16
-dnl
-dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-dnl first found in the path. Checks that the version of pkg-config found
-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-dnl used since that's the first version where most current features of
-dnl pkg-config existed.
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])dnl PKG_PROG_PKG_CONFIG
-
-dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------------------------------
-dnl Since: 0.18
-dnl
-dnl Check to see whether a particular set of modules exists. Similar to
-dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-dnl
-dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
-dnl it's called might be skipped (such as if it is within an "if", you
-dnl have to call PKG_CHECK_EXISTS manually
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-dnl ---------------------------------------------
-dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-dnl pkg_failed based on the result.
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])dnl _PKG_CONFIG
-
-dnl _PKG_SHORT_ERRORS_SUPPORTED
-dnl ---------------------------
-dnl Internal check to see if pkg-config supports short errors.
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])dnl _PKG_SHORT_ERRORS_SUPPORTED
-
-
-dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl   [ACTION-IF-NOT-FOUND])
-dnl --------------------------------------------------------------
-dnl Since: 0.4.0
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])dnl PKG_CHECK_MODULES
-
-
-dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl   [ACTION-IF-NOT-FOUND])
-dnl ---------------------------------------------------------------------
-dnl Since: 0.29
-dnl
-dnl Checks for existence of MODULES and gathers its build flags with
-dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-dnl and VARIABLE-PREFIX_LIBS from --libs.
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-dnl configure.ac.
-AC_DEFUN([PKG_CHECK_MODULES_STATIC],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-_save_PKG_CONFIG=$PKG_CONFIG
-PKG_CONFIG="$PKG_CONFIG --static"
-PKG_CHECK_MODULES($@)
-PKG_CONFIG=$_save_PKG_CONFIG[]dnl
-])dnl PKG_CHECK_MODULES_STATIC
-
-
-dnl PKG_INSTALLDIR([DIRECTORY])
-dnl -------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable pkgconfigdir as the location where a module
-dnl should install pkg-config .pc files. By default the directory is
-dnl $libdir/pkgconfig, but the default can be changed by passing
-dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-dnl parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-])dnl PKG_INSTALLDIR
-
-
-dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-dnl --------------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-dnl module should install arch-independent pkg-config .pc files. By
-dnl default the directory is $datadir/pkgconfig, but the default can be
-dnl changed by passing DIRECTORY. The user can override through the
-dnl --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-])dnl PKG_NOARCH_INSTALLDIR
-
-
-dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------
-dnl Since: 0.28
-dnl
-dnl Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])dnl PKG_CHECK_VAR
-
-dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
-dnl   [DESCRIPTION], [DEFAULT])
-dnl ------------------------------------------
-dnl
-dnl Prepare a "--with-" configure option using the lowercase
-dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
-dnl PKG_CHECK_MODULES in a single macro.
-AC_DEFUN([PKG_WITH_MODULES],
-[
-m4_pushdef([with_arg], m4_tolower([$1]))
-
-m4_pushdef([description],
-           [m4_default([$5], [build with ]with_arg[ support])])
-
-m4_pushdef([def_arg], [m4_default([$6], [auto])])
-m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
-m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
-
-m4_case(def_arg,
-            [yes],[m4_pushdef([with_without], [--without-]with_arg)],
-            [m4_pushdef([with_without],[--with-]with_arg)])
-
-AC_ARG_WITH(with_arg,
-     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
-    [AS_TR_SH([with_]with_arg)=def_arg])
-
-AS_CASE([$AS_TR_SH([with_]with_arg)],
-            [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
-            [auto],[PKG_CHECK_MODULES([$1],[$2],
-                                        [m4_n([def_action_if_found]) $3],
-                                        [m4_n([def_action_if_not_found]) $4])])
-
-m4_popdef([with_arg])
-m4_popdef([description])
-m4_popdef([def_arg])
-
-])dnl PKG_WITH_MODULES
-
-dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [DESCRIPTION], [DEFAULT])
-dnl -----------------------------------------------
-dnl
-dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
-dnl check._[VARIABLE-PREFIX] is exported as make variable.
-AC_DEFUN([PKG_HAVE_WITH_MODULES],
-[
-PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
-
-AM_CONDITIONAL([HAVE_][$1],
-               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
-])dnl PKG_HAVE_WITH_MODULES
-
-dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-dnl   [DESCRIPTION], [DEFAULT])
-dnl ------------------------------------------------------
-dnl
-dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
-dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
-dnl and preprocessor variable.
-AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
-[
-PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
-
-AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
-        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
-])dnl PKG_HAVE_DEFINE_WITH_MODULES
-
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -376,10 +32,10 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.16.5], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -395,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.16.5])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -454,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -485,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -676,13 +332,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -690,49 +345,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
+  # TODO: see whether this extra hack can be removed once we start
-  *\'*) eval set x "$CONFIG_FILES" ;;
+  # requiring Autoconf 2.70 or later.
-  *)   set x $CONFIG_FILES ;;
+  AS_CASE([$CONFIG_FILES],
-  esac
+          [*\'*], [eval set x "$CONFIG_FILES"],
+          [*], [set x $CONFIG_FILES])
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
+    # Check whether this is an Automake generated Makefile which includes
-    # We used to match only the files named 'Makefile.in', but
+    # dependency-tracking related rules and includes.
-    # some people rename them; so instead we look at the file content.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
-      dirpart=`AS_DIRNAME("$mf")`
+      || continue
-    else
+    am_dirpart=`AS_DIRNAME(["$am_mf"])`
-      continue
+    am_filepart=`AS_BASENAME(["$am_mf"])`
-    fi
+    AM_RUN_LOG([cd "$am_dirpart" \
-    # Extract the definition of DEPDIR, am__include, and am__quote
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
-    # from the Makefile without running 'make'.
+        | $MAKE -f - am--depfiles]) || am_rc=$?
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
   done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE="gmake" (or whatever is
+    necessary).  You can also try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).])
+  fi
+  AS_UNSET([am_dirpart])
+  AS_UNSET([am_filepart])
+  AS_UNSET([am_mf])
+  AS_UNSET([am_rc])
+  rm -f conftest-deps.mk
 }
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
@@ -741,18 +390,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # -----------------------------
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
-# This code is only required when automatic dependency tracking
+# This code is only required when automatic dependency tracking is enabled.
-# is enabled.  FIXME.  This creates each '.P' file that we will
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
-# need in order to bootstrap the dependency handling code.
+# order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
      [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
-])
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -780,6 +428,10 @@ m4_defn([AC_PROG_CC])
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_PREREQ([2.65])dnl
+m4_ifdef([_$0_ALREADY_INIT],
+  [m4_fatal([$0 expanded multiple times
+]m4_defn([_$0_ALREADY_INIT]))],
+  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -816,7 +468,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
   [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
@@ -839,8 +491,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
@@ -868,6 +520,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
 		  [m4_define([AC_PROG_OBJCXX],
 			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+AC_SUBST([CTAGS])
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+AC_SUBST([ETAGS])
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+AC_SUBST([CSCOPE])
+
 AC_REQUIRE([AM_SILENT_RULES])dnl
 dnl The testsuite driver may need to know about EXEEXT, so add the
 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
@@ -907,7 +573,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -949,7 +615,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -970,7 +636,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -991,7 +657,7 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -999,49 +665,42 @@ AC_SUBST([am__leading_dot])])
 
 # AM_MAKE_INCLUDE()
 # -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
 AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
-cat > confinc << 'END'
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
 am__include="#"
 am__quote=
-_am_result=none
+# BSD make does it like this.
-# First try GNU make style include.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
-echo "include confinc" > confmf
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-# Ignore all kinds of additional output from 'make'.
+echo 'include confinc.mk # ignored' > confmf.GNU
-case `$am_make -s -f confmf 2> /dev/null` in #(
+_am_result=no
-*the\ am__doit\ target*)
+for s in GNU BSD; do
-  am__include=include
+  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
-  am__quote=
+  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
-  _am_result=GNU
+      ['0:this is the am__doit target'],
-  ;;
+      [AS_CASE([$s],
-esac
+          [BSD], [am__include='.include' am__quote='"'],
-# Now try BSD make style include.
+          [am__include='include' am__quote=''])])
-if test "$am__include" = "#"; then
+  if test "$am__include" != "#"; then
-   echo '.include "confinc"' > confmf
+    _am_result="yes ($s style)"
-   case `$am_make -s -f confmf 2> /dev/null` in #(
+    break
-   *the\ am__doit\ target*)
+  fi
-     am__include=.include
+done
-     am__quote="\""
+rm -f confinc.* confmf.*
-     _am_result=BSD
+AC_MSG_RESULT([${_am_result}])
-     ;;
+AC_SUBST([am__include])])
-   esac
+AC_SUBST([am__quote])])
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1062,12 +721,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
 if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -1080,7 +734,7 @@ fi
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1109,7 +763,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1156,7 +810,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1175,7 +829,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1256,7 +910,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1316,7 +970,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1344,7 +998,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1363,7 +1017,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1494,8 +1148,10 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/build-to-host.m4])
 m4_include([m4/gettext.m4])
 m4_include([m4/gtk-doc.m4])
+m4_include([m4/host-cpu-c-abi.m4])
 m4_include([m4/iconv.m4])
 m4_include([m4/intlmacosx.m4])
 m4_include([m4/introspection.m4])
@@ -1508,6 +1164,7 @@ m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
 m4_include([m4/nls.m4])
+m4_include([m4/pkg.m4])
 m4_include([m4/po.m4])
 m4_include([m4/progtest.m4])
 m4_include([acinclude.m4])

autogen.sh

@@ -1,20 +1,68 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
+RED='\033[0;31m'
+NC='\033[0m' # No Color
 
-srcdir=`dirname $0`
+case "$(uname -s)" in
-test -z "$srcdir" && srcdir=.
+        Linux)
+                if ! [ -x "$(command -v lsblk)" ]; then
+                        echo '' >&2
+                        echo -e "${RED}*** ERROR:${NC}  lsblk cannot be found. Try installing util-linux or util-linux-ng ${RED}***${NC}" >&2
+                        echo '' >&2
+                        exit 1
+                fi
+                if ! [ -x "$(command -v sed)" ]; then
+                        echo '' >&2
+                        echo -e "${RED}*** ERROR:${NC}  sed cannot be found. ***" >&2
+                        echo '' >&2
+                        exit 1
+                fi
+                if ! [ -x "$(command -v tr)" ]; then
+                        echo '' >&2
+                        echo -e "${RED}*** ERROR:${NC}  tr cannot be found. ***" >&2
+                        echo '' >&2
+                        exit 1
+                fi
+        ;;
+        *)
+        ;;
+esac
 
-(test -f $srcdir/configure.ac \
+test -n "$srcdir" || srcdir=$(dirname "$0")
-  && test -f $srcdir/copyright.txt \
+test -n "$srcdir" || srcdir=.
-  && test -d $srcdir/sysdeps) || {
+
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+olddir=$(pwd)
-    echo " top-level gnome directory"
+
-    exit 1
+cd $srcdir
+
+(test -f configure.ac) || {
+        echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+        exit 1
 }
 
-which gnome-autogen.sh || {
+# shellcheck disable=SC2016
-    echo "You need to install gnome-common from the GNOME CVS"
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
-    exit 1
+
-}
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
-REQUIRED_AUTOMAKE_VERSION=1.9
+        echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
-. gnome-autogen.sh
+        echo "*** If you wish to pass any to it, please specify them on the" >&2
+        echo "*** '$0' command line." >&2
+        echo "" >&2
+fi
+
+aclocal --install || exit 1
+gtkdocize --copy || exit 1
+autoreconf --verbose --force --install || exit 1
+
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+        $srcdir/configure "$@" || exit 1
+
+        if [ "$1" = "--help" ]; then
+                exit 0
+        else
+                echo "Now type 'make' to compile $PKG_NAME" || exit 1
+        fi
+else
+        echo "Skipping configure process."
+fi

compile

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

config.h.in

@@ -3,12 +3,7 @@
 /* Define if you have the Andrew File System. */
 #undef AFS
 
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+/* Define to 1 if using 'alloca.c'. */
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
 /* Define to 1 if translation of program messages to the user's native
@@ -25,19 +20,18 @@
 /* Solaris release code (eg. 20501 for Solaris 2.5.1). */
 #undef GLIBTOP_SOLARIS_RELEASE
 
-/* Define to 1 if you have `alloca', as a function or macro. */
+/* Define to 1 if you have 'alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+/* Define to 1 if <alloca.h> works. */
-   */
 #undef HAVE_ALLOCA_H
 
 /* Define to 1 if you have the `bcopy' function. */
 #undef HAVE_BCOPY
 
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the Mac OS X function
-   CoreFoundation framework. */
+   CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
+#undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES
 
 /* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
@@ -119,6 +113,9 @@
 /* defined if you have linux/isdn.h */
 #undef HAVE_ISDN_H
 
+/* Define to 1 if you have the `kinfo_getfile' function. */
+#undef HAVE_KINFO_GETFILE
+
 /* Define to 1 if you have the `lchown' function. */
 #undef HAVE_LCHOWN
 
@@ -137,6 +134,9 @@
 /* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 
+/* Define to 1 if you have the `util' library (-lutil). */
+#undef HAVE_LIBUTIL
+
 /* Define to 1 if you have the <linux/version.h> header file. */
 #undef HAVE_LINUX_VERSION_H
 
@@ -170,6 +170,9 @@
 /* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
+/* Define to 1 if you have the `sbrk' function. */
+#undef HAVE_SBRK
+
 /* Define if struct sockaddr_un has a sun_len member */
 #undef HAVE_SOCKADDR_SUN_LEN
 
@@ -179,6 +182,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -249,6 +255,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
@@ -396,7 +405,9 @@
 /* Define if there is a function named statvfs. [SVR4] */
 #undef STAT_STATVFS
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Define to 1 if we need to define KERNEL to get 'struct msginfo' */
@@ -405,9 +416,6 @@
 /* Define to 1 if we need to define _KERNEL to get 'struct msginfo' */
 #undef STRUCT_MSGINFO_NEEDS__KERNEL
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
@@ -440,7 +448,7 @@
 /* Define to `long int' if <sys/types.h> does not define. */
 #undef off_t
 
-/* Define to `int' if <sys/types.h> does not define. */
+/* Define as a signed integer type capable of holding a process identifier. */
 #undef pid_t
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */

config.rpath

@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2014 Free Software Foundation, Inc.
+#   Copyright 1996-2023 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -371,7 +371,7 @@ else
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd* | dragonfly*)
+    freebsd* | dragonfly* | midnightbsd*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -547,7 +547,7 @@ case "$host_os" in
   freebsd[23].*)
     library_names_spec='$libname$shrext$versuffix'
     ;;
-  freebsd* | dragonfly*)
+  freebsd* | dragonfly* | midnightbsd*)
     library_names_spec='$libname$shrext'
     ;;
   gnu*)

configure.ac

@@ -3,12 +3,12 @@ dnl Configure script for the Gnome library
 dnl
 
 m4_define([libgtop_major_version], [2])
-m4_define([libgtop_minor_version], [38])
+m4_define([libgtop_minor_version], [41])
-m4_define([libgtop_micro_version], [0])
+m4_define([libgtop_micro_version], [3])
 m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
 
 dnl  increment if the interface has additions, changes, removals.
-m4_define([libgtop_current], [11])
+m4_define([libgtop_current], [12])
 
 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -17,7 +17,7 @@ m4_define([libgtop_revision], [0])
 dnl  increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has
 dnl  precedence over adding, so set to 0 if both happened.
-m4_define([libgtop_age], [0])
+m4_define([libgtop_age], [1])
 
 # Increase each time you change the client/server protocol.
 m4_define([libgtop_server_version], [5])
@@ -27,7 +27,7 @@ m4_define([libgtop_version_code], [m4_eval(libgtop_major_version * 1000000 + lib
 
 AC_PREREQ(2.62)
 AC_INIT([libgtop], [libgtop_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop])
+        [https://gitlab.gnome.org/GNOME/libgtop/-/issues/])
 AC_CONFIG_SRCDIR(copyright.txt)
 AC_CONFIG_HEADERS(config.h)
 
@@ -71,6 +71,16 @@ dnl Most people should have a working perl interpreter on their system
 AC_CHECK_PROGS(PERL, perl5 perl)
 test -z "$PERL" && AC_MSG_ERROR([You need to have a working perl interpreter.])
 
+case "${host_os}" in
+	linux*)
+		AC_CHECK_TOOL(LSBLK,lsblk)
+		AC_CHECK_TOOL(SED,sed)
+		AC_CHECK_TOOL(TR,tr)
+		;;
+	*)
+		;;
+esac
+
 AC_CHECK_TOOL(CC,gcc)
 AC_CHECK_TOOL(RANLIB,ranlib)
 AC_CHECK_TOOL(AS,as)
@@ -110,10 +120,12 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_STRUCT_ST_RDEV
-AC_HEADER_TIME
 AC_STRUCT_TM
 AC_TYPE_UID_T
 
+dnl Check sys/time.h
+AC_CHECK_HEADERS([sys/time.h])
+
 dnl For SunOS
 AC_CHECK_TYPE(ssize_t, int)
 AC_CHECK_HEADERS(memory.h)
@@ -213,9 +225,11 @@ AC_FUNC_ALLOCA
 AC_FUNC_MMAP
 AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
+AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv sbrk strdup strtoul uname)
 
-AM_GNU_GETTEXT_VERSION([0.19.4])
+# FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION
+AM_GNU_GETTEXT_VERSION([0.19.6])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
 AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=libgtop-2.0
@@ -270,8 +284,8 @@ AC_ARG_ENABLE(fatal-warnings,
                         [Define to enable fatal warnings]))
 
 dnl These definitions are expanded in make.
-LIBGTOP_LIBS='-L$(libdir)'
+LIBGTOP_LIBS='-L=$(libdir)'
-LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
+LIBGTOP_INCS='-I=$(includedir)/libgtop-2.0'
 
 if test x$libgtop_have_sysinfo = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
@@ -283,8 +297,8 @@ libgtop_save_prefix="$prefix"
 libgtop_save_exec_prefix="$exec_prefix"
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-LIBGTOP_BINDIR=`eval echo "${bindir}"`
+LIBGTOP_BINDIR=`eval echo "${libexecdir}"`
-LIBGTOP_SERVER=`eval echo "${bindir}/libgtop_server2"`
+LIBGTOP_SERVER=`eval echo "${libexecdir}/libgtop_server2"`
 prefix="$libgtop_save_prefix"
 exec_prefix="$libgtop_save_exec_prefix"
 

depcomp

@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2013-05-30.07; # UTC
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -783,9 +783,9 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

doc/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -89,17 +89,18 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/build-to-host.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/version.texi \
@@ -210,7 +211,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -228,8 +229,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(libgtop2_TEXINFOS) $(srcdir)/Makefile.in ChangeLog \
 	mdate-sh texinfo.tex
@@ -276,6 +275,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -287,8 +288,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
@@ -339,6 +342,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LSBLK = @LSBLK@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -348,8 +352,8 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -374,6 +378,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TR = @TR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -426,6 +431,8 @@ libgtop_sysdeps_dir = @libgtop_sysdeps_dir@
 libgtop_top_builddir = @libgtop_top_builddir@
 libs_xauth = @libs_xauth@
 localedir = @localedir@
+localedir_c = @localedir_c@
+localedir_c_make = @localedir_c_make@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -434,6 +441,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 server_programs = @server_programs@
 sharedstatedir = @sharedstatedir@
@@ -472,8 +480,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -750,8 +758,10 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

doc/main.texi

@@ -49,6 +49,7 @@ System Dependent Functions
 * glibtop_proc_map::            Process Memory Maps.
 * glibtop_netload::             Network Load.
 * glibtop_ppp::                 PPP Usage.
+* glibtop_disk::                DISK Usage.
 
 Common Functions
 

doc/mdate-sh

@@ -1,9 +1,9 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
 
-scriptversion=2010-08-21.06; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# Copyright (C) 1995-2021 Free Software Foundation, Inc.
 # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2010-08-21.06; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -74,6 +74,10 @@ export LC_ALL
 LC_TIME=C
 export LC_TIME
 
+# Use UTC to get reproducible result.
+TZ=UTC0
+export TZ
+
 # GNU ls changes its time format in response to the TIME_STYLE
 # variable.  Since we cannot assume 'unset' works, revert this
 # variable to its documented default.
@@ -216,9 +220,9 @@ echo $day $month $year
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

doc/reference.texi

@@ -28,6 +28,7 @@
 * glibtop_proc_map::            Process Memory Maps.
 * glibtop_netload::             Network Load.
 * glibtop_ppp::                 PPP Usage.
+* glibtop_disk::                DISK Usage.
 @end menu
 
 @node glibtop_cpu, glibtop_mem, System Dependent, System Dependent
@@ -1343,7 +1344,7 @@ enum @{
 @end example
 
 @page
-@node glibtop_ppp,  , glibtop_netload, System Dependent
+@node glibtop_ppp, glibtop_disk, glibtop_netload, System Dependent
 @subsection PPP Statistics
 
 Library function @code{glibtop_get_ppp}:
@@ -1403,6 +1404,62 @@ We're currently offline.
 We're currently online.
 @end table
 
+@page
+@node glibtop_disk, , glibtop_ppp, System Dependent
+@subsection DISK Usage
+
+Library function @code{glibtop_get_disk}:
+
+@example
+@cartouche
+void glibtop_get_disk (glibtop_disk *buf);
+void glibtop_get_disk_l (glibtop *server, glibtop_disk *buf);
+@end cartouche
+@end example
+
+Declaration of @code{glibtop_disk} in @file{<glibtop/disk.h>}:
+
+@example
+@cartouche
+typedef struct _glibtop_disk     glibtop_disk;
+
+struct _glibtop_disk
+@{
+    xdisk_sectors_read [GLIBTOP_NDISK],
+    xdisk_time_read [GLIBTOP_NDISK],
+    xdisk_sectors_write [GLIBTOP_NDISK],
+    xdisk_time_write [GLIBTOP_NDISK],
+@};
+@end cartouche
+@end example
+
+All DISK reads and writes are measured by @dfn{sectors} which are normally 512 bytes each. 
+All disk time are measured in milliseconds which is 1/1000th of a second.
+
+@table @code
+@item xdisk_sectors_read
+Number of sectors read since system boot.
+
+@item xdisk_time_read
+Number of milliseconds spent reading since system boot.
+
+@item xdisk_sectors_write
+Number of sectors written since system boot.
+
+@item xdisk_time_write
+Number of milliseconds spent writing since system boot.
+
+@end table
+
+The @samp{xdisk_} are values from arrays of @code{GLIBTOP_NDISK} (defined in
+@file{<glibtop/disk.h>}) elements and contain one value for each DISK
+in the system.
+
+Please note that all of the disk values are absolute values measured in
+certain units since system boot. To get bandwidth values (bytes/s), you need to call @code{glibtop_disk}, save the
+result, wait some time and then call it again and divide the differences of
+the two values by the time spent reading or writing.
+
 @page
 @node Common Functions, Library Functions, System Dependent, Reference Manual
 @section Common Functions

doc/reference/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,6 +15,24 @@
 @SET_MAKE@
 
 # -*- mode: makefile -*-
+#
+# gtk-doc.make - make rules for gtk-doc
+# Copyright (C) 2003 James Henstridge
+#               2004-2007 Damon Chaplin
+#               2007-2017 Stefan Sauer
+#
+# This program 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 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ####################################
 # Everything below here is generic #
@@ -95,17 +113,18 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = doc/reference
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/build-to-host.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -159,6 +178,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -170,8 +191,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
@@ -222,6 +245,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LSBLK = @LSBLK@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -231,8 +255,8 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -257,6 +281,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TR = @TR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -309,6 +334,8 @@ libgtop_sysdeps_dir = @libgtop_sysdeps_dir@
 libgtop_top_builddir = @libgtop_top_builddir@
 libs_xauth = @libs_xauth@
 localedir = @localedir@
+localedir_c = @localedir_c@
+localedir_c_make = @localedir_c_make@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -317,6 +344,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 server_programs = @server_programs@
 sharedstatedir = @sharedstatedir@
@@ -403,6 +431,7 @@ DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
+	$(DOC_MODULE).actions	 \
 	$(DOC_MODULE).args 	 \
 	$(DOC_MODULE).hierarchy  \
 	$(DOC_MODULE).interfaces \
@@ -421,34 +450,34 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
 @GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
 
 #### setup ####
-GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_@AM_V@)
-GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_@AM_DEFAULT_V@)
 GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
 
 #### scan ####
-GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_@AM_V@)
-GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_@AM_DEFAULT_V@)
 GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
-GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_@AM_V@)
-GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@)
 GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
 
 #### xml ####
-GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_@AM_V@)
-GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_@AM_DEFAULT_V@)
 GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
 
 #### html ####
-GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_@AM_V@)
-GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_@AM_DEFAULT_V@)
 GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
-GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_@AM_V@)
-GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_@AM_DEFAULT_V@)
 GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
 
 #### pdf ####
-GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_@AM_V@)
-GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_@AM_DEFAULT_V@)
 GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
 all: all-am
 
@@ -470,8 +499,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 $(top_srcdir)/gtk-doc.make $(am__empty):
 
@@ -497,8 +526,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -669,38 +700,38 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
+	  files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
-	    if test "x$$files" != "x" ; then \
+	  if test "x$$files" != "x" ; then \
-	        for file in $$files ; do \
+	    for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file`; \
+	      destdir=`dirname $(abs_builddir)/$$file`; \
-	            test -d "$$destdir" || mkdir -p "$$destdir"; \
+	      test -d "$$destdir" || mkdir -p "$$destdir"; \
-	            test -f $(abs_srcdir)/$$file && \
+	      test -f $(abs_srcdir)/$$file && \
-	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+	        cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
-	        done; \
+	    done; \
-	    fi; \
+	  fi; \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
 scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    scanobj_options=""; \
+	  scanobj_options=""; \
-	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	  gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$$?" = "0"; then \
+	  if test "$$?" = "0"; then \
-	        if test "x$(V)" = "x1"; then \
+	    if test "x$(V)" = "x1"; then \
-	            scanobj_options="--verbose"; \
+	      scanobj_options="--verbose"; \
-	        fi; \
 	    fi; \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	  fi; \
-	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+	  CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	  gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
-	    for i in $(SCANOBJ_FILES) ; do \
+	  for i in $(SCANOBJ_FILES) ; do \
-	        test -f $$i || touch $$i ; \
+	    test -f $$i || touch $$i ; \
-	    done \
+	  done \
 	fi
 	$(AM_V_at)touch scan-build.stamp
 
@@ -710,7 +741,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
 	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
 	$(AM_V_at)touch sgml-build.stamp
@@ -718,6 +749,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF
 sgml.stamp: sgml-build.stamp
 	@true
 
+$(DOC_MAIN_SGML_FILE): sgml-build.stamp
+	@true
+
 xml/gtkdocentities.ent: Makefile
 	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
 		echo "<!ENTITY package \"$(PACKAGE)\">"; \
@@ -745,12 +779,9 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	-@test "x$(HTML_IMAGES)" = "x" || \
 	for file in $(HTML_IMAGES) ; do \
-	  if test -f $(abs_srcdir)/$$file ; then \
+	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
-	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
-	  fi; \
+	  test -f $$file && cp $$file $(abs_builddir)/html; \
-	  if test -f $(abs_builddir)/$$file ; then \
-	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
-	  fi; \
 	done;
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp

doc/reference/html/index.html

@@ -7,7 +7,7 @@
 <meta name="description" content="LibGTop is a library to get system specific data such as CPU and Memory Usage and information about running Processes. On Systems like Solaris or Digital Unix where you need special privileges to get those data, it uses a setuid/setgid server to do so. Even if LibGTop is a part of the GNOME desktop environment (@uref{http://www.gnome.org}), the main interface of LibGTop is totally independent from any particular desktop environment, so you can also use it as a standalone library in any piece of GPLed software. This manual documents the interfaces of the libgtop library and has some short notes to help get you up to speed with using the library.">
 <link rel="home" href="index.html" title="Libgtop Reference Manual">
 <link rel="next" href="libgtop-white-paper.html" title="White paper">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -33,7 +33,7 @@
 	  </p></div></div>
 </div>
 </div></div>
-<div><p class="releaseinfo">for libgtop <span class="phrase">2.38.0</span></p></div>
+<div><p class="releaseinfo">for libgtop <span class="phrase">2.41.3</span></p></div>
 <div><div class="legalnotice">
 <a name="id-1.1.4"></a><p>Permission is granted to copy, distribute and/or modify
       this document under the terms of the <em class="citetitle">GNU Free
@@ -53,7 +53,6 @@
       caps.</p>
 </div></div>
 <div><div class="abstract">
-<p class="title"><b>Abstract</b></p>
 <p>
       LibGTop is a library to get system specific data such as CPU and 
       Memory Usage and information about running Processes.</p>
@@ -192,6 +191,6 @@
 </dl></div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-Close.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-GlibTop.html" title="GlibTop">
 <link rel="next" href="libgtop-Command.html" title="Command">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-Close.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -109,11 +109,8 @@ glibtop_close_s (<em class="parameter"><code><a class="link" href="libgtop-GlibT
 glibtop_close_p (<em class="parameter"><code><a class="link" href="libgtop-GlibTop.html#glibtop" title="struct glibtop"><span class="type">glibtop</span></a> *server</code></em>);</pre>
 </div>
 </div>
-<div class="refsect1">
-<a name="libgtop-Close.other_details"></a><h2>Types and Values</h2>
-</div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-Command.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-Close.html" title="Close">
 <link rel="next" href="libgtop-GlibTop-Server.html" title="GlibTop Server">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-Command.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -68,8 +68,8 @@
 <a name="libgtop-Command.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -86,6 +86,10 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libgtop-Command.html#GLIBTOP-CMND-DISK:CAPS" title="GLIBTOP_CMND_DISK">GLIBTOP_CMND_DISK</a></td>
+</tr>
+<tr>
+<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libgtop-Command.html#GLIBTOP-CMND-MEM:CAPS" title="GLIBTOP_CMND_MEM">GLIBTOP_CMND_MEM</a></td>
 </tr>
 <tr>
@@ -254,6 +258,12 @@ glibtop_call_s (<em class="parameter"><code><a class="link" href="libgtop-GlibTo
 </div>
 <hr>
 <div class="refsect2">
+<a name="GLIBTOP-CMND-DISK:CAPS"></a><h3>GLIBTOP_CMND_DISK</h3>
+<pre class="programlisting">#define GLIBTOP_CMND_DISK 29
+</pre>
+</div>
+<hr>
+<div class="refsect2">
 <a name="GLIBTOP-CMND-MEM:CAPS"></a><h3>GLIBTOP_CMND_MEM</h3>
 <pre class="programlisting">#define GLIBTOP_CMND_MEM		3
 </pre>
@@ -393,7 +403,7 @@ glibtop_call_s (<em class="parameter"><code><a class="link" href="libgtop-GlibTo
 <hr>
 <div class="refsect2">
 <a name="GLIBTOP-MAX-CMND:CAPS"></a><h3>GLIBTOP_MAX_CMND</h3>
-<pre class="programlisting">#define GLIBTOP_MAX_CMND		29
+<pre class="programlisting">#define GLIBTOP_MAX_CMND		30
 </pre>
 </div>
 <hr>
@@ -423,6 +433,6 @@ glibtop_call_s (<em class="parameter"><code><a class="link" href="libgtop-GlibTo
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-GlibTop-Server.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-Command.html" title="Command">
 <link rel="next" href="libgtop-Net-Load.html" title="Net Load">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -43,11 +43,8 @@
 <a name="libgtop-GlibTop-Server.functions_details"></a><h2>Functions</h2>
 <p></p>
 </div>
-<div class="refsect1">
-<a name="libgtop-GlibTop-Server.other_details"></a><h2>Types and Values</h2>
-</div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-GlibTop.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="next" href="libgtop-Close.html" title="Close">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -39,8 +39,8 @@
 <a name="libgtop-GlibTop.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -80,8 +80,8 @@
 <a name="libgtop-GlibTop.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -190,6 +190,9 @@ glibtop_init_s (<em class="parameter"><code><a class="link" href="libgtop-GlibTo
 	gid_t egid;
 
 	glibtop_machine *machine; /* Machine dependent data */
+
+	int ndisk;			/* Number of DISKs,  zero if single-disk. This pertains to disk volumes */
+	int real_ndisk;			/* Number of PHYSICAL DISKs. Only ndisk is monitored for now */
 };
 </pre>
 </div>
@@ -208,6 +211,6 @@ glibtop_init_s (<em class="parameter"><code><a class="link" href="libgtop-GlibTo
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-Net-List.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-Uptime.html" title="Uptime">
 <link rel="next" href="libgtop-open.html" title="open">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -39,8 +39,8 @@
 <a name="libgtop-Net-List.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -82,8 +82,8 @@
 <a name="libgtop-Net-List.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -137,9 +137,9 @@ glibtop_get_netlist (<em class="parameter"><code><a class="link" href="libgtop-N
 </div>
 <div class="refsect3">
 <a name="glibtop-get-netlist.returns"></a><h4>Returns</h4>
-<p> an array of network
+<p>an array of network
 interface names. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1][<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1][<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p>
 </div>
 </div>
 <hr>
@@ -172,9 +172,9 @@ glibtop_get_netlist_l (<em class="parameter"><code><a class="link" href="libgtop
 </div>
 <div class="refsect3">
 <a name="glibtop-get-netlist-l.returns"></a><h4>Returns</h4>
-<p> an array of network
+<p>an array of network
 interface names. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1][<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1][<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p>
 </div>
 </div>
 <hr>
@@ -207,9 +207,9 @@ glibtop_get_netlist_p (<em class="parameter"><code><a class="link" href="libgtop
 </div>
 <div class="refsect3">
 <a name="glibtop-get-netlist-p.returns"></a><h4>Returns</h4>
-<p> an array of network
+<p>an array of network
 interface names. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1][<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1][<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p>
 </div>
 </div>
 <hr>
@@ -242,9 +242,9 @@ glibtop_get_netlist_s (<em class="parameter"><code><a class="link" href="libgtop
 </div>
 <div class="refsect3">
 <a name="glibtop-get-netlist-s.returns"></a><h4>Returns</h4>
-<p> an array of network
+<p>an array of network
 interface names. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1][<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1][<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p>
 </div>
 </div>
 </div>
@@ -279,12 +279,12 @@ interface names. </p>
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-netlist.flags"></a>flags</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-netlist.flags"></a>flags</code></em>;</p></td>
 <td> </td>
 <td> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="glibtop-netlist.number"></a>number</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="glibtop-netlist.number"></a>number</code></em>;</p></td>
 <td class="struct_member_description"><p>Number of entries in the returned list.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -305,6 +305,6 @@ interface names. </p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-Net-Load.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-GlibTop-Server.html" title="GlibTop Server">
 <link rel="next" href="libgtop-PPP.html" title="PPP">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -39,8 +39,8 @@
 <a name="libgtop-Net-Load.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -82,8 +82,8 @@
 <a name="libgtop-Net-Load.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -400,6 +400,6 @@ glibtop_get_netload_s (<em class="parameter"><code><a class="link" href="libgtop
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-PPP.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-Net-Load.html" title="Net Load">
 <link rel="next" href="libgtop-Shared-Memory-Limits.html" title="Shared Memory Limits">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -39,8 +39,8 @@
 <a name="libgtop-PPP.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -82,8 +82,8 @@
 <a name="libgtop-PPP.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -138,13 +138,18 @@ glibtop_get_ppp (<em class="parameter"><code><a class="link" href="libgtop-PPP.h
 <col class="parameters_description">
 <col width="200px" class="parameters_annotations">
 </colgroup>
-<tbody><tr>
+<tbody>
+<tr>
 <td class="parameter_name"><p>buf</p></td>
-<td class="parameter_description"><p>A location to return the PPP usage
+<td class="parameter_description"><p>A location to return the PPP usage</p></td>
-<em class="parameter"><code>short</code></em>
-device: The device to ask information</p></td>
 <td class="parameter_annotations"> </td>
-</tr></tbody>
+</tr>
+<tr>
+<td class="parameter_name"><p>short device</p></td>
+<td class="parameter_description"><p>The device to ask information</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
 </table></div>
 </div>
 </div>
@@ -222,6 +227,6 @@ glibtop_get_ppp_s (<em class="parameter"><code><a class="link" href="libgtop-Gli
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-Process-Arguments.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-parameter.html" title="parameter">
 <link rel="next" href="libgtop-procmem.html" title="procmem">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -39,8 +39,8 @@
 <a name="libgtop-Process-Arguments.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -66,8 +66,8 @@
 <a name="libgtop-Process-Arguments.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody><tr>
 <td class="datatype_keyword">struct</td>
@@ -191,6 +191,6 @@ the returned array to avoid a memory leak.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-Process-List.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-version.html" title="version">
 <link rel="next" href="libgtop-sem-limits.html" title="sem_limits">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -39,8 +39,8 @@
 <a name="libgtop-Process-List.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody><tr>
 <td class="function_type">
@@ -56,8 +56,8 @@
 <a name="libgtop-Process-List.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -125,8 +125,8 @@
 <a name="glibtop-get-proclist"></a><h3>glibtop_get_proclist ()</h3>
 <pre class="programlisting"><span class="returnvalue">pid_t</span> *
 glibtop_get_proclist (<em class="parameter"><code><a class="link" href="libgtop-Process-List.html#glibtop-proclist" title="struct glibtop_proclist"><span class="type">glibtop_proclist</span></a> *buf</code></em>,
-                      <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gint64"><span class="type">gint64</span></a> which</code></em>,
+                      <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> which</code></em>,
-                      <em class="parameter"><code><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gint64"><span class="type">gint64</span></a> arg</code></em>);</pre>
+                      <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> arg</code></em>);</pre>
 <div class="refsect3">
 <a name="glibtop-get-proclist.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -268,24 +268,24 @@ freed using <code class="function">g_free</code> to avoid a memory leak.</p>
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proclist.flags"></a>flags</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proclist.flags"></a>flags</code></em>;</p></td>
 <td> </td>
 <td> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proclist.number"></a>number</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proclist.number"></a>number</code></em>;</p></td>
 <td class="struct_member_description"><p>Number of entries in the returned list.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proclist.total"></a>total</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proclist.total"></a>total</code></em>;</p></td>
 <td class="struct_member_description"><p>Total size of the returned list (this equals <em class="parameter"><code>number</code></em>
 * <em class="parameter"><code>size</code></em>
 ).</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proclist.size"></a>size</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proclist.size"></a>size</code></em>;</p></td>
 <td class="struct_member_description"><p>Size of a single entry in the returned list
 (this equals <span class="type">sizeof(unsigned)</span>).</p></td>
 <td class="struct_member_annotations"> </td>
@@ -297,6 +297,6 @@ freed using <code class="function">g_free</code> to avoid a memory leak.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-Process-Time.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-procuid.html" title="procuid">
 <link rel="next" href="libgtop-signal.html" title="signal">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -39,8 +39,8 @@
 <a name="libgtop-Process-Time.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody><tr>
 <td class="function_type">
@@ -56,8 +56,8 @@
 <a name="libgtop-Process-Time.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody><tr>
 <td class="datatype_keyword">struct</td>
@@ -131,9 +131,12 @@ available from the kernel.</p>
 shift. Because <span class="type">INITIAL_JIFFIES</span> is not user-space defined,
 we cannot use it to compute an accurate <em class="parameter"><code>start_time</code></em>
 . On Linux 2.6,</p>
-<span class="type">INITIAL_JIFFIES</span> is 300 so <em class="parameter"><code>start_time</code></em> is 
+<span class="type">INITIAL_JIFFIES</span> is 300 so <em class="parameter"><code>start_time</code></em> is
-<p>always 3s different from the real start time of the given process. You 
+
-may also get shift results if your system clock is not synchronised 
+<p>always 3s different from the real start time of the given process. You
+
+may also get shift results if your system clock is not synchronised
+
 with your hardware clock. See <span class="command"><strong>man hwclock</strong></span>.</p>
 <div class="refsect3">
 <a name="glibtop-proc-time.members"></a><h4>Members</h4>
@@ -145,60 +148,60 @@ with your hardware clock. See <span class="command"><strong>man hwclock</strong>
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.start-time"></a>start_time</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.start-time"></a>start_time</code></em>;</p></td>
 <td class="struct_member_description"><p>Start time of process in seconds since the epoch.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.rtime"></a>rtime</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.rtime"></a>rtime</code></em>;</p></td>
 <td class="struct_member_description"><p>Real time accumulated by process (should be <em class="parameter"><code>utime</code></em>
 + <em class="parameter"><code>stime</code></em>
 ).</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.utime"></a>utime</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.utime"></a>utime</code></em>;</p></td>
 <td class="struct_member_description"><p>User-mode CPU time accumulated by process.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.stime"></a>stime</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.stime"></a>stime</code></em>;</p></td>
 <td class="struct_member_description"><p>Kernel-mode CPU time accumulated by process.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.cutime"></a>cutime</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.cutime"></a>cutime</code></em>;</p></td>
 <td class="struct_member_description"><p>Cumulative utime of process and reaped children.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.cstime"></a>cstime</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.cstime"></a>cstime</code></em>;</p></td>
 <td class="struct_member_description"><p>Cumulative stime of process and reaped children.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.timeout"></a>timeout</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.timeout"></a>timeout</code></em>;</p></td>
 <td class="struct_member_description"><p>The time (in jiffies) of the process’s next timeout.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.it-real-value"></a>it_real_value</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.it-real-value"></a>it_real_value</code></em>;</p></td>
 <td class="struct_member_description"><p>The time (in jiffies) before the next <span class="type">SIGALRM</span>
 is sent to the process due to an interval timer.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.frequency"></a>frequency</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.frequency"></a>frequency</code></em>;</p></td>
 <td class="struct_member_description"><p>Tick frequency.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.xcpu-utime"></a>xcpu_utime</code></em>[GLIBTOP_NCPU];</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.xcpu-utime"></a>xcpu_utime</code></em>[GLIBTOP_NCPU];</p></td>
 <td class="struct_member_description"><p>SMP user-mode CPU time accumulated by process.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.xcpu-stime"></a>xcpu_stime</code></em>[GLIBTOP_NCPU];</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-proc-time.xcpu-stime"></a>xcpu_stime</code></em>[GLIBTOP_NCPU];</p></td>
 <td class="struct_member_description"><p>SMP kernel-mode CPU time accumulated by process </p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -209,6 +212,6 @@ is sent to the process due to an interval timer.</p></td>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-Shared-Memory-Limits.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-PPP.html" title="PPP">
 <link rel="next" href="libgtop-Uptime.html" title="Uptime">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-Shared-Memory-Limits.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-Shared-Memory-Limits.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -294,6 +294,6 @@ glibtop_get_shm_limits_s (<em class="parameter"><code><a class="link" href="libg
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-Uptime.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-Shared-Memory-Limits.html" title="Shared Memory Limits">
 <link rel="next" href="libgtop-Net-List.html" title="Net List">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-Uptime.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-Uptime.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -211,6 +211,6 @@ glibtop_get_uptime_s (<em class="parameter"><code><a class="link" href="libgtop-
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-cpu.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-msg-limits.html" title="msg_limits">
 <link rel="next" href="libgtop-swap.html" title="swap">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-cpu.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-cpu.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -386,6 +386,6 @@ glibtop_get_cpu_s (<em class="parameter"><code><a class="link" href="libgtop-Gli
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-fsusage.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-prockernel.html" title="prockernel">
 <link rel="next" href="libgtop-loadavg.html" title="loadavg">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-fsusage.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -70,8 +70,8 @@
 <a name="libgtop-fsusage.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -257,6 +257,6 @@ glibtop_get_fsusage_s (<em class="parameter"><code><a class="link" href="libgtop
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-lib.html

@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="Libgtop Reference Manual">
 <link rel="prev" href="libgtop-white-paper-overview.html" title="Overview">
 <link rel="next" href="libgtop-GlibTop.html" title="GlibTop">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -133,6 +133,6 @@
     the public interfaces are documented here.</p>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-loadavg.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-fsusage.html" title="fsusage">
 <link rel="next" href="libgtop-mem.html" title="mem">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-loadavg.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-loadavg.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -202,6 +202,6 @@ glibtop_get_loadavg_s (<em class="parameter"><code><a class="link" href="libgtop
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-mem.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-loadavg.html" title="loadavg">
 <link rel="next" href="libgtop-mountlist.html" title="mountlist">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-mem.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-mem.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -263,6 +263,6 @@ glibtop_get_mem_s (<em class="parameter"><code><a class="link" href="libgtop-Gli
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-mountlist.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-mem.html" title="mem">
 <link rel="next" href="libgtop-msg-limits.html" title="msg_limits">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-mountlist.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -70,8 +70,8 @@
 <a name="libgtop-mountlist.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -123,7 +123,7 @@ glibtop_get_mountlist (<em class="parameter"><code><a class="link" href="libgtop
 <div class="refsect3">
 <a name="glibtop-get-mountlist.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 <hr>
@@ -151,7 +151,7 @@ glibtop_get_mountlist_l (<em class="parameter"><code><a class="link" href="libgt
 <div class="refsect3">
 <a name="glibtop-get-mountlist-l.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 <hr>
@@ -179,7 +179,7 @@ glibtop_get_mountlist_s (<em class="parameter"><code><a class="link" href="libgt
 <div class="refsect3">
 <a name="glibtop-get-mountlist-s.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 </div>
@@ -253,12 +253,12 @@ glibtop_get_mountlist_s (<em class="parameter"><code><a class="link" href="libgt
 <div class="refsect3">
 <a name="glibtop-get-mountlist-r.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-msg-limits.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-mountlist.html" title="mountlist">
 <link rel="next" href="libgtop-cpu.html" title="cpu">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-msg-limits.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-msg-limits.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -235,6 +235,6 @@ glibtop_get_msg_limits_s (<em class="parameter"><code><a class="link" href="libg
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-open.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-Net-List.html" title="Net List">
 <link rel="next" href="libgtop-parameter.html" title="parameter">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-open.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-open.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -264,6 +264,6 @@ glibtop_open_s (<em class="parameter"><code><a class="link" href="libgtop-GlibTo
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-parameter.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-open.html" title="open">
 <link rel="next" href="libgtop-Process-Arguments.html" title="Process Arguments">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-parameter.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -74,8 +74,8 @@
 <a name="libgtop-parameter.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -195,6 +195,6 @@ glibtop_set_parameter_l (<em class="parameter"><code><a class="link" href="libgt
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-prockernel.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-sem-limits.html" title="sem_limits">
 <link rel="next" href="libgtop-fsusage.html" title="fsusage">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-prockernel.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-prockernel.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -266,6 +266,6 @@ glibtop_get_proc_kernel_s (<em class="parameter"><code><a class="link" href="lib
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-procmap.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-signal.html" title="signal">
 <link rel="next" href="libgtop-sysinfo.html" title="sysinfo">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-procmap.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-procmap.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -211,7 +211,7 @@ glibtop_get_proc_map (<em class="parameter"><code><a class="link" href="libgtop-
 <div class="refsect3">
 <a name="glibtop-get-proc-map.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 <hr>
@@ -239,7 +239,7 @@ glibtop_get_proc_map_l (<em class="parameter"><code><a class="link" href="libgto
 <div class="refsect3">
 <a name="glibtop-get-proc-map-l.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 <hr>
@@ -267,7 +267,7 @@ glibtop_get_proc_map_p (<em class="parameter"><code><a class="link" href="libgto
 <div class="refsect3">
 <a name="glibtop-get-proc-map-p.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 <hr>
@@ -295,7 +295,7 @@ glibtop_get_proc_map_s (<em class="parameter"><code><a class="link" href="libgto
 <div class="refsect3">
 <a name="glibtop-get-proc-map-s.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 </div>
@@ -448,18 +448,26 @@ glibtop_get_proc_map_s (<em class="parameter"><code><a class="link" href="libgto
 <div class="refsect2">
 <a name="glibtop-map-entry"></a><h3>struct glibtop_map_entry</h3>
 <pre class="programlisting">struct glibtop_map_entry {
-	guint64 flags; 
+	guint64 flags;
-	guint64 start; 
+
-	guint64 end; 
+	guint64 start;
-	guint64 offset; 
+
-	guint64 perm; 
+	guint64 end;
-	guint64 inode; 
+
+	guint64 offset;
+
+	guint64 perm;
+
+	guint64 inode;
+
 	guint64 device;
 	guint64 size;
 	guint64 rss;
-	guint64 shared_clean; 
+	guint64 shared_clean;
+
 	guint64 shared_dirty;
-	guint64 private_clean; 
+	guint64 private_clean;
+
 	guint64 private_dirty;
 	guint64 pss;
 	guint64 swap;
@@ -487,6 +495,6 @@ glibtop_get_proc_map_s (<em class="parameter"><code><a class="link" href="libgto
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-procmem.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-Process-Arguments.html" title="Process Arguments">
 <link rel="next" href="libgtop-procopenfiles.html" title="procopenfiles">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-procmem.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-procmem.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -230,6 +230,6 @@ glibtop_get_proc_mem_s (<em class="parameter"><code><a class="link" href="libgto
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-procopenfiles.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-procmem.html" title="procmem">
 <link rel="next" href="libgtop-procsegment.html" title="procsegment">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-procopenfiles.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-procopenfiles.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -163,7 +163,7 @@ glibtop_get_proc_open_files (<em class="parameter"><code><a class="link" href="l
 <div class="refsect3">
 <a name="glibtop-get-proc-open-files.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 <hr>
@@ -191,7 +191,7 @@ glibtop_get_proc_open_files_l (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="glibtop-get-proc-open-files-l.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 <hr>
@@ -219,7 +219,7 @@ glibtop_get_proc_open_files_p (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="glibtop-get-proc-open-files-p.returns"></a><h4>Returns</h4>
 <p>. </p>
-<p><span class="annotation">[<a href="http://foldoc.org/transfer%20none"><span class="acronym">transfer none</span></a>]</span></p>
+<p><span class="annotation">[<a href="http://foldoc.org/transfer%20full"><span class="acronym">transfer full</span></a>][<a href="http://foldoc.org/array"><span class="acronym">array</span></a> zero-terminated=1]</span></p>
 </div>
 </div>
 <hr>
@@ -352,6 +352,6 @@ glibtop_get_proc_open_files_s (<em class="parameter"><code><a class="link" href=
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-procsegment.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-procopenfiles.html" title="procopenfiles">
 <link rel="next" href="libgtop-procsignal.html" title="procsignal">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-procsegment.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-procsegment.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -251,6 +251,6 @@ glibtop_get_proc_segment_s (<em class="parameter"><code><a class="link" href="li
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-procsignal.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-procsegment.html" title="procsegment">
 <link rel="next" href="libgtop-sysdeps.html" title="sysdeps">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-procsignal.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-procsignal.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -206,6 +206,6 @@ glibtop_get_proc_signal_s (<em class="parameter"><code><a class="link" href="lib
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-procstate.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-sysdeps.html" title="sysdeps">
 <link rel="next" href="libgtop-procuid.html" title="procuid">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-procstate.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-procstate.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -337,6 +337,6 @@ glibtop_get_proc_state_s (<em class="parameter"><code><a class="link" href="libg
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-procuid.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-procstate.html" title="procstate">
 <link rel="next" href="libgtop-Process-Time.html" title="Process Time">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-procuid.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-procuid.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -393,6 +393,6 @@ glibtop_get_proc_uid_s (<em class="parameter"><code><a class="link" href="libgto
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-sem-limits.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-Process-List.html" title="Process List">
 <link rel="next" href="libgtop-prockernel.html" title="prockernel">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-sem-limits.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -78,8 +78,8 @@
 <a name="libgtop-sem-limits.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -268,6 +268,6 @@ glibtop_get_sem_limits_s (<em class="parameter"><code><a class="link" href="libg
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-signal.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-Process-Time.html" title="Process Time">
 <link rel="next" href="libgtop-procmap.html" title="procmap">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-signal.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody><tr>
 <td class="datatype_keyword">struct</td>
@@ -69,6 +69,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-swap.html

@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Libgtop Reference Manual">
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-cpu.html" title="cpu">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -34,8 +34,8 @@
 <a name="libgtop-swap.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -77,8 +77,8 @@
 <a name="libgtop-swap.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -228,6 +228,6 @@ glibtop_get_swap_s (<em class="parameter"><code><a class="link" href="libgtop-Gl
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-sysdeps.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-procsignal.html" title="procsignal">
 <link rel="next" href="libgtop-procstate.html" title="procstate">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-sysdeps.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -62,8 +62,8 @@
 <a name="libgtop-sysdeps.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -358,7 +358,7 @@ glibtop_get_sysdeps_r (<em class="parameter"><code><a class="link" href="libgtop
 <hr>
 <div class="refsect2">
 <a name="GLIBTOP-MAX-SYSDEPS:CAPS"></a><h3>GLIBTOP_MAX_SYSDEPS</h3>
-<pre class="programlisting">#define GLIBTOP_MAX_SYSDEPS		28
+<pre class="programlisting">#define GLIBTOP_MAX_SYSDEPS		29
 </pre>
 </div>
 <hr>
@@ -400,7 +400,7 @@ glibtop_get_sysdeps_r (<em class="parameter"><code><a class="link" href="libgtop
 	guint64 proc_wd;		/* glibtop_proc_wd */
 	guint64 proc_affinity;		/* glibtop_proc_affinity */
 	guint64 proc_io;		/* glibtop_proc_io */
-	guint64 reserved0;
+	guint64 disk;			/* glibtop_disk		*/
 	guint64 reserved1;
 	guint64 reserved2;
 	guint64 reserved3;
@@ -414,6 +414,6 @@ glibtop_get_sysdeps_r (<em class="parameter"><code><a class="link" href="libgtop
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-sysinfo.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-procmap.html" title="procmap">
 <link rel="next" href="libgtop-union.html" title="union">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-sysinfo.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -60,8 +60,8 @@
 <a name="libgtop-sysinfo.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody>
 <tr>
@@ -151,12 +151,12 @@ glibtop_get_sysinfo (<em class="parameter"><code><span class="type">void</span><
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-sysinfo.flags"></a>flags</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-sysinfo.flags"></a>flags</code></em>;</p></td>
 <td> </td>
 <td> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-sysinfo.ncpu"></a>ncpu</code></em>;</p></td>
+<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="glibtop-sysinfo.ncpu"></a>ncpu</code></em>;</p></td>
 <td> </td>
 <td> </td>
 </tr>
@@ -188,6 +188,6 @@ glibtop_get_sysinfo (<em class="parameter"><code><span class="type">void</span><
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-union.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-sysinfo.html" title="sysinfo">
 <link rel="next" href="libgtop-version.html" title="version">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-union.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody><tr>
 <td class="datatype_keyword">union</td>
@@ -64,6 +64,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-version.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-lib.html" title="Libgtop Library Reference">
 <link rel="prev" href="libgtop-union.html" title="union">
 <link rel="next" href="libgtop-Process-List.html" title="Process List">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -35,8 +35,8 @@
 <a name="libgtop-version.functions"></a><h2>Functions</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="functions_return">
+<col width="150px" class="functions_proto_type">
-<col class="functions_name">
+<col class="functions_proto_name">
 </colgroup>
 <tbody><tr>
 <td class="function_type">
@@ -52,8 +52,8 @@
 <a name="libgtop-version.other"></a><h2>Types and Values</h2>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
-<col width="150px" class="name">
+<col width="150px" class="other_proto_type">
-<col class="description">
+<col class="other_proto_name">
 </colgroup>
 <tbody><tr>
 <td class="define_keyword">#define</td>
@@ -88,6 +88,6 @@ glibtop_send_version (<em class="parameter"><code><a class="link" href="libgtop-
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-white-paper-overview.html

@@ -8,7 +8,7 @@
 <link rel="up" href="libgtop-white-paper.html" title="White paper">
 <link rel="prev" href="libgtop-white-paper.html" title="White paper">
 <link rel="next" href="libgtop-lib.html" title="Libgtop Library Reference">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -60,6 +60,6 @@ rather than using the server.</p>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop-white-paper.html

@@ -8,7 +8,7 @@
 <link rel="up" href="index.html" title="Libgtop Reference Manual">
 <link rel="prev" href="index.html" title="Libgtop Reference Manual">
 <link rel="next" href="libgtop-white-paper-overview.html" title="Overview">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -69,6 +69,6 @@
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.33.1</div>
 </body>
 </html>

doc/reference/html/libgtop.devhelp2

@@ -62,6 +62,7 @@
     <keyword type="macro" name="GLIBTOP_CMND_QUIT" link="libgtop-Command.html#GLIBTOP-CMND-QUIT:CAPS"/>
     <keyword type="macro" name="GLIBTOP_CMND_SYSDEPS" link="libgtop-Command.html#GLIBTOP-CMND-SYSDEPS:CAPS"/>
     <keyword type="macro" name="GLIBTOP_CMND_CPU" link="libgtop-Command.html#GLIBTOP-CMND-CPU:CAPS"/>
+    <keyword type="macro" name="GLIBTOP_CMND_DISK" link="libgtop-Command.html#GLIBTOP-CMND-DISK:CAPS"/>
     <keyword type="macro" name="GLIBTOP_CMND_MEM" link="libgtop-Command.html#GLIBTOP-CMND-MEM:CAPS"/>
     <keyword type="macro" name="GLIBTOP_CMND_SWAP" link="libgtop-Command.html#GLIBTOP-CMND-SWAP:CAPS"/>
     <keyword type="macro" name="GLIBTOP_CMND_UPTIME" link="libgtop-Command.html#GLIBTOP-CMND-UPTIME:CAPS"/>

doc/reference/html/style.css

@@ -30,6 +30,10 @@ body
   vertical-align: top;
 }
 
+span.nowrap {
+  white-space: nowrap;
+}
+
 div.gallery-float
 {
   float: left;
@@ -57,18 +61,6 @@ a:hover
   color: #729fcf;
 }
 
-div.informaltable table
-{
-  border-collapse: separate;
-  border-spacing: 1em 0.3em;
-  border: none;
-}
-
-div.informaltable table td, div.informaltable table th
-{
-  vertical-align: top;
-}
-
 .function_type,
 .variable_type,
 .property_type,
@@ -123,6 +115,7 @@ td p
   margin: 0.25em;
 }
 
+div.informaltable table[border="1"],
 div.table table
 {
   border-collapse: collapse;
@@ -131,6 +124,8 @@ div.table table
   border: solid 1px #babdb6;
 }
 
+div.informaltable table[border="1"] td,
+div.informaltable table th,
 div.table table td, div.table table th
 {
   /* tango:aluminium 3 */
@@ -139,6 +134,7 @@ div.table table td, div.table table th
   vertical-align: top;
 }
 
+div.informaltable table[border="1"] th,
 div.table table th
 {
   /* tango:aluminium 2 */
@@ -289,29 +285,11 @@ h2 .extralinks, h3 .extralinks
   font-weight: normal;
 }
 
-acronym,abbr 
+acronym,abbr
 {
   border-bottom: 1px dotted gray;
 }
 
-/* code listings */
-
-.listing_code .programlisting .normal,
-.listing_code .programlisting .normal a,
-.listing_code .programlisting .number,
-.listing_code .programlisting .cbracket,
-.listing_code .programlisting .symbol     { color: #555753; }
-.listing_code .programlisting .comment,
-.listing_code .programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
-.listing_code .programlisting .function,
-.listing_code .programlisting .function a,
-.listing_code .programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
-.listing_code .programlisting .string     { color: #ad7fa8; } /* tango: plum */
-.listing_code .programlisting .keyword,
-.listing_code .programlisting .usertype,
-.listing_code .programlisting .type,
-.listing_code .programlisting .type a     { color: #4e9a06; } /* tango: chameleon 3  */
-
 .listing_frame {
   /* tango:sky blue 1 */
   border: solid 1px #729fcf;
@@ -477,3 +455,76 @@ acronym,abbr
   }
 }
 
+pre { line-height: 125%; }
+td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+.hll { background-color: #ffffcc }
+.c { color: #3D7B7B; font-style: italic } /* Comment */
+.err { border: 1px solid #FF0000 } /* Error */
+.k { color: #008000; font-weight: bold } /* Keyword */
+.o { color: #666666 } /* Operator */
+.ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */
+.cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */
+.cp { color: #9C6500 } /* Comment.Preproc */
+.cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */
+.c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */
+.cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
+.gd { color: #A00000 } /* Generic.Deleted */
+.ge { font-style: italic } /* Generic.Emph */
+.gr { color: #E40000 } /* Generic.Error */
+.gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.gi { color: #008400 } /* Generic.Inserted */
+.go { color: #717171 } /* Generic.Output */
+.gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.gs { font-weight: bold } /* Generic.Strong */
+.gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.gt { color: #0044DD } /* Generic.Traceback */
+.kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+.kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+.kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
+.kp { color: #008000 } /* Keyword.Pseudo */
+.kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+.kt { color: #B00040 } /* Keyword.Type */
+.m { color: #666666 } /* Literal.Number */
+.s { color: #BA2121 } /* Literal.String */
+.na { color: #687822 } /* Name.Attribute */
+.nb { color: #008000 } /* Name.Builtin */
+.nc { color: #0000FF; font-weight: bold } /* Name.Class */
+.no { color: #880000 } /* Name.Constant */
+.nd { color: #AA22FF } /* Name.Decorator */
+.ni { color: #717171; font-weight: bold } /* Name.Entity */
+.ne { color: #CB3F38; font-weight: bold } /* Name.Exception */
+.nf { color: #0000FF } /* Name.Function */
+.nl { color: #767600 } /* Name.Label */
+.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.nt { color: #008000; font-weight: bold } /* Name.Tag */
+.nv { color: #19177C } /* Name.Variable */
+.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.w { color: #bbbbbb } /* Text.Whitespace */
+.mb { color: #666666 } /* Literal.Number.Bin */
+.mf { color: #666666 } /* Literal.Number.Float */
+.mh { color: #666666 } /* Literal.Number.Hex */
+.mi { color: #666666 } /* Literal.Number.Integer */
+.mo { color: #666666 } /* Literal.Number.Oct */
+.sa { color: #BA2121 } /* Literal.String.Affix */
+.sb { color: #BA2121 } /* Literal.String.Backtick */
+.sc { color: #BA2121 } /* Literal.String.Char */
+.dl { color: #BA2121 } /* Literal.String.Delimiter */
+.sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
+.s2 { color: #BA2121 } /* Literal.String.Double */
+.se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */
+.sh { color: #BA2121 } /* Literal.String.Heredoc */
+.si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */
+.sx { color: #008000 } /* Literal.String.Other */
+.sr { color: #A45A77 } /* Literal.String.Regex */
+.s1 { color: #BA2121 } /* Literal.String.Single */
+.ss { color: #19177C } /* Literal.String.Symbol */
+.bp { color: #008000 } /* Name.Builtin.Pseudo */
+.fm { color: #0000FF } /* Name.Function.Magic */
+.vc { color: #19177C } /* Name.Variable.Class */
+.vg { color: #19177C } /* Name.Variable.Global */
+.vi { color: #19177C } /* Name.Variable.Instance */
+.vm { color: #19177C } /* Name.Variable.Magic */
+.il { color: #666666 } /* Literal.Number.Integer.Long */

doc/reference/libgtop-sections.txt

@@ -29,6 +29,7 @@ glibtop_close_p
 GLIBTOP_CMND_QUIT
 GLIBTOP_CMND_SYSDEPS
 GLIBTOP_CMND_CPU
+GLIBTOP_CMND_DISK
 GLIBTOP_CMND_MEM
 GLIBTOP_CMND_SWAP
 GLIBTOP_CMND_UPTIME
@@ -678,6 +679,25 @@ glibtop_init_cpu_s
 glibtop_get_cpu_s
 </SECTION>
 
+<INCLUDE>glibtop/disk.h</INCLUDE>
+<SECTION>
+<FILE>disk</FILE>
+LIBTOP_XDISK_SECTORS_READ
+GLIBTOP_XDISK_TIME_READ
+GLIBTOP_XDISK_SECTORS_WRITE
+GLIBTOP_XDISK_TIME_WRITE
+GLIBTOP_MAX_DISK
+GLIBTOP_NDISK
+glibtop_disk
+glibtop_get_disk
+glibtop_get_disk_r
+glibtop_get_disk_l
+glibtop_init_disk_p
+glibtop_get_disk_p
+glibtop_init_disk_s
+glibtop_get_disk_s
+</SECTION>
+
 <INCLUDE>glibtop/swap.h</INCLUDE>
 <SECTION>
 <FILE>swap</FILE>

doc/reference/version.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<phrase>2.38.0</phrase>
+<phrase>2.41.3</phrase>

doc/stamp-vti

@@ -1,4 +1,4 @@
 @set UPDATED 27 November 2016
 @set UPDATED-MONTH November 2016
-@set EDITION 2.38.0
+@set EDITION 2.41.3
-@set VERSION 2.38.0
+@set VERSION 2.41.3

doc/version.texi

@@ -1,4 +1,4 @@
 @set UPDATED 27 November 2016
 @set UPDATED-MONTH November 2016
-@set EDITION 2.38.0
+@set EDITION 2.41.3
-@set VERSION 2.38.0
+@set VERSION 2.41.3

examples/Makefile.am

@@ -11,7 +11,7 @@ AM_LDFLAGS			= $(LIBGTOP_EXTRA_LIBS)
 
 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
-			  openfiles smp proclist free wd affinity diskio
+			  openfiles smp proclist free wd affinity disk diskio sysinfo
 
 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -34,6 +34,9 @@ mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 smp_SOURCES		= smp.c
 smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm
 
+disk_SOURCES		= disk.c
+disk_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm
+
 timings_SOURCES		= timings.c
 timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
 
@@ -67,3 +70,6 @@ affinity_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
 
 diskio_SOURCES	  = diskio.c
 diskio_LDADD	  = $(top_builddir)/lib/libgtop-2.0.la
+
+sysinfo_SOURCES		= sysinfo.c
+sysinfo_LDADD		= $(top_builddir)/lib/libgtop-2.0.la

examples/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -93,20 +93,22 @@ noinst_PROGRAMS = first$(EXEEXT) second$(EXEEXT) pprint$(EXEEXT) \
 	mountlist$(EXEEXT) procmap$(EXEEXT) netload$(EXEEXT) \
 	sysdeps$(EXEEXT) timings$(EXEEXT) openfiles$(EXEEXT) \
 	smp$(EXEEXT) proclist$(EXEEXT) free$(EXEEXT) wd$(EXEEXT) \
-	affinity$(EXEEXT) diskio$(EXEEXT)
+	affinity$(EXEEXT) disk$(EXEEXT) diskio$(EXEEXT) \
+	sysinfo$(EXEEXT)
 subdir = examples
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/build-to-host.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -125,6 +127,9 @@ am__v_lt_1 =
 am_df_OBJECTS = df.$(OBJEXT)
 df_OBJECTS = $(am_df_OBJECTS)
 df_DEPENDENCIES = $(top_builddir)/lib/libgtop-2.0.la
+am_disk_OBJECTS = disk.$(OBJEXT)
+disk_OBJECTS = $(am_disk_OBJECTS)
+disk_DEPENDENCIES = $(top_builddir)/lib/libgtop-2.0.la
 am_diskio_OBJECTS = diskio.$(OBJEXT)
 diskio_OBJECTS = $(am_diskio_OBJECTS)
 diskio_DEPENDENCIES = $(top_builddir)/lib/libgtop-2.0.la
@@ -167,6 +172,9 @@ smp_DEPENDENCIES = $(top_builddir)/lib/libgtop-2.0.la
 am_sysdeps_OBJECTS = sysdeps.$(OBJEXT)
 sysdeps_OBJECTS = $(am_sysdeps_OBJECTS)
 sysdeps_DEPENDENCIES = $(top_builddir)/lib/libgtop-2.0.la
+am_sysinfo_OBJECTS = sysinfo.$(OBJEXT)
+sysinfo_OBJECTS = $(am_sysinfo_OBJECTS)
+sysinfo_DEPENDENCIES = $(top_builddir)/lib/libgtop-2.0.la
 am_timings_OBJECTS = timings.$(OBJEXT)
 timings_OBJECTS = $(am_timings_OBJECTS)
 timings_DEPENDENCIES = $(top_builddir)/lib/libgtop-2.0.la
@@ -187,7 +195,17 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/affinity.Po ./$(DEPDIR)/df.Po \
+	./$(DEPDIR)/disk.Po ./$(DEPDIR)/diskio.Po ./$(DEPDIR)/first.Po \
+	./$(DEPDIR)/free.Po ./$(DEPDIR)/mountlist.Po \
+	./$(DEPDIR)/netlist.Po ./$(DEPDIR)/netload.Po \
+	./$(DEPDIR)/openfiles.Po ./$(DEPDIR)/pprint.Po \
+	./$(DEPDIR)/procargs.Po ./$(DEPDIR)/proclist.Po \
+	./$(DEPDIR)/procmap.Po ./$(DEPDIR)/second.Po \
+	./$(DEPDIR)/smp.Po ./$(DEPDIR)/sysdeps.Po \
+	./$(DEPDIR)/sysinfo.Po ./$(DEPDIR)/timings.Po \
+	./$(DEPDIR)/wd.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -207,18 +225,20 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(affinity_SOURCES) $(df_SOURCES) $(diskio_SOURCES) \
+SOURCES = $(affinity_SOURCES) $(df_SOURCES) $(disk_SOURCES) \
-	$(first_SOURCES) free.c $(mountlist_SOURCES) \
+	$(diskio_SOURCES) $(first_SOURCES) free.c $(mountlist_SOURCES) \
 	$(netlist_SOURCES) $(netload_SOURCES) $(openfiles_SOURCES) \
 	$(pprint_SOURCES) $(procargs_SOURCES) $(proclist_SOURCES) \
 	$(procmap_SOURCES) $(second_SOURCES) $(smp_SOURCES) \
-	$(sysdeps_SOURCES) $(timings_SOURCES) $(wd_SOURCES)
+	$(sysdeps_SOURCES) $(sysinfo_SOURCES) $(timings_SOURCES) \
-DIST_SOURCES = $(affinity_SOURCES) $(df_SOURCES) $(diskio_SOURCES) \
+	$(wd_SOURCES)
-	$(first_SOURCES) free.c $(mountlist_SOURCES) \
+DIST_SOURCES = $(affinity_SOURCES) $(df_SOURCES) $(disk_SOURCES) \
+	$(diskio_SOURCES) $(first_SOURCES) free.c $(mountlist_SOURCES) \
 	$(netlist_SOURCES) $(netload_SOURCES) $(openfiles_SOURCES) \
 	$(pprint_SOURCES) $(procargs_SOURCES) $(proclist_SOURCES) \
 	$(procmap_SOURCES) $(second_SOURCES) $(smp_SOURCES) \
-	$(sysdeps_SOURCES) $(timings_SOURCES) $(wd_SOURCES)
+	$(sysdeps_SOURCES) $(sysinfo_SOURCES) $(timings_SOURCES) \
+	$(wd_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -241,8 +261,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
 	ChangeLog
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -269,6 +287,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -280,8 +300,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
@@ -332,6 +354,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LSBLK = @LSBLK@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -341,8 +364,8 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -367,6 +390,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TR = @TR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -419,6 +443,8 @@ libgtop_sysdeps_dir = @libgtop_sysdeps_dir@
 libgtop_top_builddir = @libgtop_top_builddir@
 libs_xauth = @libs_xauth@
 localedir = @localedir@
+localedir_c = @localedir_c@
+localedir_c_make = @localedir_c_make@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -427,6 +453,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 server_programs = @server_programs@
 sharedstatedir = @sharedstatedir@
@@ -453,6 +480,8 @@ mountlist_SOURCES = mountlist.c
 mountlist_LDADD = $(top_builddir)/lib/libgtop-2.0.la
 smp_SOURCES = smp.c
 smp_LDADD = $(top_builddir)/lib/libgtop-2.0.la -lm
+disk_SOURCES = disk.c
+disk_LDADD = $(top_builddir)/lib/libgtop-2.0.la -lm
 timings_SOURCES = timings.c
 timings_LDADD = $(top_builddir)/lib/libgtop-2.0.la
 pprint_SOURCES = pprint.c
@@ -475,6 +504,8 @@ affinity_SOURCES = affinity.c
 affinity_LDADD = $(top_builddir)/lib/libgtop-2.0.la
 diskio_SOURCES = diskio.c
 diskio_LDADD = $(top_builddir)/lib/libgtop-2.0.la
+sysinfo_SOURCES = sysinfo.c
+sysinfo_LDADD = $(top_builddir)/lib/libgtop-2.0.la
 all: all-am
 
 .SUFFIXES:
@@ -496,8 +527,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -526,6 +557,10 @@ df$(EXEEXT): $(df_OBJECTS) $(df_DEPENDENCIES) $(EXTRA_df_DEPENDENCIES)
 	@rm -f df$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(df_OBJECTS) $(df_LDADD) $(LIBS)
 
+disk$(EXEEXT): $(disk_OBJECTS) $(disk_DEPENDENCIES) $(EXTRA_disk_DEPENDENCIES) 
+	@rm -f disk$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(disk_OBJECTS) $(disk_LDADD) $(LIBS)
+
 diskio$(EXEEXT): $(diskio_OBJECTS) $(diskio_DEPENDENCIES) $(EXTRA_diskio_DEPENDENCIES) 
 	@rm -f diskio$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(diskio_OBJECTS) $(diskio_LDADD) $(LIBS)
@@ -582,6 +617,10 @@ sysdeps$(EXEEXT): $(sysdeps_OBJECTS) $(sysdeps_DEPENDENCIES) $(EXTRA_sysdeps_DEP
 	@rm -f sysdeps$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sysdeps_OBJECTS) $(sysdeps_LDADD) $(LIBS)
 
+sysinfo$(EXEEXT): $(sysinfo_OBJECTS) $(sysinfo_DEPENDENCIES) $(EXTRA_sysinfo_DEPENDENCIES) 
+	@rm -f sysinfo$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(sysinfo_OBJECTS) $(sysinfo_LDADD) $(LIBS)
+
 timings$(EXEEXT): $(timings_OBJECTS) $(timings_DEPENDENCIES) $(EXTRA_timings_DEPENDENCIES) 
 	@rm -f timings$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(timings_OBJECTS) $(timings_LDADD) $(LIBS)
@@ -596,24 +635,32 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affinity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affinity.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/df.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/df.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disk.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/first.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskio.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/free.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/first.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/free.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openfiles.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pprint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openfiles.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procargs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pprint.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proclist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procargs.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proclist.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/second.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmap.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/second.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysdeps.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smp.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysdeps.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timings.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -693,8 +740,10 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -764,7 +813,26 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/affinity.Po
+	-rm -f ./$(DEPDIR)/df.Po
+	-rm -f ./$(DEPDIR)/disk.Po
+	-rm -f ./$(DEPDIR)/diskio.Po
+	-rm -f ./$(DEPDIR)/first.Po
+	-rm -f ./$(DEPDIR)/free.Po
+	-rm -f ./$(DEPDIR)/mountlist.Po
+	-rm -f ./$(DEPDIR)/netlist.Po
+	-rm -f ./$(DEPDIR)/netload.Po
+	-rm -f ./$(DEPDIR)/openfiles.Po
+	-rm -f ./$(DEPDIR)/pprint.Po
+	-rm -f ./$(DEPDIR)/procargs.Po
+	-rm -f ./$(DEPDIR)/proclist.Po
+	-rm -f ./$(DEPDIR)/procmap.Po
+	-rm -f ./$(DEPDIR)/second.Po
+	-rm -f ./$(DEPDIR)/smp.Po
+	-rm -f ./$(DEPDIR)/sysdeps.Po
+	-rm -f ./$(DEPDIR)/sysinfo.Po
+	-rm -f ./$(DEPDIR)/timings.Po
+	-rm -f ./$(DEPDIR)/wd.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -810,7 +878,26 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/affinity.Po
+	-rm -f ./$(DEPDIR)/df.Po
+	-rm -f ./$(DEPDIR)/disk.Po
+	-rm -f ./$(DEPDIR)/diskio.Po
+	-rm -f ./$(DEPDIR)/first.Po
+	-rm -f ./$(DEPDIR)/free.Po
+	-rm -f ./$(DEPDIR)/mountlist.Po
+	-rm -f ./$(DEPDIR)/netlist.Po
+	-rm -f ./$(DEPDIR)/netload.Po
+	-rm -f ./$(DEPDIR)/openfiles.Po
+	-rm -f ./$(DEPDIR)/pprint.Po
+	-rm -f ./$(DEPDIR)/procargs.Po
+	-rm -f ./$(DEPDIR)/proclist.Po
+	-rm -f ./$(DEPDIR)/procmap.Po
+	-rm -f ./$(DEPDIR)/second.Po
+	-rm -f ./$(DEPDIR)/smp.Po
+	-rm -f ./$(DEPDIR)/sysdeps.Po
+	-rm -f ./$(DEPDIR)/sysinfo.Po
+	-rm -f ./$(DEPDIR)/timings.Po
+	-rm -f ./$(DEPDIR)/wd.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -831,9 +918,9 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
-	ctags-am distclean distclean-compile distclean-generic \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \

examples/disk.c

@@ -0,0 +1,65 @@
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by James Dominic P. Guana <guana.histark@gmail.com>, May 2020.
+
+   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., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include <config.h>
+
+#include <locale.h>
+#include <libintl.h>
+#include <math.h>
+#include <stdio.h>
+
+#include <glibtop.h>
+#include <glibtop/disk.h>
+
+int
+main (int argc, char *argv [])
+{
+	glibtop_disk disk;
+	char separator [BUFSIZ];
+	int ndisk, i;
+
+	glibtop_init();
+
+	glibtop_get_disk (&disk);
+
+	ndisk = glibtop_global_server->ndisk ? glibtop_global_server->ndisk : 1;
+
+	memset (separator, '-', 91);
+	separator [92] = '\0';
+
+	printf("\n\n");
+	printf ("ELAPSE                 ");
+	printf ("Read (b)  Time Read (ms)       Write (b) Time Write (ms)\n");
+	printf ("%s\n", separator);
+
+	for (i = 0; i < ndisk; i++) {
+		printf ("DISK %3d      : %15lu %15lu %15lu %15lu\n", i,
+			(unsigned long) disk.xdisk_sectors_read [i] * 512,
+			(unsigned long) disk.xdisk_time_read [i],
+			(unsigned long) disk.xdisk_sectors_write  [i] * 512,
+			(unsigned long) disk.xdisk_time_write   [i]);
+
+	}
+
+	printf ("%s\n\n\n", separator);
+
+	exit (0);
+}

examples/mountlist.c

@@ -71,7 +71,9 @@ main (int argc, char *argv [])
 
 	printf ("Host = '%s' - %u\n\n", buffer, port);
 
+#ifdef HAVE_SBRK
 	printf ("sbrk (0) = %p\n\n", sbrk (0));
+#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++) {
 		mount_entries = glibtop_get_mountlist (&mount_list, 1);
@@ -79,7 +81,9 @@ main (int argc, char *argv [])
 		g_free (mount_entries);
 	}
 
+#ifdef HAVE_SBRK
 	printf ("sbrk (0) = %p\n\n", sbrk (0));
+#endif
 
 	mount_entries = glibtop_get_mountlist (&mount_list, 1);
 
@@ -99,7 +103,7 @@ main (int argc, char *argv [])
 		glibtop_get_fsusage (&fsusage,
 				     mount_entries [index].mountdir);
 
-		printf ("%-16s %9Lu %9Lu %9Lu %9Lu %9Lu %9d\n",
+		printf ("%-16s %9" G_GUINT64_FORMAT " %9" G_GUINT64_FORMAT " %9" G_GUINT64_FORMAT " %9" G_GUINT64_FORMAT " %9" G_GUINT64_FORMAT " %9d\n",
 			mount_entries [index].mountdir,
 			fsusage.blocks, fsusage.bfree,
 			fsusage.bavail, fsusage.files,
@@ -108,7 +112,9 @@ main (int argc, char *argv [])
 
 	g_free (mount_entries);
 
+#ifdef HAVE_SBRK
 	printf ("\nsbrk (0) = %p\n\n", sbrk (0));
+#endif
 
 	glibtop_close ();
 

examples/netload.c

@@ -66,7 +66,7 @@ main (int argc, char *argv [])
 	glibtop_netload netload;
 	unsigned method, count, port;
 	struct in_addr addr, subnet;
-	char *address_string, *subnet_string;
+	char address_string[INET_ADDRSTRLEN], subnet_string[INET_ADDRSTRLEN];
 	char address6_string[INET6_ADDRSTRLEN], prefix6_string[INET6_ADDRSTRLEN];
 	char *hwaddress_string;
 	char buffer [BUFSIZ];
@@ -105,9 +105,8 @@ main (int argc, char *argv [])
 	addr.s_addr = netload.address;
 	subnet.s_addr = netload.subnet;
 
-	address_string = g_strdup (inet_ntoa (addr));
+	inet_ntop (AF_INET, &addr,   address_string, INET_ADDRSTRLEN);
-	subnet_string  = g_strdup (inet_ntoa (subnet));
+	inet_ntop (AF_INET, &subnet, subnet_string,  INET_ADDRSTRLEN);
-
 	inet_ntop (AF_INET6, netload.address6, address6_string, INET6_ADDRSTRLEN);
 	inet_ntop (AF_INET6, netload.prefix6,  prefix6_string,  INET6_ADDRSTRLEN);
 
@@ -118,22 +117,22 @@ main (int argc, char *argv [])
 		"\tAddress:\t\t0x%08x - %s\n"
 		"\tSubnet:\t\t\t0x%08x - %s\n\n"
 		"\tMTU:\t\t\t%d\n"
-		"\tCollisions:\t\t%llu\n\n"
+		"\tCollisions:\t\t%" G_GUINT64_FORMAT "\n\n"
-		"\tPackets In:\t\t%llu\n"
+		"\tPackets In:\t\t%" G_GUINT64_FORMAT "\n"
-		"\tPackets Out:\t\t%llu\n"
+		"\tPackets Out:\t\t%" G_GUINT64_FORMAT "\n"
-		"\tPackets Total:\t\t%llu\n\n"
+		"\tPackets Total:\t\t%" G_GUINT64_FORMAT "\n\n"
-		"\tBytes In:\t\t%llu\n"
+		"\tBytes In:\t\t%" G_GUINT64_FORMAT "\n"
-		"\tBytes Out:\t\t%llu\n"
+		"\tBytes Out:\t\t%" G_GUINT64_FORMAT "\n"
-		"\tBytes Total:\t\t%llu\n\n"
+		"\tBytes Total:\t\t%" G_GUINT64_FORMAT "\n\n"
-		"\tErrors In:\t\t%llu\n"
+		"\tErrors In:\t\t%" G_GUINT64_FORMAT "\n"
-		"\tErrors Out:\t\t%llu\n"
+		"\tErrors Out:\t\t%" G_GUINT64_FORMAT "\n"
-		"\tErrors Total:\t\t%llu\n\n"
+		"\tErrors Total:\t\t%" G_GUINT64_FORMAT "\n\n"
 		"\tAddress6:\t\t%s\n"
 		"\tPrefix6:\t\t%s\n"
 		"\tScope6:\t\t\t%#03x\n\n"
 		"\tHarware Address:\t%s\n\n",
-		netload.flags,
+		(unsigned long long)netload.flags,
-		netload.if_flags,
+		(unsigned long long)netload.if_flags,
 		(guint32) netload.address, address_string,
 		(guint32) netload.subnet,  subnet_string,
 		netload.mtu,
@@ -153,9 +152,6 @@ main (int argc, char *argv [])
 		hwaddress_string);
 
 
-	g_free (address_string);
-	g_free (subnet_string);
-
 	glibtop_close ();
 
 	exit (0);

examples/pprint.c

@@ -18,9 +18,14 @@
 #define HEADER_PPRINT(FUNC) printf("### " #FUNC " ###\nsizeof *buf = %lu B\n", \
 (unsigned long) sizeof buf)
 
-#define PPRINT(DATA, FORMAT) printf("\t%4lu B %3lu " #DATA " = " FORMAT "\n", \
+#define PPRINT(DATA, FORMAT) printf("\t%4lu B %3lu " #DATA " = %" FORMAT "\n", \
 (unsigned long) sizeof buf.DATA, (unsigned long) buf_offsetof(DATA), buf.DATA)
 
+#define PPRINT_GUINT64(DATA) PPRINT(DATA, G_GUINT64_FORMAT)
+
+#define PPRINT_FLAGS(DATA) printf("\t%4lu B %3lu " "flags" " = " "%#llx" "\n", \
+(unsigned long) sizeof buf.DATA, (unsigned long) buf_offsetof(DATA), (unsigned long long)buf.DATA)
+
 #define PPRINT_ARRAY(ARRAY, SIZE, FORMAT) do {				\
     size_t i;								\
     printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ",			\
@@ -32,7 +37,7 @@
 	do { i++; } while (i < SIZE && !buf.ARRAY[i]);			\
 	printf("..., ");						\
       } else {								\
-	printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]);			\
+	printf(".%zd = %" FORMAT ", ", i, buf.ARRAY[i]);			\
       }									\
     }									\
     printf("}\n");							\
@@ -70,8 +75,8 @@ static void pprint_get_sysinfo(void)
   buf = glibtop_get_sysinfo();
 
   HEADER_PPRINT(glibtop_get_sysinfo);
-  //PPRINT(flags, "%#llx");
+  //PPRINT_FLAGS(flags);
-  // PPRINT(ncpu, "%llu");
+  // PPRINT_GUINT64(ncpu);
   PPRINT_ENTRY_ARRAY(cpuinfo, buf->ncpu);
   FOOTER_PPRINT();
 }
@@ -83,25 +88,25 @@ static void pprint_get_cpu(void)
   glibtop_get_cpu(&buf);
 
   HEADER_PPRINT(glibtop_get_cpu);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT(total, "%llu");
+  PPRINT_GUINT64(total);
-  PPRINT(user, "%llu");
+  PPRINT_GUINT64(user);
-  PPRINT(nice, "%llu");
+  PPRINT_GUINT64(nice);
-  PPRINT(sys, "%llu");
+  PPRINT_GUINT64(sys);
-  PPRINT(idle, "%llu");
+  PPRINT_GUINT64(idle);
-  PPRINT(iowait, "%llu");
+  PPRINT_GUINT64(iowait);
-  PPRINT(irq, "%llu");
+  PPRINT_GUINT64(irq);
-  PPRINT(softirq, "%llu");
+  PPRINT_GUINT64(softirq);
-  PPRINT(frequency, "%llu");
+  PPRINT_GUINT64(frequency);
-  PPRINT_ARRAY(xcpu_total, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_total, GLIBTOP_NCPU, G_GUINT64_FORMAT);
-  PPRINT_ARRAY(xcpu_user, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_user, GLIBTOP_NCPU, G_GUINT64_FORMAT);
-  PPRINT_ARRAY(xcpu_nice, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_nice, GLIBTOP_NCPU, G_GUINT64_FORMAT);
-  PPRINT_ARRAY(xcpu_sys, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_sys, GLIBTOP_NCPU, G_GUINT64_FORMAT);
-  PPRINT_ARRAY(xcpu_idle, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_idle, GLIBTOP_NCPU, G_GUINT64_FORMAT);
-  PPRINT_ARRAY(xcpu_iowait, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_iowait, GLIBTOP_NCPU, G_GUINT64_FORMAT);
-  PPRINT_ARRAY(xcpu_irq, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_irq, GLIBTOP_NCPU, G_GUINT64_FORMAT);
-  PPRINT_ARRAY(xcpu_softirq, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_softirq, GLIBTOP_NCPU, G_GUINT64_FORMAT);
-  PPRINT(xcpu_flags, "%llx");
+  PPRINT_FLAGS(xcpu_flags);
   FOOTER_PPRINT();
 }
 
@@ -115,15 +120,15 @@ static void pprint_get_fsusage(const char *mountpoint)
 
   HEADER_PPRINT(glibtop_get_fsusage);
   printf("pprint_get_fsusage (mountpoint = \"%s\"\n", mountpoint);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT(blocks, "%llu");
+  PPRINT_GUINT64(blocks);
-  PPRINT(bfree, "%llu");
+  PPRINT_GUINT64(bfree);
-  PPRINT(bavail, "%llu");
+  PPRINT_GUINT64(bavail);
-  PPRINT(files, "%llu");
+  PPRINT_GUINT64(files);
-  PPRINT(ffree, "%llu");
+  PPRINT_GUINT64(ffree);
-  PPRINT(block_size, "%u");
+  PPRINT(block_size, "u");
-  PPRINT(read, "%llu");
+  PPRINT_GUINT64(read);
-  PPRINT(write, "%llu");
+  PPRINT_GUINT64(write);
   FOOTER_PPRINT();
 }
 
@@ -136,11 +141,11 @@ static void pprint_get_loadavg(void)
   glibtop_get_loadavg(&buf);
 
   HEADER_PPRINT(glibtop_get_loadavg);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT_ARRAY(loadavg, 3, "%f");
+  PPRINT_ARRAY(loadavg, 3, "f");
-  PPRINT(nr_running, "%llu");
+  PPRINT_GUINT64(nr_running);
-  PPRINT(nr_tasks, "%llu");
+  PPRINT_GUINT64(nr_tasks);
-  PPRINT(last_pid, "%llu");
+  PPRINT_GUINT64(last_pid);
   FOOTER_PPRINT();
 }
 
@@ -153,15 +158,15 @@ static void pprint_get_mem(void)
   glibtop_get_mem(&buf);
 
   HEADER_PPRINT(glibtop_get_mem);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT(total, "%llu");
+  PPRINT_GUINT64(total);
-  PPRINT(used, "%llu");
+  PPRINT_GUINT64(used);
-  PPRINT(free, "%llu");
+  PPRINT_GUINT64(free);
-  PPRINT(shared, "%llu");
+  PPRINT_GUINT64(shared);
-  PPRINT(buffer, "%llu");
+  PPRINT_GUINT64(buffer);
-  PPRINT(cached, "%llu");
+  PPRINT_GUINT64(cached);
-  PPRINT(user, "%llu");
+  PPRINT_GUINT64(user);
-  PPRINT(locked, "%llu");
+  PPRINT_GUINT64(locked);
   FOOTER_PPRINT();
 }
 
@@ -177,12 +182,12 @@ static void pprint_get_mountlist(gboolean allfs)
 
   HEADER_PPRINT(glibtop_get_mountlist);
   printf("glibtop_get_mountlist (allfs = %d)\n", allfs);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT(number, "%llu");
+  PPRINT_GUINT64(number);
-  PPRINT(total, "%llu");
+  PPRINT_GUINT64(total);
-  PPRINT(size, "%llu");
+  PPRINT_GUINT64(size);
 
-  printf("\t%4llu B entries[%llu] = \n\t\t{\n", buf.total, buf.number);
+  printf("\t%4" G_GUINT64_FORMAT " B entries[%" G_GUINT64_FORMAT "] = \n\t\t{\n", buf.total, buf.number);
 
   for(i = 0; i < buf.number; ++i)
     {
@@ -190,7 +195,7 @@ static void pprint_get_mountlist(gboolean allfs)
 	     " .devname = \"%s\","
 	     " .mountir = \"%s\","
 	     " .type = \"%s\" }\n",
-	     (unsigned long) i, entries[i].dev,
+	     (unsigned long) i, (unsigned long long)entries[i].dev,
 	     entries[i].devname,
 	     entries[i].mountdir,
 	     entries[i].type);
@@ -211,14 +216,14 @@ static void pprint_get_msg_limits(void)
   glibtop_get_msg_limits(&buf);
 
   HEADER_PPRINT(glibtop_get_msg_limits);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT(msgpool, "%llu");
+  PPRINT_GUINT64(msgpool);
-  PPRINT(msgmap, "%llu");
+  PPRINT_GUINT64(msgmap);
-  PPRINT(msgmax, "%llu");
+  PPRINT_GUINT64(msgmax);
-  PPRINT(msgmnb, "%llu");
+  PPRINT_GUINT64(msgmnb);
-  PPRINT(msgmni, "%llu");
+  PPRINT_GUINT64(msgmni);
-  PPRINT(msgssz, "%llu");
+  PPRINT_GUINT64(msgssz);
-  PPRINT(msgtql, "%llu");
+  PPRINT_GUINT64(msgtql);
   FOOTER_PPRINT();
 }
 
@@ -232,7 +237,7 @@ static void pprint_get_netload(const char *iface)
 
   HEADER_PPRINT(glibtop_get_netload);
   printf("glibtop_get_netload (iface = \"%s\")\n", iface);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
   FOOTER_PPRINT();
 }
 
@@ -266,12 +271,12 @@ static void pprint_get_swap(void)
   glibtop_get_swap(&buf);
 
   HEADER_PPRINT(glibtop_get_swap);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT(total, "%llu");
+  PPRINT_GUINT64(total);
-  PPRINT(used, "%llu");
+  PPRINT_GUINT64(used);
-  PPRINT(free, "%llu");
+  PPRINT_GUINT64(free);
-  PPRINT(pagein, "%llu");
+  PPRINT_GUINT64(pagein);
-  PPRINT(pageout, "%llu");
+  PPRINT_GUINT64(pageout);
   FOOTER_PPRINT();
 }
 
@@ -284,10 +289,10 @@ static void pprint_get_uptime(void)
   glibtop_get_uptime(&buf);
 
   HEADER_PPRINT(glibtop_get_uptime);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT(uptime, "%f");
+  PPRINT(uptime, "f");
-  PPRINT(idletime, "%f");
+  PPRINT(idletime, "f");
-  PPRINT(boot_time, "%llu");
+  PPRINT_GUINT64(boot_time);
   FOOTER_PPRINT();
 }
 
@@ -301,12 +306,12 @@ static void pprint_get_proc_kernel(pid_t pid)
   glibtop_get_proc_kernel(&buf, pid);
 
   HEADER_PPRINT(glibtop_get_proc_kernel);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT(k_flags, "%llu");
+  PPRINT_GUINT64(k_flags);
-  PPRINT(min_flt, "%llu");
+  PPRINT_GUINT64(min_flt);
-  PPRINT(maj_flt, "%llu");
+  PPRINT_GUINT64(maj_flt);
-  PPRINT(cmin_flt, "%llu");
+  PPRINT_GUINT64(cmin_flt);
-  PPRINT(cmaj_flt, "%llu");
+  PPRINT_GUINT64(cmaj_flt);
   FOOTER_PPRINT();
 }
 
@@ -318,13 +323,13 @@ static void pprint_get_proc_mem(pid_t pid)
   glibtop_get_proc_mem(&buf, pid);
 
   HEADER_PPRINT(glibtop_get_proc_mem);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT(size, "%llu");
+  PPRINT_GUINT64(size);
-  PPRINT(vsize, "%llu");
+  PPRINT_GUINT64(vsize);
-  PPRINT(resident, "%llu");
+  PPRINT_GUINT64(resident);
-  PPRINT(share, "%llu");
+  PPRINT_GUINT64(share);
-  PPRINT(rss, "%llu");
+  PPRINT_GUINT64(rss);
-  PPRINT(rss_rlim, "%llu");
+  PPRINT_GUINT64(rss_rlim);
   FOOTER_PPRINT();
 }
 
@@ -338,9 +343,9 @@ static void pprint_get_proc_affinity(pid_t pid)
   cpus = glibtop_get_proc_affinity(&buf, pid);
 
   HEADER_PPRINT(glibtop_get_proc_affinity);
-  PPRINT(flags, "%#llx");
+  PPRINT_FLAGS(flags);
-  PPRINT(number, "%u");
+  PPRINT(number, "u");
-  PPRINT(all, "%d");
+  PPRINT(all, "d");
 
   printf("\taffinity=");
   for (i = 0; i < buf.number; i++) {

examples/procmap.c

@@ -162,10 +162,10 @@ main (int argc, char *argv [])
 
 		fputc('\n', stderr);
 
-		g_print("smaps flags:%#llx size:%lluKiB rss:%lluKiB "
+		g_print("smaps flags:%#llx size:%" G_GUINT64_FORMAT "KiB rss:%" G_GUINT64_FORMAT "KiB "
-			"shared_clean:%lluKib shared_dirty:%lluKiB "
+			"shared_clean:%" G_GUINT64_FORMAT "Kib shared_dirty:%" G_GUINT64_FORMAT "KiB "
-			"private_clean:%lluKiB private_dirty: %lluKiB\n",
+			"private_clean:%" G_GUINT64_FORMAT "KiB private_dirty: %" G_GUINT64_FORMAT "KiB\n",
-			maps[i].flags,
+			(unsigned long long)maps[i].flags,
 			maps[i].size >> 10,
 			maps[i].rss >> 10,
 			maps[i].shared_clean >> 10,

examples/sysinfo.c

@@ -0,0 +1,48 @@
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by Dr. James Dominic P. Guana <jdpguana@histark.com>, August 2021.
+
+   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., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include <config.h>
+
+#include <locale.h>
+#include <libintl.h>
+#include <math.h>
+#include <stdio.h>
+
+#include <glibtop.h>
+#include <glibtop/sysinfo.h>
+
+int
+main (int argc, char *argv [])
+{
+   char *model;
+   const glibtop_sysinfo * sysinfo;
+
+   glibtop_init();
+   sysinfo = glibtop_get_sysinfo ();
+   model = g_hash_table_lookup (sysinfo->cpuinfo [1].values, "model name");
+
+   printf ("\nProcessor Model: %s\n", g_strdup (model));
+   printf ("Number of Cores: %lu\n\n", sysinfo->ncpu);
+
+   glibtop_close ();
+
+   exit (0);
+}

features.def

@@ -1,4 +1,5 @@
 void|cpu
+void|disk
 void|mem
 void|swap
 void|uptime

glibtop.h

@@ -98,6 +98,9 @@ struct _glibtop
 	gid_t egid;
 
 	glibtop_machine *machine;	/* Machine dependent data */
+
+	int ndisk;			/* Number of DISKs,  zero if single-disk. This pertains to disk volumes */
+	int real_ndisk;			/* Number of PHYSICAL DISKs. Only ndisk is monitored for now */
 };
 
 extern glibtop *glibtop_global_server;
@@ -128,7 +131,7 @@ glibtop_init_r (glibtop **server_ptr,
 
 
 /**
- * glibtop_init_s:
+ * glibtop_init_s: (skip)
  * @server_ptr: (out):
  * @features:
  * @flags:

gtk-doc.make

@@ -1,4 +1,22 @@
 # -*- mode: makefile -*-
+#
+# gtk-doc.make - make rules for gtk-doc
+# Copyright (C) 2003 James Henstridge
+#               2004-2007 Damon Chaplin
+#               2007-2017 Stefan Sauer
+#
+# This program 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 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ####################################
 # Everything below here is generic #
@@ -39,6 +57,7 @@ DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
 	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).actions	 \
 	$(DOC_MODULE).args 	 \
 	$(DOC_MODULE).hierarchy  \
 	$(DOC_MODULE).interfaces \
@@ -81,55 +100,54 @@ $(REPORT_FILES): sgml-build.stamp
 
 #### setup ####
 
-GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_@AM_V@)
-GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_@AM_DEFAULT_V@)
 GTK_DOC_V_SETUP_0=@echo "  DOC   Preparing build";
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
+	  files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
-	    if test "x$$files" != "x" ; then \
+	  if test "x$$files" != "x" ; then \
-	        for file in $$files ; do \
+	    for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file`; \
+	      destdir=`dirname $(abs_builddir)/$$file`; \
-	            test -d "$$destdir" || mkdir -p "$$destdir"; \
+	      test -d "$$destdir" || mkdir -p "$$destdir"; \
-	            test -f $(abs_srcdir)/$$file && \
+	      test -f $(abs_srcdir)/$$file && \
-	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+	        cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
-	        done; \
+	    done; \
-	    fi; \
+	  fi; \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
-
 #### scan ####
 
-GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_@AM_V@)
-GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_@AM_DEFAULT_V@)
 GTK_DOC_V_SCAN_0=@echo "  DOC   Scanning header files";
 
-GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_@AM_V@)
-GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@)
 GTK_DOC_V_INTROSPECT_0=@echo "  DOC   Introspecting gobjects";
 
 scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    scanobj_options=""; \
+	  scanobj_options=""; \
-	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	  gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$$?" = "0"; then \
+	  if test "$$?" = "0"; then \
-	        if test "x$(V)" = "x1"; then \
+	    if test "x$(V)" = "x1"; then \
-	            scanobj_options="--verbose"; \
+	      scanobj_options="--verbose"; \
-	        fi; \
 	    fi; \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	  fi; \
-	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+	  CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	  gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
-	    for i in $(SCANOBJ_FILES) ; do \
+	  for i in $(SCANOBJ_FILES) ; do \
-	        test -f $$i || touch $$i ; \
+	    test -f $$i || touch $$i ; \
-	    done \
+	  done \
 	fi
 	$(AM_V_at)touch scan-build.stamp
 
@@ -138,14 +156,14 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 
 #### xml ####
 
-GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML=$(GTK_DOC_V_XML_@AM_V@)
-GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_=$(GTK_DOC_V_XML_@AM_DEFAULT_V@)
 GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
 
 sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
 	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
+	  _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
 	$(AM_V_at)touch sgml-build.stamp
@@ -153,6 +171,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF
 sgml.stamp: sgml-build.stamp
 	@true
 
+$(DOC_MAIN_SGML_FILE): sgml-build.stamp
+	@true
+
 xml/gtkdocentities.ent: Makefile
 	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
 		echo "<!ENTITY package \"$(PACKAGE)\">"; \
@@ -166,12 +187,12 @@ xml/gtkdocentities.ent: Makefile
 
 #### html ####
 
-GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_@AM_V@)
-GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_@AM_DEFAULT_V@)
 GTK_DOC_V_HTML_0=@echo "  DOC   Building HTML";
 
-GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_@AM_V@)
-GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_@AM_DEFAULT_V@)
 GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
@@ -190,20 +211,17 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	-@test "x$(HTML_IMAGES)" = "x" || \
 	for file in $(HTML_IMAGES) ; do \
-	  if test -f $(abs_srcdir)/$$file ; then \
+	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
-	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
-	  fi; \
+	  test -f $$file && cp $$file $(abs_builddir)/html; \
-	  if test -f $(abs_builddir)/$$file ; then \
-	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
-	  fi; \
 	done;
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
 
 #### pdf ####
 
-GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_@AM_V@)
-GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_@AM_DEFAULT_V@)
 GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)

include/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -89,17 +89,18 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = include
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/build-to-host.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -141,7 +142,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -159,8 +160,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -206,6 +205,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -217,8 +218,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
@@ -269,6 +272,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LSBLK = @LSBLK@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -278,8 +282,8 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -304,6 +308,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TR = @TR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -356,6 +361,8 @@ libgtop_sysdeps_dir = @libgtop_sysdeps_dir@
 libgtop_top_builddir = @libgtop_top_builddir@
 libs_xauth = @libs_xauth@
 localedir = @localedir@
+localedir_c = @localedir_c@
+localedir_c_make = @localedir_c_make@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -364,6 +371,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 server_programs = @server_programs@
 sharedstatedir = @sharedstatedir@
@@ -396,8 +404,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -513,8 +521,10 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

include/glibtop/Makefile.am

@@ -2,7 +2,7 @@ glibtopdir		= $(includedir)/libgtop-2.0/glibtop
 
 glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  sem_limits.h uptime.h command.h mem.h proclist.h \
-			  proctime.h shm_limits.h cpu.h msg_limits.h \
+			  proctime.h shm_limits.h cpu.h disk.h msg_limits.h \
 			  procmem.h procuid.h swap.h \
 			  procsegment.h sysdeps.h global.h \
 			  procsignal.h union.h gnuserv.h \

include/glibtop/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -90,17 +90,18 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = include/glibtop
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/build-to-host.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(glibtop_HEADERS) \
@@ -174,8 +175,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -195,6 +194,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -206,8 +207,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
@@ -258,6 +261,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LSBLK = @LSBLK@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -267,8 +271,8 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -293,6 +297,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TR = @TR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -345,6 +350,8 @@ libgtop_sysdeps_dir = @libgtop_sysdeps_dir@
 libgtop_top_builddir = @libgtop_top_builddir@
 libs_xauth = @libs_xauth@
 localedir = @localedir@
+localedir_c = @localedir_c@
+localedir_c_make = @localedir_c_make@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -353,6 +360,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 server_programs = @server_programs@
 sharedstatedir = @sharedstatedir@
@@ -367,7 +375,7 @@ top_srcdir = @top_srcdir@
 glibtopdir = $(includedir)/libgtop-2.0/glibtop
 glibtop_HEADERS = close.h loadavg.h prockernel.h procstate.h \
 			  sem_limits.h uptime.h command.h mem.h proclist.h \
-			  proctime.h shm_limits.h cpu.h msg_limits.h \
+			  proctime.h shm_limits.h cpu.h disk.h msg_limits.h \
 			  procmem.h procuid.h swap.h \
 			  procsegment.h sysdeps.h global.h \
 			  procsignal.h union.h gnuserv.h \
@@ -400,8 +408,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -491,8 +499,10 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

include/glibtop/command.h

@@ -60,8 +60,9 @@ G_BEGIN_DECLS
 #define GLIBTOP_CMND_PROC_WD		26
 #define GLIBTOP_CMND_PROC_AFFINITY	27
 #define GLIBTOP_CMND_PROC_IO	28
+#define GLIBTOP_CMND_DISK	29
 
-#define GLIBTOP_MAX_CMND		29
+#define GLIBTOP_MAX_CMND		30
 
 #define _GLIBTOP_PARAM_SIZE		16
 

include/glibtop/disk.h

@@ -0,0 +1,86 @@
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by James Dominic P. Guana <guana.histark@gmail.com>, May 2020.
+
+   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., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef __GLIBTOP_DISK_H__
+#define __GLIBTOP_DISK_H__
+
+#include <glibtop.h>
+#include <glibtop/global.h>
+
+G_BEGIN_DECLS
+
+#define GLIBTOP_XDISK_SECTORS_READ	0
+#define GLIBTOP_XDISK_TIME_READ		1
+#define GLIBTOP_XDISK_SECTORS_WRITE	2
+#define GLIBTOP_XDISK_TIME_WRITE		3
+
+#define GLIBTOP_MAX_DISK				4
+
+/* Nobody should really be using more than 4 disk.
+   Yes we are :)
+   Nobody should really be using more than 32 disk.
+*/
+#define GLIBTOP_NDISK					1024
+
+typedef struct _glibtop_disk	glibtop_disk;
+
+struct _partition_info
+{
+	char name[256];
+	char type[256];
+	char raid_num[256];
+	int max;
+};
+
+typedef struct _partition_info partition_info;
+
+struct _glibtop_disk
+{
+	guint64 flags;														/* NOT USED YET		*/
+	guint64 xdisk_sectors_read [GLIBTOP_NDISK];				/* GLIBTOP_XDISK_SECTORS_READ		*/
+	guint64 xdisk_time_read [GLIBTOP_NDISK];					/* GLIBTOP_XDISK_TIME_READ		*/
+	guint64 xdisk_sectors_write [GLIBTOP_NDISK];				/* GLIBTOP_XDISK_SECTORS_WRITE		*/
+	guint64 xdisk_time_write [GLIBTOP_NDISK];					/* GLIBTOP_XDISK_TIME_WRITE		*/
+	guint64 xdisk_flags;
+};
+
+void glibtop_get_disk (glibtop_disk *buf);
+
+#if GLIBTOP_SUID_DISK
+#define glibtop_get_disk_r	glibtop_get_disk_p
+#else
+#define glibtop_get_disk_r	glibtop_get_disk_s
+#endif
+
+void glibtop_get_disk_l (glibtop *server, glibtop_disk *buf);
+
+#if GLIBTOP_SUID_DISK
+void _glibtop_init_disk_p (glibtop *server);
+void glibtop_get_disk_p (glibtop *server, glibtop_disk *buf);
+#else
+void _glibtop_init_disk_s (glibtop *server);
+void glibtop_get_disk_s (glibtop *server, glibtop_disk *buf);
+#endif
+
+
+G_END_DECLS
+
+#endif

include/glibtop/global.h

@@ -28,17 +28,11 @@
 
 #endif /* _IN_LIBGTOP */
 
-#if TIME_WITH_SYS_TIME
+#if HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
 
+#include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 

include/glibtop/mountlist.h

@@ -58,7 +58,7 @@ struct _glibtop_mountlist
  * @buf:
  * @all_fs:
  *
- * Returns: (transfer full):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 
 /**
@@ -66,7 +66,7 @@ struct _glibtop_mountlist
  * @buf: (out):
  * @all_fs:
  *
- * Returns: (transfer none):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 
 /**
@@ -74,7 +74,7 @@ struct _glibtop_mountlist
  * @buf: (out):
  * @all_fs:
  *
- * Returns: (transfer none):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 
 /**
@@ -82,7 +82,7 @@ struct _glibtop_mountlist
  * @buf: (out):
  * @all_fs:
  *
- * Returns: (transfer none):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 
 glibtop_mountentry *

include/glibtop/netlist.h

@@ -45,7 +45,7 @@ struct _glibtop_netlist
  * glibtop_get_netlist:
  * @buf: a #glibtop_netlist
  *
- * Returns: (array zero-terminated=1) (transfer none): an array of network
+ * Returns: (array zero-terminated=1) (transfer full): an array of network
  *          interface names.
  */
 char** glibtop_get_netlist(glibtop_netlist *buf);
@@ -61,7 +61,7 @@ char** glibtop_get_netlist(glibtop_netlist *buf);
  * @server: a #glibtop server
  * @buf: a #glibtop_netlist
  *
- * Returns: (array zero-terminated=1) (transfer none): an array of network
+ * Returns: (array zero-terminated=1) (transfer full): an array of network
  *          interface names.
  */
 char** glibtop_get_netlist_l (glibtop *server, glibtop_netlist *buf);
@@ -74,7 +74,7 @@ void _glibtop_init_netlist_p (glibtop *server);
  * @server: a #glibtop server
  * @buf: a #glibtop_netlist
  *
- * Returns: (array zero-terminated=1) (transfer none): an array of network
+ * Returns: (array zero-terminated=1) (transfer full): an array of network
  *          interface names.
  */
 char** glibtop_get_netlist_p (glibtop *server, glibtop_netlist *buf);
@@ -86,7 +86,7 @@ void _glibtop_init_netlist_s (glibtop *server);
  * @server: a #glibtop server
  * @buf: a #glibtop_netlist
  *
- * Returns: (array zero-terminated=1) (transfer none): an array of network
+ * Returns: (array zero-terminated=1) (transfer full): an array of network
  *          interface names.
  */
 char** glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf);

include/glibtop/proclist.h

@@ -133,7 +133,7 @@ struct _glibtop_proclist
  * @which: a #GLIBTOP_* constant specifying process type
  * @arg: an argument specific for the process type
  *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
+ * Returns: (array zero-terminated=1) (transfer full): an array of process
  *     ids
  */
 pid_t*
@@ -152,7 +152,7 @@ glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg);
  * @which: a #GLIBTOP_* constant specifying process type
  * @arg: an argument specific for the process type
  *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
+ * Returns: (array zero-terminated=1) (transfer full): an array of process
  *     ids
  */
 pid_t*
@@ -169,7 +169,7 @@ void _glibtop_init_proclist_p (glibtop *server);
  * @which: a #GLIBTOP_* constant specifying process type
  * @arg: an argument specific for the process type
  *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
+ * Returns: (array zero-terminated=1) (transfer full): an array of process
  *     ids
  */
 pid_t*
@@ -185,7 +185,7 @@ void _glibtop_init_proclist_s (glibtop *server);
  * @which: a #GLIBTOP_* constant specifying process type
  * @arg: an argument specific for the process type
  *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
+ * Returns: (array zero-terminated=1) (transfer full): an array of process
  *     ids
  */
 pid_t*

include/glibtop/procmap.h

@@ -98,7 +98,7 @@ struct _glibtop_proc_map
  * @buf:
  * @pid:
  *
- * Returns: (transfer none):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 glibtop_map_entry *
 glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
@@ -111,7 +111,7 @@ glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
  * @buf: (out):
  * @pid:
  *
- * Returns: (transfer none):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 
 /**
@@ -120,7 +120,7 @@ glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
  * @buf: (out):
  * @pid:
  *
- * Returns: (transfer none):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 
 /**
@@ -129,7 +129,7 @@ glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
  * @buf: (out):
  * @pid:
  *
- * Returns: (transfer none):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 
 #if GLIBTOP_SUID_PROC_MAP

include/glibtop/procopenfiles.h

@@ -99,13 +99,13 @@ struct _glibtop_proc_open_files
  * @buf:
  * @pid:
  *
- * Returns: (transfer none):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 
 glibtop_open_files_entry *
 glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
 
-#if GLIBTOP_SUID_PROC_FILE
+#if GLIBTOP_SUID_PROC_OPEN_FILES
 #define glibtop_get_proc_open_files_r		glibtop_get_proc_open_files_p
 #else
 #define glibtop_get_proc_open_files_r		glibtop_get_proc_open_files_s
@@ -118,13 +118,13 @@ glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
  * @buf: (out):
  * @pid:
  *
- * Returns: (transfer none):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 
 glibtop_open_files_entry *
 glibtop_get_proc_open_files_l (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
 
-#if GLIBTOP_SUID_PROC_FILE
+#if GLIBTOP_SUID_PROC_OPEN_FILES
 void _glibtop_init_proc_open_files_p (glibtop *server);
 
 
@@ -134,7 +134,7 @@ void _glibtop_init_proc_open_files_p (glibtop *server);
  * @buf: (out):
  * @pid:
  *
- * Returns: (transfer none):
+ * Returns: (transfer full) (array zero-terminated=1):
  */
 
 glibtop_open_files_entry *

include/glibtop/sysdeps.h

@@ -54,8 +54,9 @@ G_BEGIN_DECLS
 #define GLIBTOP_SYSDEPS_PROC_WD		25
 #define GLIBTOP_SYSDEPS_PROC_AFFINITY	26
 #define GLIBTOP_SYSDEPS_PROC_IO	27
+#define GLIBTOP_SYSDEPS_DISK	28
 
-#define GLIBTOP_MAX_SYSDEPS		28
+#define GLIBTOP_MAX_SYSDEPS		29
 
 /* The 'features' args to glibtop_init_* is an unsigned long */
 G_STATIC_ASSERT((1UL << (GLIBTOP_MAX_SYSDEPS - 1)) <= ULONG_MAX);
@@ -95,7 +96,7 @@ struct _glibtop_sysdeps
 	guint64	proc_wd;		/* glibtop_proc_wd	*/
 	guint64	proc_affinity;		/* glibtop_proc_affinity */
 	guint64	proc_io;		/* glibtop_proc_io */
-	guint64	reserved0;
+	guint64 disk;			/* glibtop_disk		*/
 	guint64	reserved1;
 	guint64	reserved2;
 	guint64	reserved3;

include/glibtop/union.h

@@ -23,6 +23,7 @@
 #define __GLIBTOP_UNION_H__
 
 #include <glibtop/cpu.h>
+#include <glibtop/disk.h>
 #include <glibtop/mem.h>
 #include <glibtop/swap.h>
 #include <glibtop/uptime.h>
@@ -60,6 +61,7 @@ typedef union _glibtop_union	glibtop_union;
 union _glibtop_union
 {
 	glibtop_cpu		cpu;
+	glibtop_disk	disk;
 	glibtop_mem		mem;
 	glibtop_swap		swap;
 	glibtop_uptime		uptime;

install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2020-11-14.01; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -69,6 +69,11 @@ posix_mkdir=
 # Desired mode of installed file.
 mode=0755
 
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
@@ -99,18 +104,28 @@ Options:
      --version  display version info and exit.
 
   -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
+  -C            install only if different (preserve data modification time)
   -d            create directories instead of installing files.
   -g GROUP      $chgrpprog installed files to GROUP.
   -m MODE       $chmodprog installed files to MODE.
   -o USER       $chownprog installed files to USER.
+  -p            pass -p to $cpprog.
   -s            $stripprog installed files.
+  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
   -t DIRECTORY  install into DIRECTORY.
   -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
   CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
   RMPROG STRIPPROG
+
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
+
+If -S is not specified, no backups are attempted.
+
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
 "
 
 while test $# -ne 0; do
@@ -137,8 +152,13 @@ while test $# -ne 0; do
     -o) chowncmd="$chownprog $2"
         shift;;
 
+    -p) cpprog="$cpprog -p";;
+
     -s) stripcmd=$stripprog;;
 
+    -S) backupsuffix="$2"
+        shift;;
+
     -t)
         is_target_a_directory=always
         dst_arg=$2
@@ -255,6 +275,10 @@ do
     dstdir=$dst
     test -d "$dstdir"
     dstdir_status=$?
+    # Don't chown directories that already exist.
+    if test $dstdir_status = 0; then
+      chowncmd=""
+    fi
   else
 
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -271,15 +295,18 @@ do
     fi
     dst=$dst_arg
 
-    # If destination is a directory, append the input filename; won't work
+    # If destination is a directory, append the input filename.
-    # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test "$is_target_a_directory" = never; then
         echo "$0: $dst_arg: Is a directory" >&2
         exit 1
       fi
       dstdir=$dst
-      dst=$dstdir/`basename "$src"`
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
       dstdir_status=0
     else
       dstdir=`dirname "$dst"`
@@ -288,27 +315,16 @@ do
     fi
   fi
 
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-        # Create intermediate dirs using mode 755 as modified by the umask.
-        # This is like FreeBSD 'install' as of 1997-10-28.
-        umask=`umask`
-        case $stripcmd.$umask in
-          # Optimize common cases.
-          *[2367][2367]) mkdir_umask=$umask;;
-          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-          *[0-7])
-            mkdir_umask=`expr $umask + 22 \
-              - $umask % 100 % 40 + $umask % 20 \
-              - $umask % 10 % 4 + $umask % 2
-            `;;
-          *) mkdir_umask=$umask,go-w;;
-        esac
-
         # With -d, create the new directory with the user-specified mode.
         # Otherwise, rely on $mkdir_umask.
         if test -n "$dir_arg"; then
@@ -318,43 +334,49 @@ do
         fi
 
         posix_mkdir=false
-        case $umask in
+	# The $RANDOM variable is not portable (e.g., dash).  Use it
-          *[123567][0-7][0-7])
+	# here however when possible just to lower collision chance.
-            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-            ;;
-          *)
-            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 
-            if (umask $mkdir_umask &&
+	trap '
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	  ret=$?
-            then
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
-              if test -z "$dir_arg" || {
+	  exit $ret
-                   # Check for POSIX incompatibilities with -m.
+	' 0
-                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+
-                   # other-writable bit of parent directory when it shouldn't.
+	# Because "mkdir -p" follows existing symlinks and we likely work
-                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
-                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+	# directory is successfully created first before we actually test
-                   case $ls_ld_tmpdir in
+	# 'mkdir -p'.
-                     d????-?r-*) different_mode=700;;
+	if (umask $mkdir_umask &&
-                     d????-?--*) different_mode=755;;
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
-                     *) false;;
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
-                   esac &&
+	then
-                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+	  if test -z "$dir_arg" || {
-                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+	       # Check for POSIX incompatibilities with -m.
-                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                   }
+	       # other-writable bit of parent directory when it shouldn't.
-                 }
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-              then posix_mkdir=:
+	       test_tmpdir="$tmpdir/a"
-              fi
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
-              rmdir "$tmpdir/d" "$tmpdir"
+	       case $ls_ld_tmpdir in
-            else
+		 d????-?r-*) different_mode=700;;
-              # Remove any dirs left behind by ancient mkdir implementations.
+		 d????-?--*) different_mode=755;;
-              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+		 *) false;;
-            fi
+	       esac &&
-            trap '' 0;;
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-        esac;;
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       }
+	     }
+	  then posix_mkdir=:
+	  fi
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+	else
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+	fi
+	trap '' 0;;
     esac
 
     if
@@ -365,7 +387,7 @@ do
     then :
     else
 
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # mkdir does not conform to POSIX,
       # or it failed possibly due to a race condition.  Create the
       # directory the slow way, step by step, checking for races as we go.
 
@@ -394,7 +416,7 @@ do
           prefixes=
         else
           if $posix_mkdir; then
-            (umask=$mkdir_umask &&
+            (umask $mkdir_umask &&
              $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
             # Don't fail if two instances are running concurrently.
             test -d "$prefix" || exit 1
@@ -427,14 +449,25 @@ do
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
+    dsttmp=${dstdirslash}_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
+    rmtmp=${dstdirslash}_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 
     # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+    (umask $cp_umask &&
+     { test -z "$stripcmd" || {
+	 # Create $dsttmp read-write so that cp doesn't create it read-only,
+	 # which would cause strip to fail.
+	 if test -z "$doit"; then
+	   : >"$dsttmp" # No need to fork-exec 'touch'.
+	 else
+	   $doit touch "$dsttmp"
+	 fi
+       }
+     } &&
+     $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -460,6 +493,13 @@ do
     then
       rm -f "$dsttmp"
     else
+      # If $backupsuffix is set, and the file being installed
+      # already exists, attempt a backup.  Don't worry if it fails,
+      # e.g., if mv doesn't support -f.
+      if test -n "$backupsuffix" && test -f "$dst"; then
+        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+      fi
+
       # Rename the file to the real destination.
       $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
 
@@ -474,9 +514,9 @@ do
         # file should still install successfully.
         {
           test ! -f "$dst" ||
-          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          $doit $rmcmd "$dst" 2>/dev/null ||
           { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
           } ||
           { echo "$0: cannot unlink or rename $dst" >&2
             (exit 1); exit 1
@@ -493,9 +533,9 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

lib/Makefile.am

@@ -29,7 +29,7 @@ if HAVE_INTROSPECTION
 introspection_sources = $(libgtop_2_0_la_SOURCES) lib.c ../glibtop.h ../libgtopconfig.h \
 			../include/glibtop/close.h ../include/glibtop/loadavg.h ../include/glibtop/prockernel.h ../include/glibtop/procstate.h \
 			../include/glibtop/sem_limits.h ../include/glibtop/uptime.h ../include/glibtop/command.h ../include/glibtop/mem.h ../include/glibtop/proclist.h \
-			../include/glibtop/proctime.h ../include/glibtop/shm_limits.h ../include/glibtop/cpu.h ../include/glibtop/msg_limits.h \
+			../include/glibtop/proctime.h ../include/glibtop/shm_limits.h ../include/glibtop/cpu.h ../include/glibtop/disk.h ../include/glibtop/msg_limits.h \
 			../include/glibtop/procmem.h ../include/glibtop/procuid.h ../include/glibtop/swap.h \
 			../include/glibtop/procsegment.h ../include/glibtop/sysdeps.h ../include/glibtop/global.h \
 			../include/glibtop/procsignal.h ../include/glibtop/union.h ../include/glibtop/gnuserv.h \

lib/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -93,17 +93,18 @@ host_triplet = @host@
 @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA)
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/build-to-host.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intlmacosx.m4 \
 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/libgtop-sysdeps.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/libgtop-sysdeps.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -172,7 +173,13 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/boxed.Plo ./$(DEPDIR)/close.Plo \
+	./$(DEPDIR)/command.Plo ./$(DEPDIR)/init.Plo \
+	./$(DEPDIR)/lib.Plo ./$(DEPDIR)/open.Plo \
+	./$(DEPDIR)/parameter.Plo ./$(DEPDIR)/read.Plo \
+	./$(DEPDIR)/read_data.Plo ./$(DEPDIR)/sysdeps.Plo \
+	./$(DEPDIR)/write.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -217,8 +224,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -238,6 +243,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -249,8 +256,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_CFLAGS = @GLIB_CFLAGS@
@@ -301,6 +310,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LSBLK = @LSBLK@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -310,8 +320,8 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -336,6 +346,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TR = @TR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -388,6 +399,8 @@ libgtop_sysdeps_dir = @libgtop_sysdeps_dir@
 libgtop_top_builddir = @libgtop_top_builddir@
 libs_xauth = @libs_xauth@
 localedir = @localedir@
+localedir_c = @localedir_c@
+localedir_c_make = @localedir_c_make@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -396,6 +409,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 server_programs = @server_programs@
 sharedstatedir = @sharedstatedir@
@@ -423,7 +437,7 @@ INTROSPECTION_COMPILER_ARGS =
 @HAVE_INTROSPECTION_TRUE@introspection_sources = $(libgtop_2_0_la_SOURCES) lib.c ../glibtop.h ../libgtopconfig.h \
 @HAVE_INTROSPECTION_TRUE@			../include/glibtop/close.h ../include/glibtop/loadavg.h ../include/glibtop/prockernel.h ../include/glibtop/procstate.h \
 @HAVE_INTROSPECTION_TRUE@			../include/glibtop/sem_limits.h ../include/glibtop/uptime.h ../include/glibtop/command.h ../include/glibtop/mem.h ../include/glibtop/proclist.h \
-@HAVE_INTROSPECTION_TRUE@			../include/glibtop/proctime.h ../include/glibtop/shm_limits.h ../include/glibtop/cpu.h ../include/glibtop/msg_limits.h \
+@HAVE_INTROSPECTION_TRUE@			../include/glibtop/proctime.h ../include/glibtop/shm_limits.h ../include/glibtop/cpu.h ../include/glibtop/disk.h ../include/glibtop/msg_limits.h \
 @HAVE_INTROSPECTION_TRUE@			../include/glibtop/procmem.h ../include/glibtop/procuid.h ../include/glibtop/swap.h \
 @HAVE_INTROSPECTION_TRUE@			../include/glibtop/procsegment.h ../include/glibtop/sysdeps.h ../include/glibtop/global.h \
 @HAVE_INTROSPECTION_TRUE@			../include/glibtop/procsignal.h ../include/glibtop/union.h ../include/glibtop/gnuserv.h \
@@ -462,8 +476,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -519,17 +533,23 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boxed.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boxed.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parameter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parameter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_data.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_data.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysdeps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysdeps.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -651,8 +671,10 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -692,7 +714,8 @@ installdirs:
 	done
 install: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
+install-exec: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
@@ -729,7 +752,17 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/boxed.Plo
+	-rm -f ./$(DEPDIR)/close.Plo
+	-rm -f ./$(DEPDIR)/command.Plo
+	-rm -f ./$(DEPDIR)/init.Plo
+	-rm -f ./$(DEPDIR)/lib.Plo
+	-rm -f ./$(DEPDIR)/open.Plo
+	-rm -f ./$(DEPDIR)/parameter.Plo
+	-rm -f ./$(DEPDIR)/read.Plo
+	-rm -f ./$(DEPDIR)/read_data.Plo
+	-rm -f ./$(DEPDIR)/sysdeps.Plo
+	-rm -f ./$(DEPDIR)/write.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -775,7 +808,17 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/boxed.Plo
+	-rm -f ./$(DEPDIR)/close.Plo
+	-rm -f ./$(DEPDIR)/command.Plo
+	-rm -f ./$(DEPDIR)/init.Plo
+	-rm -f ./$(DEPDIR)/lib.Plo
+	-rm -f ./$(DEPDIR)/open.Plo
+	-rm -f ./$(DEPDIR)/parameter.Plo
+	-rm -f ./$(DEPDIR)/read.Plo
+	-rm -f ./$(DEPDIR)/read_data.Plo
+	-rm -f ./$(DEPDIR)/sysdeps.Plo
+	-rm -f ./$(DEPDIR)/write.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -795,11 +838,11 @@ ps-am:
 uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \
 	uninstall-typelibDATA
 
-.MAKE: all check install install-am install-strip
+.MAKE: all check install install-am install-exec install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
-	ctags-am distclean distclean-compile distclean-generic \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \

lib/command.c

@@ -43,6 +43,7 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
 	  CHECK_CMND(GLIBTOP_CMND_QUIT);
 	  CHECK_CMND(GLIBTOP_CMND_SYSDEPS);
 	  CHECK_CMND(GLIBTOP_CMND_CPU);
+	  CHECK_CMND(GLIBTOP_CMND_DISK);
 	  CHECK_CMND(GLIBTOP_CMND_MEM);
 	  CHECK_CMND(GLIBTOP_CMND_SWAP);
 	  CHECK_CMND(GLIBTOP_CMND_UPTIME);

lib/lib.c

@@ -80,6 +80,39 @@ glibtop_get_cpu_l (glibtop *server, glibtop_cpu *buf)
 					  &server->required.cpu);
 }
 
+void
+glibtop_get_disk_l (glibtop *server, glibtop_disk *buf)
+{
+	glibtop_init_r (&server, (1 << GLIBTOP_SYSDEPS_DISK), 0);
+
+	/* If neccessary, we ask the server for the requested
+	 * feature. If not, we call the sysdeps function. */
+
+	if ((server->flags & _GLIBTOP_INIT_STATE_SERVER) &&
+	    (server->features & (1 << GLIBTOP_SYSDEPS_DISK)))
+	{
+		const void *send_ptr = NULL;
+		const size_t send_size = 0;
+
+		glibtop_call_l (server, GLIBTOP_CMND_DISK,
+				send_size, send_ptr,
+				sizeof (glibtop_disk), buf);
+	} else {
+#if (!GLIBTOP_SUID_DISK)
+		glibtop_get_disk_s (server, buf);
+#else
+		errno = ENOSYS;
+		glibtop_error_io_r (server, "glibtop_get_disk");
+#endif
+	}
+
+	/* Make sure that all required fields are present. */
+
+	if (buf->flags & server->required.disk)
+		_glibtop_missing_feature (server, "disk", buf->flags,
+					  &server->required.disk);
+}
+
 void
 glibtop_get_mem_l (glibtop *server, glibtop_mem *buf)
 {

lib/libgtop.sym

@@ -3,6 +3,8 @@ glibtop_close
 glibtop_close_r
 glibtop_get_cpu
 glibtop_get_cpu_l
+glibtop_get_disk
+glibtop_get_disk_l
 glibtop_get_fsusage
 glibtop_get_fsusage_l
 glibtop_get_loadavg

lib/sysdeps.c

@@ -27,6 +27,7 @@
 
 const unsigned long glibtop_server_features =
 GLIBTOP_SUID_CPU +
+GLIBTOP_SUID_DISK +
 GLIBTOP_SUID_MEM +
 GLIBTOP_SUID_SWAP +
 GLIBTOP_SUID_UPTIME +
@@ -44,6 +45,7 @@ GLIBTOP_SUID_PROC_KERNEL +
 GLIBTOP_SUID_PROC_SEGMENT +
 GLIBTOP_SUID_PROC_ARGS +
 GLIBTOP_SUID_PROC_MAP +
+GLIBTOP_SUID_PROC_OPEN_FILES +
 GLIBTOP_SUID_NETLOAD +
 GLIBTOP_SUID_NETLIST +
 GLIBTOP_SUID_PROC_WD +
@@ -55,6 +57,9 @@ const _glibtop_init_func_t _glibtop_init_hook_s [] = {
 #if !GLIBTOP_SUID_CPU
 	_glibtop_init_cpu_s,
 #endif
+#if !GLIBTOP_SUID_DISK
+	_glibtop_init_disk_s,
+#endif
 #if !GLIBTOP_SUID_MEM
 	_glibtop_init_mem_s,
 #endif
@@ -123,6 +128,9 @@ const _glibtop_init_func_t _glibtop_init_hook_s [] = {
 #endif
 #if !GLIBTOP_SUID_PROC_IO
 	_glibtop_init_proc_io_s,
+#endif
+#if !GLIBTOP_SUID_PROC_OPEN_FILES
+	_glibtop_init_proc_open_files_s,
 #endif
 	NULL
 };
@@ -131,6 +139,9 @@ const _glibtop_init_func_t _glibtop_init_hook_p [] = {
 #if GLIBTOP_SUID_CPU
 	_glibtop_init_cpu_p,
 #endif
+#if GLIBTOP_SUID_DISK
+	_glibtop_init_disk_p,
+#endif
 #if GLIBTOP_SUID_MEM
 	_glibtop_init_mem_p,
 #endif
@@ -199,6 +210,9 @@ const _glibtop_init_func_t _glibtop_init_hook_p [] = {
 #endif
 #if GLIBTOP_SUID_PROC_IO
 	_glibtop_init_proc_io_p,
+#endif
+#if GLIBTOP_SUID_PROC_OPEN_FILES
+	_glibtop_init_proc_open_files_p,
 #endif
 	NULL
 };