New upstream version 2.39.90

2019-02-07 21:52:40 -05:00
parent 42d3767ed4 30c771151d
commit 657cfd5f49
133 changed files with 7365 additions and 4292 deletions
--- a/sysdeps/freebsd/Makefile.in
+++ b/sysdeps/freebsd/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -152,7 +152,24 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/close.Plo ./$(DEPDIR)/cpu.Plo \
+	./$(DEPDIR)/fsusage.Plo ./$(DEPDIR)/glibtop_private.Plo \
+	./$(DEPDIR)/loadavg.Plo ./$(DEPDIR)/mem.Plo \
+	./$(DEPDIR)/mountlist.Plo ./$(DEPDIR)/msg_limits.Plo \
+	./$(DEPDIR)/netlist.Plo ./$(DEPDIR)/netload.Plo \
+	./$(DEPDIR)/nosuid.Plo ./$(DEPDIR)/open.Plo \
+	./$(DEPDIR)/ppp.Plo ./$(DEPDIR)/procaffinity.Plo \
+	./$(DEPDIR)/procargs.Plo ./$(DEPDIR)/procio.Plo \
+	./$(DEPDIR)/prockernel.Plo ./$(DEPDIR)/proclist.Plo \
+	./$(DEPDIR)/procmap.Plo ./$(DEPDIR)/procmem.Plo \
+	./$(DEPDIR)/procopenfiles.Plo ./$(DEPDIR)/procsegment.Plo \
+	./$(DEPDIR)/procsignal.Plo ./$(DEPDIR)/procstate.Plo \
+	./$(DEPDIR)/proctime.Plo ./$(DEPDIR)/procuid.Plo \
+	./$(DEPDIR)/procwd.Plo ./$(DEPDIR)/sem_limits.Plo \
+	./$(DEPDIR)/shm_limits.Plo ./$(DEPDIR)/siglist.Plo \
+	./$(DEPDIR)/suid_open.Plo ./$(DEPDIR)/swap.Plo \
+	./$(DEPDIR)/sysinfo.Plo ./$(DEPDIR)/uptime.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -461,8 +478,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -497,40 +514,46 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsusage.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glibtop_private.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadavg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg_limits.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procaffinity.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procargs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prockernel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proclist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmem.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procopenfiles.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procsegment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procsignal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procstate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proctime.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procuid.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procwd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sem_limits.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shm_limits.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/siglist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suid_open.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsusage.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glibtop_private.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadavg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg_limits.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procaffinity.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procargs.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prockernel.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proclist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmap.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmem.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procopenfiles.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procsegment.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procsignal.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procstate.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proctime.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procuid.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procwd.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sem_limits.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shm_limits.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/siglist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suid_open.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swap.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)

 .c.o:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -632,7 +655,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -705,7 +731,40 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
 	mostlyclean-am

 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/close.Plo
+	-rm -f ./$(DEPDIR)/cpu.Plo
+	-rm -f ./$(DEPDIR)/fsusage.Plo
+	-rm -f ./$(DEPDIR)/glibtop_private.Plo
+	-rm -f ./$(DEPDIR)/loadavg.Plo
+	-rm -f ./$(DEPDIR)/mem.Plo
+	-rm -f ./$(DEPDIR)/mountlist.Plo
+	-rm -f ./$(DEPDIR)/msg_limits.Plo
+	-rm -f ./$(DEPDIR)/netlist.Plo
+	-rm -f ./$(DEPDIR)/netload.Plo
+	-rm -f ./$(DEPDIR)/nosuid.Plo
+	-rm -f ./$(DEPDIR)/open.Plo
+	-rm -f ./$(DEPDIR)/ppp.Plo
+	-rm -f ./$(DEPDIR)/procaffinity.Plo
+	-rm -f ./$(DEPDIR)/procargs.Plo
+	-rm -f ./$(DEPDIR)/procio.Plo
+	-rm -f ./$(DEPDIR)/prockernel.Plo
+	-rm -f ./$(DEPDIR)/proclist.Plo
+	-rm -f ./$(DEPDIR)/procmap.Plo
+	-rm -f ./$(DEPDIR)/procmem.Plo
+	-rm -f ./$(DEPDIR)/procopenfiles.Plo
+	-rm -f ./$(DEPDIR)/procsegment.Plo
+	-rm -f ./$(DEPDIR)/procsignal.Plo
+	-rm -f ./$(DEPDIR)/procstate.Plo
+	-rm -f ./$(DEPDIR)/proctime.Plo
+	-rm -f ./$(DEPDIR)/procuid.Plo
+	-rm -f ./$(DEPDIR)/procwd.Plo
+	-rm -f ./$(DEPDIR)/sem_limits.Plo
+	-rm -f ./$(DEPDIR)/shm_limits.Plo
+	-rm -f ./$(DEPDIR)/siglist.Plo
+	-rm -f ./$(DEPDIR)/suid_open.Plo
+	-rm -f ./$(DEPDIR)/swap.Plo
+	-rm -f ./$(DEPDIR)/sysinfo.Plo
+	-rm -f ./$(DEPDIR)/uptime.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -751,7 +810,40 @@ install-ps-am:
 installcheck-am:

 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/close.Plo
