Use proper ids

Update to upstream version '2.41.3'
with Debian dir 690cd6361d

INSTALL

@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+   Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
-Foundation, Inc.
+Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -225,7 +225,7 @@ order to use an ANSI C compiler:
 
 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 their
+   HP-UX 'make' updates targets which have the same timestamps as their
 prerequisites, which makes it generally unusable when shipped generated
 files such as 'configure' are involved.  Use GNU 'make' instead.
 

Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,8 +91,9 @@ 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 \
@@ -179,8 +180,8 @@ am__recursive_targets = \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	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@
@@ -664,7 +673,6 @@ 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
 
@@ -750,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
@@ -792,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)
@@ -807,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 \
@@ -972,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,37 @@
+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
 ================================================
 

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.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 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,13 +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'.])])
 
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [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.16.1], [],
+m4_if([$1], [1.16.5], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,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.16.1])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-2018 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,
@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2018 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,
@@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2018 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,
@@ -332,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2018 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,
@@ -371,7 +371,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   done
   if test $am_rc -ne 0; then
     AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  Try re-running configure with the
+    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
@@ -398,7 +400,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 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,
@@ -426,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
@@ -462,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
@@ -514,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
@@ -595,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-2018 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,
@@ -616,7 +636,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2018 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,
@@ -637,7 +657,7 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2018 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,
@@ -680,7 +700,7 @@ AC_SUBST([am__quote])])
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2018 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,
@@ -701,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
@@ -719,7 +734,7 @@ fi
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2018 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,
@@ -748,7 +763,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2018 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,
@@ -795,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-2018 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,
@@ -814,7 +829,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 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,
@@ -895,7 +910,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2018 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,
@@ -955,7 +970,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2018 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,
@@ -983,7 +998,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2018 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,
@@ -1002,7 +1017,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2018 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,
@@ -1133,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])

autogen.sh

@@ -1,5 +1,33 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
+RED='\033[0;31m'
+NC='\033[0m' # No Color
+
+case "$(uname -s)" in
+        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 -n "$srcdir" || srcdir=$(dirname "$0")
 test -n "$srcdir" || srcdir=.
 

compile