+	-rm -f ./$(DEPDIR)/cpu.Plo
+	-rm -f ./$(DEPDIR)/fsusage.Plo
+	-rm -f ./$(DEPDIR)/glibtop_private.Plo
+	-rm -f ./$(DEPDIR)/loadavg.Plo
+	-rm -f ./$(DEPDIR)/mem.Plo
+	-rm -f ./$(DEPDIR)/mountlist.Plo
+	-rm -f ./$(DEPDIR)/msg_limits.Plo
+	-rm -f ./$(DEPDIR)/netlist.Plo
+	-rm -f ./$(DEPDIR)/netload.Plo
+	-rm -f ./$(DEPDIR)/nosuid.Plo
+	-rm -f ./$(DEPDIR)/open.Plo
+	-rm -f ./$(DEPDIR)/ppp.Plo
+	-rm -f ./$(DEPDIR)/procaffinity.Plo
+	-rm -f ./$(DEPDIR)/procargs.Plo
+	-rm -f ./$(DEPDIR)/procio.Plo
+	-rm -f ./$(DEPDIR)/prockernel.Plo
+	-rm -f ./$(DEPDIR)/proclist.Plo
+	-rm -f ./$(DEPDIR)/procmap.Plo
+	-rm -f ./$(DEPDIR)/procmem.Plo
+	-rm -f ./$(DEPDIR)/procopenfiles.Plo
+	-rm -f ./$(DEPDIR)/procsegment.Plo
+	-rm -f ./$(DEPDIR)/procsignal.Plo
+	-rm -f ./$(DEPDIR)/procstate.Plo
+	-rm -f ./$(DEPDIR)/proctime.Plo
+	-rm -f ./$(DEPDIR)/procuid.Plo
+	-rm -f ./$(DEPDIR)/procwd.Plo
+	-rm -f ./$(DEPDIR)/sem_limits.Plo
+	-rm -f ./$(DEPDIR)/shm_limits.Plo
+	-rm -f ./$(DEPDIR)/siglist.Plo
+	-rm -f ./$(DEPDIR)/suid_open.Plo
+	-rm -f ./$(DEPDIR)/swap.Plo
+	-rm -f ./$(DEPDIR)/sysinfo.Plo
+	-rm -f ./$(DEPDIR)/uptime.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

@@ -772,20 +864,20 @@ uninstall-am: uninstall-libgtopincludeHEADERS

 .MAKE: install-am install-strip

-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libgtopincludeHEADERS install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-libgtopincludeHEADERS
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-libgtopincludeHEADERS \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-libgtopincludeHEADERS

 .PRECIOUS: Makefile

--- a/sysdeps/freebsd/glibtop_server.h
+++ b/sysdeps/freebsd/glibtop_server.h
@@ -48,6 +48,7 @@ G_BEGIN_DECLS
 #define GLIBTOP_SUID_PROC_WD		0
 #define GLIBTOP_SUID_PROC_AFFINITY	0
 #define GLIBTOP_SUID_PROC_IO	(1 << GLIBTOP_SYSDEPS_PROC_IO)
+#define GLIBTOP_SUID_PROC_OPEN_FILES	0

 G_END_DECLS

--- a/sysdeps/freebsd/mem.c
+++ b/sysdeps/freebsd/mem.c
@@ -55,6 +55,16 @@ static gulong mem_get_by_bytes (glibtop *server, const char *name) {
 	return result;
 }

+static gulong try_mem_get_by_bytes (glibtop *server, const char *name) {
+	gulong result = 0;
+	size_t len = sizeof (result);
+
+	if (sysctlbyname (name, &result, &len, NULL, 0)) {
+		return 0;
+	}
+	return result;
+}
+
 static gulong mem_get_by_pages (glibtop *server, const char *name) {
 	guint result = 0;
 	size_t len = sizeof (result);
@@ -71,29 +81,35 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
 	gulong memtotal;
 	gulong memactive;
 	gulong meminactive;
+	gulong memlaundry;
 	gulong memwired;
 	gulong memcached;
 	gulong membuffer;
 	gulong memfree;
+	gulong zfs_arc_size;

 	memset (buf, 0, sizeof *buf);

 	memtotal = mem_get_by_bytes (server, "hw.physmem");
 	memactive = mem_get_by_pages (server, "vm.stats.vm.v_active_count");
 	meminactive = mem_get_by_pages (server, "vm.stats.vm.v_inactive_count");
+	memlaundry = mem_get_by_pages (server, "vm.stats.vm.v_laundry_count");
 	memwired = mem_get_by_pages (server, "vm.stats.vm.v_wire_count");
 	memcached = mem_get_by_pages (server, "vm.stats.vm.v_cache_count");
 	membuffer = mem_get_by_bytes (server, "vfs.bufspace");
 	memfree = mem_get_by_pages (server, "vm.stats.vm.v_free_count");

+	zfs_arc_size = try_mem_get_by_bytes (server, "kstat.zfs.misc.arcstats.size");
+
 	buf->total = memtotal;
 	buf->used = memtotal - memfree;
 	buf->free = memfree;
 	buf->shared = 0;
 	buf->buffer = membuffer;
-	buf->cached = memcached;
+	buf->cached = memcached + zfs_arc_size;
 	buf->locked = 0;

-	buf->user = memactive + memwired;
+	buf->user = memactive + memlaundry + memwired - zfs_arc_size;
+
 	buf->flags = _glibtop_sysdeps_mem;
 }