@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2018 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
@@ -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/*)

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,21 +3,21 @@ dnl Configure script for the Gnome library
 dnl
 
 m4_define([libgtop_major_version], [2])
-m4_define([libgtop_minor_version], [40])
+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
-m4_define([libgtop_revision], [1])
+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"
 

debian/changelog

@@ -1,8 +1,26 @@
-libgtop2 (2.40.0-3) UNRELEASED; urgency=medium
+libgtop2 (2.41.3-1) unstable; urgency=medium
 
-  * debian/rules: Link against libbsd on kfreebsd (Closes: #874301)
+  * New upstream release
 
- -- Laurent Bigonville <bigon@debian.org>  Tue, 18 Feb 2020 09:26:06 +0100
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Fri, 16 Feb 2024 13:16:32 -0500
+
+libgtop2 (2.41.2-1) unstable; urgency=medium
+
+  [ Jeremy Bícha ]
+  * New upstream release
+  * debian/libgtop-2.0-11.symbols: Add new symbols
+  * Bump debhelper-compat to 13
+  * Remove references to kfreebsd (Closes: #874301)
+  * Simplify debian/rules
+  * Remove all patches: obsolete or applied in new release
+  * Run wrap-and-sort
+  * Stop using debian/control.in and dh_gnome_clean
+
+  [ Debian Janitor ]
+  * Add debian/upstream/metadata
+  * Update standards version to 4.6.2, no changes needed
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Thu, 11 Jan 2024 10:57:46 -0500
 
 libgtop2 (2.40.0-2) unstable; urgency=medium
 

debian/control

@@ -1,37 +1,30 @@
-# This file is autogenerated. DO NOT EDIT!
-#
-# Modifications should be made to debian/control.in instead.
-# This file is regenerated automatically in the clean target.
 Source: libgtop2
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>,
-Build-Depends: debhelper-compat (= 12),
+           Jeremy Bícha <jbicha@ubuntu.com>
+Build-Depends: debhelper-compat (= 13),
                dh-sequence-gir,
                dh-sequence-gnome,
                gettext,
-               pkg-config,
-               libxau-dev,
-               libglib2.0-dev (>= 2.6.0),
-               texinfo,
-               libxt-dev,
-               libgeom-dev [kfreebsd-any],
-               libdevstat-dev [kfreebsd-any],
-               libkvm-dev [kfreebsd-any],
-               libbsd-dev [kfreebsd-any],
                gtk-doc-tools (>= 1.4),
-               libgirepository1.0-dev (>= 0.10.7-1~)
+               libgirepository1.0-dev (>= 0.10.7-1~),
-Standards-Version: 4.4.1
+               libglib2.0-dev (>= 2.6.0),
+               libxau-dev,
+               libxt-dev,
+               pkgconf,
+               texinfo
+Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/gnome-team/libgtop
 Vcs-Git: https://salsa.debian.org/gnome-team/libgtop.git
 
 Package: libgtop-2.0-11
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends},
+Depends: libgtop2-common (>= ${source:Version}),
          ${misc:Depends},
-         libgtop2-common (>= ${source:Version})
+         ${shlibs:Depends}
 Description: gtop system monitoring library (shared)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -42,10 +35,10 @@ Package: libgtop2-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: ${misc:Depends},
+Depends: gir1.2-gtop-2.0 (= ${binary:Version}),
+         libglib2.0-dev,
          libgtop-2.0-11 (= ${binary:Version}),
-         gir1.2-gtop-2.0 (= ${binary:Version}),
+         ${misc:Depends}
-         libglib2.0-dev
 Description: gtop system monitoring library (devel)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -55,7 +48,7 @@ Description: gtop system monitoring library (devel)
 Package: libgtop2-common
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends},
+Depends: ${misc:Depends}
 Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -66,7 +59,7 @@ Package: libgtop2-doc
 Architecture: all
 Multi-Arch: foreign
 Section: doc
-Depends: ${misc:Depends},
+Depends: ${misc:Depends}
 Description: gtop system monitoring library (documentation)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -77,8 +70,8 @@ Package: gir1.2-gtop-2.0
 Architecture: any
 Multi-Arch: same
 Section: introspection
-Depends: ${misc:Depends},
+Depends: ${gir:Depends},
-         ${gir:Depends}
+         ${misc:Depends}
 Description: gtop system monitoring library (gir bindings)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.

debian/control.in

@@ -1,83 +0,0 @@
-Source: libgtop2
-Section: libs
-Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper-compat (= 12),
-               dh-sequence-gir,
-               dh-sequence-gnome,
-               gettext,
-               pkg-config,
-               libxau-dev,
-               libglib2.0-dev (>= 2.6.0),
-               texinfo,
-               libxt-dev,
-               libgeom-dev [kfreebsd-any],
-               libdevstat-dev [kfreebsd-any],
-               libkvm-dev [kfreebsd-any],
-               libbsd-dev [kfreebsd-any],
-               gtk-doc-tools (>= 1.4),
-               libgirepository1.0-dev (>= 0.10.7-1~)
-Standards-Version: 4.4.1
-Vcs-Browser: https://salsa.debian.org/gnome-team/libgtop
-Vcs-Git: https://salsa.debian.org/gnome-team/libgtop.git
-
-Package: libgtop-2.0-11
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libgtop2-common (>= ${source:Version})
-Description: gtop system monitoring library (shared)
- The gtop library reads information about processes and the state of the
- system. It is used by the GNOME desktop environment.
- .
- This package contains the shared library.
-
-Package: libgtop2-dev
-Architecture: any
-Multi-Arch: same
-Section: libdevel
-Depends: ${misc:Depends},
-         libgtop-2.0-11 (= ${binary:Version}),
-         gir1.2-gtop-2.0 (= ${binary:Version}),
-         libglib2.0-dev
-Description: gtop system monitoring library (devel)
- The gtop library reads information about processes and the state of the
- system. It is used by the GNOME desktop environment.
- .
- This package contains the static library and development headers.
-
-Package: libgtop2-common
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends},
-Description: gtop system monitoring library (common)
- The gtop library reads information about processes and the state of the
- system. It is used by the GNOME desktop environment.
- .
- This package contains the translations.
-
-Package: libgtop2-doc
-Architecture: all
-Multi-Arch: foreign
-Section: doc
-Depends: ${misc:Depends},
-Description: gtop system monitoring library (documentation)
- The gtop library reads information about processes and the state of the
- system. It is used by the GNOME desktop environment.
- .
- This package contains the documentation.
-
-Package: gir1.2-gtop-2.0
-Architecture: any
-Multi-Arch: same
-Section: introspection
-Depends: ${misc:Depends},
-         ${gir:Depends}
-Description: gtop system monitoring library (gir bindings)
- The gtop library reads information about processes and the state of the
- system. It is used by the GNOME desktop environment.
- .
- This package can be used by other packages using the GIRepository format to
- generate dynamic bindings.

debian/libgtop-2.0-11.symbols

@@ -5,6 +5,8 @@ libgtop-2.0.so.11 libgtop-2.0-11 #MINVER#
  glibtop_close_r@Base 2.22.3
  glibtop_get_cpu@Base 2.22.3
  glibtop_get_cpu_l@Base 2.22.3
+ glibtop_get_disk@Base 2.41.2
+ glibtop_get_disk_l@Base 2.41.2
  glibtop_get_fsusage@Base 2.22.3
  glibtop_get_fsusage_l@Base 2.22.3
  glibtop_get_loadavg@Base 2.22.3

debian/libgtop2-doc.info

@@ -1 +1 @@
-doc/libgtop2.info
+usr/share/info/libgtop2.info

debian/patches/03_kfreebsd_installdirs.patch

@@ -1,86 +0,0 @@
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602664
-Author: Josselin Mouette <joss@debian.org>
-
-The libgtop_server2 binary is launched by the library itself, and has no use
-being launched directly. Therefore, it should go in $(libexecdir) instead.
-
-The patch also adds some missing $(DESTDIR) references in the installation
-hooks.
-
-Index: libgtop-2.32.0/libgtop-sysdeps.m4
-===================================================================
---- libgtop-2.32.0.orig/libgtop-sysdeps.m4	2015-10-07 23:46:35.738589058 +0200
-+++ libgtop-2.32.0/libgtop-sysdeps.m4	2015-10-07 23:51:51.006990769 +0200
-@@ -40,38 +40,38 @@
- 	netbsd*|bsdi*)
- 	  libgtop_sysdeps_dir=bsd
- 	  libgtop_need_server=yes
--	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
-+	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
- 	  ;;
- 	openbsd*)
- 	  libgtop_sysdeps_dir=openbsd
- 	  libgtop_need_server=yes
- 	  libgtop_sysdeps_private_mountlist=yes
- 	  libgtop_sysdeps_private_fsusage=yes
--	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2'
-+	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
- 	  ;;
- 	freebsd*|kfreebsd*)
- 	  libgtop_sysdeps_dir=freebsd
- 	  libgtop_need_server=yes
- 	  libgtop_sysdeps_private_mountlist=yes
- 	  libgtop_sysdeps_private_fsusage=yes
--	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
-+	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
- 	  ;;
- 	solaris*)
- 	  libgtop_sysdeps_dir=solaris
- 	  libgtop_need_server=yes
--	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-+	  libgtop_postinstall='chgrp sys $(DESTDIR)$(libexecdir)/libgtop_server && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server'
- 	  ;;
- 	aix*)
- 	  libgtop_sysdeps_dir=aix
- 	  libgtop_need_server=yes
- 	  libgtop_have_sysinfo=yes
--	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
-+	  libgtop_postinstall='chgrp system $(DESTDIR)$(libexecdir)/libgtop_server && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2'
- 	  ;;
- 	darwin*)
- 	  libgtop_sysdeps_dir=darwin
- 	  libgtop_need_server=yes
- 	  libgtop_have_sysinfo=yes
--	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
-+	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2'
- 	  ;;
- 	cygwin*)
- 	  libgtop_sysdeps_dir=cygwin
-Index: libgtop-2.32.0/src/daemon/Makefile.am
-===================================================================
---- libgtop-2.32.0.orig/src/daemon/Makefile.am	2015-10-07 23:46:35.738589058 +0200
-+++ libgtop-2.32.0/src/daemon/Makefile.am	2015-10-07 23:46:35.734589003 +0200
-@@ -26,7 +26,7 @@
- suid_common			=
- endif
- 
--bin_PROGRAMS			= libgtop_daemon2 @server_programs@
-+libexec_PROGRAMS		= libgtop_daemon2 @server_programs@
- 
- EXTRA_PROGRAMS			= libgtop_server2
- 
-Index: libgtop-2.32.0/configure.ac
-===================================================================
---- libgtop-2.32.0.orig/configure.ac	2015-10-07 23:46:35.738589058 +0200
-+++ libgtop-2.32.0/configure.ac	2015-10-07 23:46:35.734589003 +0200
-@@ -285,8 +285,8 @@
- 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_SERVER=`eval echo "${bindir}/libgtop_server2"`
-+LIBGTOP_BINDIR=`eval echo "${libexecdir}"`
-+LIBGTOP_SERVER=`eval echo "${libexecdir}/libgtop_server2"`
- prefix="$libgtop_save_prefix"
- exec_prefix="$libgtop_save_exec_prefix"
- 

debian/patches/04_kfreebsd_version.patch

@@ -1,21 +0,0 @@
-From: Steven Chamberlain <steven@pyro.eu.org>
-Date: Mon, 15 Jun 2015 17:09:49 +0100
-
-Support GNU/kFreeBSD by using __FreeBSD_kernel_version here,
-rather than simply __FreeBSD_version (which is only defined in
-FreeBSD itself).
-
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788709
---- a/sysdeps/freebsd/open.c
-+++ b/sysdeps/freebsd/open.c
-@@ -43,6 +43,10 @@
- 	server->real_ncpu = ncpus - 1;
- 	server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
- 
-+#if defined(__FreeBSD__)
- 	server->os_version_code = __FreeBSD_version;
-+#else
-+	server->os_version_code = __FreeBSD_kernel_version;
-+#endif
- 
- }

debian/patches/mountlist-ignore-snap-squashfs.patch

@@ -1,50 +0,0 @@
-From: Andrea Azzarone <azzaronea@gmail.com>
-Date: Thu, 19 Apr 2018 15:58:30 +0200
-Subject: mountlist: ignore snap squashfs
-
-Ignore squashfs mounted in snaps. This will make sure that snap fs
-are not listed in gnome-system-monitor.
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1749007
-Forwarded: not-needed
----
- sysdeps/linux/mountlist.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/sysdeps/linux/mountlist.c b/sysdeps/linux/mountlist.c
-index 7c376fd..f36fc29 100644
---- a/sysdeps/linux/mountlist.c
-+++ b/sysdeps/linux/mountlist.c
-@@ -84,7 +84,7 @@ ignore_list_has(IgnoreList* ig, const char* fs)
- 
- 
- static gboolean
--ignore_fs(const char *fstype, IgnoreList** ig)
-+ignore_fs(const char* mntdir, const char *fstype, IgnoreList** ig)
- {
-   if (!*ig) {
-     FILE* fs;
-@@ -106,10 +106,13 @@ ignore_fs(const char *fstype, IgnoreList** ig)
-     }
-   }
- 
-+  /* ignore snap squashfs */
-+  if (!strcmp(fstype, "squashfs") && !strncmp(mntdir, "/snap/", 6))
-+    return TRUE;
-+
-   return ignore_list_has(*ig, fstype);
- }
- 
--
- glibtop_mountentry *
- glibtop_get_mountlist_s(glibtop *server, glibtop_mountlist *buf, int all_fs)
- {
-@@ -136,7 +139,7 @@ glibtop_get_mountlist_s(glibtop *server, glibtop_mountlist *buf, int all_fs)
-       const char *devopt;
-       gsize len;
- 
--      if (!all_fs && ignore_fs(mnt->mnt_type, &ig))
-+      if (!all_fs && ignore_fs(mnt->mnt_dir, mnt->mnt_type, &ig))
- 	continue;
- 
-       len = entries->len;

debian/patches/series

@@ -1,3 +0,0 @@
-03_kfreebsd_installdirs.patch
-04_kfreebsd_version.patch
-mountlist-ignore-snap-squashfs.patch

debian/rules

@@ -1,14 +1,8 @@
 #!/usr/bin/make -f
 
-SHARED_PKG := libgtop-2.0-11
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs
-
+export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-CPPFLAGS += $(shell pkg-config --cflags libbsd-overlay)
-LDFLAGS += $(shell pkg-config --libs libbsd-overlay)
-endif
 
 %:
 	dh $@
@@ -16,26 +10,13 @@ endif
 override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		--libexecdir=\$${libdir}/$(SHARED_PKG)
-
-override_dh_makeshlibs:
-	dh_makeshlibs -V '$(SHARED_PKG) (>= 2.32.0)' -- -c4
-
 override_dh_fixperms:
 	dh_fixperms -X libgtop_server2
 
-override_dh_install:
+execute_before_dh_install:
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-	# The server is only necessary on kFreeBSD
-	dh_install --autodest -p$(SHARED_PKG) \
-		--ignore=debian/$(SHARED_PKG).install \
-		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(SHARED_PKG)/libgtop_server2
-endif
 	find debian/tmp -name '*.la' -print -delete
-	dh_install
 
 override_dh_missing:
 	dh_missing --list-missing
+
+override_dh_gnome_clean:

debian/watch

@@ -1,3 +1,3 @@
 version=4
-https://download.gnome.org/sources/libgtop/([\d\.]+[02468])/ \
+https://download.gnome.org/sources/libgtop/([\d\.]+)/ \
-	libgtop@ANY_VERSION@\.tar\.xz
+	libgtop@ANY_VERSION@@ARCHIVE_EXT@

depcomp

@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2018 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

doc/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,8 +89,9 @@ 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 \
@@ -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@
@@ -750,7 +758,6 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

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

@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1995-2018 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

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.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,
@@ -113,8 +113,9 @@ 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 \
@@ -177,6 +178,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -188,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@
@@ -240,6 +245,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LSBLK = @LSBLK@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -249,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@
@@ -275,6 +281,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TR = @TR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -327,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@
@@ -335,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@
@@ -421,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 \
@@ -515,7 +526,6 @@ ctags CTAGS:
 
 cscope cscopelist:
 
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

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.29 (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.40.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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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>
@@ -279,12 +279,12 @@ interface names. </p>
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><span class="type">guint64</span> <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><span class="type">guint32</span> <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.29</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.29 (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.29</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.29 (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>
@@ -227,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.29</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.29 (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.29</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.29 (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><span class="type">gint64</span> 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><span class="type">gint64</span> 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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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.29</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.29 (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>
@@ -132,8 +132,11 @@ shift. Because <span class="type">INITIAL_JIFFIES</span> is not user-space defin
 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
+
 <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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><span class="type">guint64</span> <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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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>
@@ -259,6 +259,6 @@ glibtop_get_mountlist_s (<em class="parameter"><code><a class="link" href="libgt
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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>
@@ -449,17 +449,25 @@ glibtop_get_proc_map_s (<em class="parameter"><code><a class="link" href="libgto
 <a name="glibtop-map-entry"></a><h3>struct glibtop_map_entry</h3>
 <pre class="programlisting">struct glibtop_map_entry {
 	guint64 flags;
+
 	guint64 start;
+
 	guint64 end;
+
 	guint64 offset;
+
 	guint64 perm;
+
 	guint64 inode;
+
 	guint64 device;
 	guint64 size;
 	guint64 rss;
 	guint64 shared_clean;
+
 	guint64 shared_dirty;
 	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.29</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.29 (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.29</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.29 (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>
@@ -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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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><span class="type">guint64</span> <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><span class="type">guint64</span> <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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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.29 (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.29</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

@@ -61,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,
@@ -127,6 +115,7 @@ td p
   margin: 0.25em;
 }
 
+div.informaltable table[border="1"],
 div.table table
 {
   border-collapse: collapse;
@@ -135,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 */
@@ -143,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 */
@@ -298,24 +290,6 @@ 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;
@@ -481,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.40.0</phrase>
+<phrase>2.41.3</phrase>

doc/stamp-vti

@@ -1,4 +1,4 @@
-@set UPDATED 4 February 2019
+@set UPDATED 27 November 2016
-@set UPDATED-MONTH February 2019
+@set UPDATED-MONTH November 2016
-@set EDITION 2.40.0
+@set EDITION 2.41.3
-@set VERSION 2.40.0
+@set VERSION 2.41.3

doc/version.texi

@@ -1,4 +1,4 @@
-@set UPDATED 4 February 2019
+@set UPDATED 27 November 2016
-@set UPDATED-MONTH February 2019
+@set UPDATED-MONTH November 2016
-@set EDITION 2.40.0
+@set EDITION 2.41.3
-@set VERSION 2.40.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.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,11 +93,13 @@ 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 \
@@ -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
@@ -189,13 +197,14 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/affinity.Po ./$(DEPDIR)/df.Po \
-	./$(DEPDIR)/diskio.Po ./$(DEPDIR)/first.Po ./$(DEPDIR)/free.Po \
+	./$(DEPDIR)/disk.Po ./$(DEPDIR)/diskio.Po ./$(DEPDIR)/first.Po \
-	./$(DEPDIR)/mountlist.Po ./$(DEPDIR)/netlist.Po \
+	./$(DEPDIR)/free.Po ./$(DEPDIR)/mountlist.Po \
-	./$(DEPDIR)/netload.Po ./$(DEPDIR)/openfiles.Po \
+	./$(DEPDIR)/netlist.Po ./$(DEPDIR)/netload.Po \
-	./$(DEPDIR)/pprint.Po ./$(DEPDIR)/procargs.Po \
+	./$(DEPDIR)/openfiles.Po ./$(DEPDIR)/pprint.Po \
-	./$(DEPDIR)/proclist.Po ./$(DEPDIR)/procmap.Po \
+	./$(DEPDIR)/procargs.Po ./$(DEPDIR)/proclist.Po \
-	./$(DEPDIR)/second.Po ./$(DEPDIR)/smp.Po \
+	./$(DEPDIR)/procmap.Po ./$(DEPDIR)/second.Po \
-	./$(DEPDIR)/sysdeps.Po ./$(DEPDIR)/timings.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) \
@@ -216,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;; \
@@ -250,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)
@@ -278,6 +287,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -289,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@
@@ -341,6 +354,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LSBLK = @LSBLK@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -350,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@
@@ -376,6 +390,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TR = @TR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -428,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@
@@ -436,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@
@@ -462,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
@@ -484,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:
@@ -535,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)
@@ -591,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)
@@ -607,6 +637,7 @@ distclean-compile:
 
 @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@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disk.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskio.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/first.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/free.Po@am__quote@ # am--include-marker
@@ -621,6 +652,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/second.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smp.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysdeps.Po@am__quote@ # am--include-marker
+@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
 
@@ -708,7 +740,6 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -784,6 +815,7 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
 distclean: distclean-am
 		-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
@@ -798,6 +830,7 @@ distclean: distclean-am
 	-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
@@ -847,6 +880,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
 		-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
@@ -861,6 +895,7 @@ maintainer-clean: maintainer-clean-am
 	-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

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);
 
@@ -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);
 
@@ -153,9 +152,6 @@ main (int argc, char *argv [])
 		hwaddress_string);
 
 
-	g_free (address_string);
-	g_free (subnet_string);
-
 	glibtop_close ();
 
 	exit (0);

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

@@ -57,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 \

include/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,8 +89,9 @@ 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 \
@@ -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@
@@ -513,7 +521,6 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

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.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,8 +90,9 @@ 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 \
@@ -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 \
@@ -491,7 +499,6 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 

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/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/sysinfo.h

@@ -53,6 +53,8 @@ struct _glibtop_sysinfo
 	glibtop_entry cpuinfo [GLIBTOP_NCPU];
 };
 
+const char *decode_cpu_part(unsigned int part);
+
 #define glibtop_get_sysinfo_r	glibtop_get_sysinfo_s
 
 const glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);

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=2018-03-11.20; # 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
@@ -301,22 +325,6 @@ do
   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
@@ -326,52 +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.
-            ;;
-          *)
-            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
-            # here however when possible just to lower collision chance.
-            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 
-            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+	trap '
+	  ret=$?
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	  exit $ret
+	' 0
 
-            # Because "mkdir -p" follows existing symlinks and we likely work
+	# Because "mkdir -p" follows existing symlinks and we likely work
-            # directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
-            # directory is successfully created first before we actually test
+	# directory is successfully created first before we actually test
-            # 'mkdir -p' feature.
+	# 'mkdir -p'.
-            if (umask $mkdir_umask &&
+	if (umask $mkdir_umask &&
-                $mkdirprog $mkdir_mode "$tmpdir" &&
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
-            then
+	then
-              if test -z "$dir_arg" || {
+	  if test -z "$dir_arg" || {
-                   # Check for POSIX incompatibilities with -m.
+	       # Check for POSIX incompatibilities with -m.
-                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                   # other-writable bit of parent directory when it shouldn't.
+	       # other-writable bit of parent directory when it shouldn't.
-                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   test_tmpdir="$tmpdir/a"
+	       test_tmpdir="$tmpdir/a"
-                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
-                   case $ls_ld_tmpdir in
+	       case $ls_ld_tmpdir in
-                     d????-?r-*) different_mode=700;;
+		 d????-?r-*) different_mode=700;;
-                     d????-?--*) different_mode=755;;
+		 d????-?--*) different_mode=755;;
-                     *) false;;
+		 *) false;;
-                   esac &&
+	       esac &&
-                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
-                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                   }
+	       }
-                 }
+	     }
-              then posix_mkdir=:
+	  then posix_mkdir=:
-              fi
+	  fi
-              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
-            else
+	else
-              # Remove any dirs left behind by ancient mkdir implementations.
+	  # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
-            fi
+	fi
-            trap '' 0;;
+	trap '' 0;;
-        esac;;
     esac
 
     if
@@ -382,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.
 
@@ -411,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
@@ -451,7 +456,18 @@ do
     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.
     #
@@ -477,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 ||
 
@@ -491,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

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.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 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,8 +93,9 @@ 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 \
@@ -223,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@
@@ -244,6 +243,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -255,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@
@@ -307,6 +310,7 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LSBLK = @LSBLK@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -316,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@
@@ -342,6 +346,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TR = @TR@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
@@ -394,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@
@@ -402,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@
@@ -429,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 \
@@ -663,7 +671,6 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -707,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
 
@@ -830,7 +838,7 @@ 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 am--depfiles check check-am clean \
 	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \