New upstream version 2.39.90
This commit is contained in:
Jeremy Bicha
@@ -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,
|
||||
@@ -187,7 +187,16 @@ am__v_at_0 = @
|
||||
am__v_at_1 =
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
am__maybe_remake_depfiles = depfiles
|
||||
am__depfiles_remade = ./$(DEPDIR)/affinity.Po ./$(DEPDIR)/df.Po \
|
||||
./$(DEPDIR)/diskio.Po ./$(DEPDIR)/first.Po ./$(DEPDIR)/free.Po \
|
||||
./$(DEPDIR)/mountlist.Po ./$(DEPDIR)/netlist.Po \
|
||||
./$(DEPDIR)/netload.Po ./$(DEPDIR)/openfiles.Po \
|
||||
./$(DEPDIR)/pprint.Po ./$(DEPDIR)/procargs.Po \
|
||||
./$(DEPDIR)/proclist.Po ./$(DEPDIR)/procmap.Po \
|
||||
./$(DEPDIR)/second.Po ./$(DEPDIR)/smp.Po \
|
||||
./$(DEPDIR)/sysdeps.Po ./$(DEPDIR)/timings.Po \
|
||||
./$(DEPDIR)/wd.Po
|
||||
am__mv = mv -f
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
@@ -496,8 +505,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)
|
||||
@@ -596,24 +605,30 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affinity.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/df.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskio.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/first.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/free.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openfiles.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pprint.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procargs.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proclist.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmap.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/second.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smp.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysdeps.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timings.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affinity.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/df.Po@am__quote@ # 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
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openfiles.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pprint.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procargs.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proclist.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procmap.Po@am__quote@ # am--include-marker
|
||||
@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)/timings.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wd.Po@am__quote@ # am--include-marker
|
||||
|
||||
$(am__depfiles_remade):
|
||||
@$(MKDIR_P) $(@D)
|
||||
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
|
||||
|
||||
am--depfiles: $(am__depfiles_remade)
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
@@ -694,7 +709,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)'; \
|
||||
@@ -764,7 +782,24 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
|
||||
mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f ./$(DEPDIR)/affinity.Po
|
||||
-rm -f ./$(DEPDIR)/df.Po
|
||||
-rm -f ./$(DEPDIR)/diskio.Po
|
||||
-rm -f ./$(DEPDIR)/first.Po
|
||||
-rm -f ./$(DEPDIR)/free.Po
|
||||
-rm -f ./$(DEPDIR)/mountlist.Po
|
||||
-rm -f ./$(DEPDIR)/netlist.Po
|
||||
-rm -f ./$(DEPDIR)/netload.Po
|
||||
-rm -f ./$(DEPDIR)/openfiles.Po
|
||||
-rm -f ./$(DEPDIR)/pprint.Po
|
||||
-rm -f ./$(DEPDIR)/procargs.Po
|
||||
-rm -f ./$(DEPDIR)/proclist.Po
|
||||
-rm -f ./$(DEPDIR)/procmap.Po
|
||||
-rm -f ./$(DEPDIR)/second.Po
|
||||
-rm -f ./$(DEPDIR)/smp.Po
|
||||
-rm -f ./$(DEPDIR)/sysdeps.Po
|
||||
-rm -f ./$(DEPDIR)/timings.Po
|
||||
-rm -f ./$(DEPDIR)/wd.Po
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
distclean-tags
|
||||
@@ -810,7 +845,24 @@ install-ps-am:
|
||||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f ./$(DEPDIR)/affinity.Po
|
||||
-rm -f ./$(DEPDIR)/df.Po
|
||||
-rm -f ./$(DEPDIR)/diskio.Po
|
||||
-rm -f ./$(DEPDIR)/first.Po
|
||||
-rm -f ./$(DEPDIR)/free.Po
|
||||
-rm -f ./$(DEPDIR)/mountlist.Po
|
||||
-rm -f ./$(DEPDIR)/netlist.Po
|
||||
-rm -f ./$(DEPDIR)/netload.Po
|
||||
-rm -f ./$(DEPDIR)/openfiles.Po
|
||||
-rm -f ./$(DEPDIR)/pprint.Po
|
||||
-rm -f ./$(DEPDIR)/procargs.Po
|
||||
-rm -f ./$(DEPDIR)/proclist.Po
|
||||
-rm -f ./$(DEPDIR)/procmap.Po
|
||||
-rm -f ./$(DEPDIR)/second.Po
|
||||
-rm -f ./$(DEPDIR)/smp.Po
|
||||
-rm -f ./$(DEPDIR)/sysdeps.Po
|
||||
-rm -f ./$(DEPDIR)/timings.Po
|
||||
-rm -f ./$(DEPDIR)/wd.Po
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
@@ -831,9 +883,9 @@ uninstall-am:
|
||||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
|
||||
clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
|
||||
ctags-am distclean distclean-compile distclean-generic \
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
|
||||
clean-generic clean-libtool clean-noinstPROGRAMS 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 \
|
||||
|
||||
@@ -99,7 +99,7 @@ main (int argc, char *argv [])
|
||||
glibtop_get_fsusage (&fsusage,
|
||||
mount_entries [index].mountdir);
|
||||
|
||||
printf ("%-16s %9Lu %9Lu %9Lu %9Lu %9Lu %9d\n",
|
||||
printf ("%-16s %9" G_GUINT64_FORMAT " %9" G_GUINT64_FORMAT " %9" G_GUINT64_FORMAT " %9" G_GUINT64_FORMAT " %9" G_GUINT64_FORMAT " %9d\n",
|
||||
mount_entries [index].mountdir,
|
||||
fsusage.blocks, fsusage.bfree,
|
||||
fsusage.bavail, fsusage.files,
|
||||
|
||||
@@ -118,22 +118,22 @@ main (int argc, char *argv [])
|
||||
"\tAddress:\t\t0x%08x - %s\n"
|
||||
"\tSubnet:\t\t\t0x%08x - %s\n\n"
|
||||
"\tMTU:\t\t\t%d\n"
|
||||
"\tCollisions:\t\t%llu\n\n"
|
||||
"\tPackets In:\t\t%llu\n"
|
||||
"\tPackets Out:\t\t%llu\n"
|
||||
"\tPackets Total:\t\t%llu\n\n"
|
||||
"\tBytes In:\t\t%llu\n"
|
||||
"\tBytes Out:\t\t%llu\n"
|
||||
"\tBytes Total:\t\t%llu\n\n"
|
||||
"\tErrors In:\t\t%llu\n"
|
||||
"\tErrors Out:\t\t%llu\n"
|
||||
"\tErrors Total:\t\t%llu\n\n"
|
||||
"\tCollisions:\t\t%" G_GUINT64_FORMAT "\n\n"
|
||||
"\tPackets In:\t\t%" G_GUINT64_FORMAT "\n"
|
||||
"\tPackets Out:\t\t%" G_GUINT64_FORMAT "\n"
|
||||
"\tPackets Total:\t\t%" G_GUINT64_FORMAT "\n\n"
|
||||
"\tBytes In:\t\t%" G_GUINT64_FORMAT "\n"
|
||||
"\tBytes Out:\t\t%" G_GUINT64_FORMAT "\n"
|
||||
"\tBytes Total:\t\t%" G_GUINT64_FORMAT "\n\n"
|
||||
"\tErrors In:\t\t%" G_GUINT64_FORMAT "\n"
|
||||
"\tErrors Out:\t\t%" G_GUINT64_FORMAT "\n"
|
||||
"\tErrors Total:\t\t%" G_GUINT64_FORMAT "\n\n"
|
||||
"\tAddress6:\t\t%s\n"
|
||||
"\tPrefix6:\t\t%s\n"
|
||||
"\tScope6:\t\t\t%#03x\n\n"
|
||||
"\tHarware Address:\t%s\n\n",
|
||||
netload.flags,
|
||||
netload.if_flags,
|
||||
(unsigned long long)netload.flags,
|
||||
(unsigned long long)netload.if_flags,
|
||||
(guint32) netload.address, address_string,
|
||||
(guint32) netload.subnet, subnet_string,
|
||||
netload.mtu,
|
||||
|
||||
@@ -18,9 +18,14 @@
|
||||
#define HEADER_PPRINT(FUNC) printf("### " #FUNC " ###\nsizeof *buf = %lu B\n", \
|
||||
(unsigned long) sizeof buf)
|
||||
|
||||
#define PPRINT(DATA, FORMAT) printf("\t%4lu B %3lu " #DATA " = " FORMAT "\n", \
|
||||
#define PPRINT(DATA, FORMAT) printf("\t%4lu B %3lu " #DATA " = %" FORMAT "\n", \
|
||||
(unsigned long) sizeof buf.DATA, (unsigned long) buf_offsetof(DATA), buf.DATA)
|
||||
|
||||
#define PPRINT_GUINT64(DATA) PPRINT(DATA, G_GUINT64_FORMAT)
|
||||
|
||||
#define PPRINT_FLAGS(DATA) printf("\t%4lu B %3lu " "flags" " = " "%#llx" "\n", \
|
||||
(unsigned long) sizeof buf.DATA, (unsigned long) buf_offsetof(DATA), (unsigned long long)buf.DATA)
|
||||
|
||||
#define PPRINT_ARRAY(ARRAY, SIZE, FORMAT) do { \
|
||||
size_t i; \
|
||||
printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ", \
|
||||
@@ -32,7 +37,7 @@
|
||||
do { i++; } while (i < SIZE && !buf.ARRAY[i]); \
|
||||
printf("..., "); \
|
||||
} else { \
|
||||
printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \
|
||||
printf(".%zd = %" FORMAT ", ", i, buf.ARRAY[i]); \
|
||||
} \
|
||||
} \
|
||||
printf("}\n"); \
|
||||
@@ -70,8 +75,8 @@ static void pprint_get_sysinfo(void)
|
||||
buf = glibtop_get_sysinfo();
|
||||
|
||||
HEADER_PPRINT(glibtop_get_sysinfo);
|
||||
//PPRINT(flags, "%#llx");
|
||||
// PPRINT(ncpu, "%llu");
|
||||
//PPRINT_FLAGS(flags);
|
||||
// PPRINT_GUINT64(ncpu);
|
||||
PPRINT_ENTRY_ARRAY(cpuinfo, buf->ncpu);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
@@ -83,25 +88,25 @@ static void pprint_get_cpu(void)
|
||||
glibtop_get_cpu(&buf);
|
||||
|
||||
HEADER_PPRINT(glibtop_get_cpu);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT(total, "%llu");
|
||||
PPRINT(user, "%llu");
|
||||
PPRINT(nice, "%llu");
|
||||
PPRINT(sys, "%llu");
|
||||
PPRINT(idle, "%llu");
|
||||
PPRINT(iowait, "%llu");
|
||||
PPRINT(irq, "%llu");
|
||||
PPRINT(softirq, "%llu");
|
||||
PPRINT(frequency, "%llu");
|
||||
PPRINT_ARRAY(xcpu_total, GLIBTOP_NCPU, "%llu");
|
||||
PPRINT_ARRAY(xcpu_user, GLIBTOP_NCPU, "%llu");
|
||||
PPRINT_ARRAY(xcpu_nice, GLIBTOP_NCPU, "%llu");
|
||||
PPRINT_ARRAY(xcpu_sys, GLIBTOP_NCPU, "%llu");
|
||||
PPRINT_ARRAY(xcpu_idle, GLIBTOP_NCPU, "%llu");
|
||||
PPRINT_ARRAY(xcpu_iowait, GLIBTOP_NCPU, "%llu");
|
||||
PPRINT_ARRAY(xcpu_irq, GLIBTOP_NCPU, "%llu");
|
||||
PPRINT_ARRAY(xcpu_softirq, GLIBTOP_NCPU, "%llu");
|
||||
PPRINT(xcpu_flags, "%llx");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT_GUINT64(total);
|
||||
PPRINT_GUINT64(user);
|
||||
PPRINT_GUINT64(nice);
|
||||
PPRINT_GUINT64(sys);
|
||||
PPRINT_GUINT64(idle);
|
||||
PPRINT_GUINT64(iowait);
|
||||
PPRINT_GUINT64(irq);
|
||||
PPRINT_GUINT64(softirq);
|
||||
PPRINT_GUINT64(frequency);
|
||||
PPRINT_ARRAY(xcpu_total, GLIBTOP_NCPU, G_GUINT64_FORMAT);
|
||||
PPRINT_ARRAY(xcpu_user, GLIBTOP_NCPU, G_GUINT64_FORMAT);
|
||||
PPRINT_ARRAY(xcpu_nice, GLIBTOP_NCPU, G_GUINT64_FORMAT);
|
||||
PPRINT_ARRAY(xcpu_sys, GLIBTOP_NCPU, G_GUINT64_FORMAT);
|
||||
PPRINT_ARRAY(xcpu_idle, GLIBTOP_NCPU, G_GUINT64_FORMAT);
|
||||
PPRINT_ARRAY(xcpu_iowait, GLIBTOP_NCPU, G_GUINT64_FORMAT);
|
||||
PPRINT_ARRAY(xcpu_irq, GLIBTOP_NCPU, G_GUINT64_FORMAT);
|
||||
PPRINT_ARRAY(xcpu_softirq, GLIBTOP_NCPU, G_GUINT64_FORMAT);
|
||||
PPRINT_FLAGS(xcpu_flags);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
|
||||
@@ -115,15 +120,15 @@ static void pprint_get_fsusage(const char *mountpoint)
|
||||
|
||||
HEADER_PPRINT(glibtop_get_fsusage);
|
||||
printf("pprint_get_fsusage (mountpoint = \"%s\"\n", mountpoint);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT(blocks, "%llu");
|
||||
PPRINT(bfree, "%llu");
|
||||
PPRINT(bavail, "%llu");
|
||||
PPRINT(files, "%llu");
|
||||
PPRINT(ffree, "%llu");
|
||||
PPRINT(block_size, "%u");
|
||||
PPRINT(read, "%llu");
|
||||
PPRINT(write, "%llu");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT_GUINT64(blocks);
|
||||
PPRINT_GUINT64(bfree);
|
||||
PPRINT_GUINT64(bavail);
|
||||
PPRINT_GUINT64(files);
|
||||
PPRINT_GUINT64(ffree);
|
||||
PPRINT(block_size, "u");
|
||||
PPRINT_GUINT64(read);
|
||||
PPRINT_GUINT64(write);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
|
||||
@@ -136,11 +141,11 @@ static void pprint_get_loadavg(void)
|
||||
glibtop_get_loadavg(&buf);
|
||||
|
||||
HEADER_PPRINT(glibtop_get_loadavg);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT_ARRAY(loadavg, 3, "%f");
|
||||
PPRINT(nr_running, "%llu");
|
||||
PPRINT(nr_tasks, "%llu");
|
||||
PPRINT(last_pid, "%llu");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT_ARRAY(loadavg, 3, "f");
|
||||
PPRINT_GUINT64(nr_running);
|
||||
PPRINT_GUINT64(nr_tasks);
|
||||
PPRINT_GUINT64(last_pid);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
|
||||
@@ -153,15 +158,15 @@ static void pprint_get_mem(void)
|
||||
glibtop_get_mem(&buf);
|
||||
|
||||
HEADER_PPRINT(glibtop_get_mem);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT(total, "%llu");
|
||||
PPRINT(used, "%llu");
|
||||
PPRINT(free, "%llu");
|
||||
PPRINT(shared, "%llu");
|
||||
PPRINT(buffer, "%llu");
|
||||
PPRINT(cached, "%llu");
|
||||
PPRINT(user, "%llu");
|
||||
PPRINT(locked, "%llu");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT_GUINT64(total);
|
||||
PPRINT_GUINT64(used);
|
||||
PPRINT_GUINT64(free);
|
||||
PPRINT_GUINT64(shared);
|
||||
PPRINT_GUINT64(buffer);
|
||||
PPRINT_GUINT64(cached);
|
||||
PPRINT_GUINT64(user);
|
||||
PPRINT_GUINT64(locked);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
|
||||
@@ -177,12 +182,12 @@ static void pprint_get_mountlist(gboolean allfs)
|
||||
|
||||
HEADER_PPRINT(glibtop_get_mountlist);
|
||||
printf("glibtop_get_mountlist (allfs = %d)\n", allfs);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT(number, "%llu");
|
||||
PPRINT(total, "%llu");
|
||||
PPRINT(size, "%llu");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT_GUINT64(number);
|
||||
PPRINT_GUINT64(total);
|
||||
PPRINT_GUINT64(size);
|
||||
|
||||
printf("\t%4llu B entries[%llu] = \n\t\t{\n", buf.total, buf.number);
|
||||
printf("\t%4" G_GUINT64_FORMAT " B entries[%" G_GUINT64_FORMAT "] = \n\t\t{\n", buf.total, buf.number);
|
||||
|
||||
for(i = 0; i < buf.number; ++i)
|
||||
{
|
||||
@@ -190,7 +195,7 @@ static void pprint_get_mountlist(gboolean allfs)
|
||||
" .devname = \"%s\","
|
||||
" .mountir = \"%s\","
|
||||
" .type = \"%s\" }\n",
|
||||
(unsigned long) i, entries[i].dev,
|
||||
(unsigned long) i, (unsigned long long)entries[i].dev,
|
||||
entries[i].devname,
|
||||
entries[i].mountdir,
|
||||
entries[i].type);
|
||||
@@ -211,14 +216,14 @@ static void pprint_get_msg_limits(void)
|
||||
glibtop_get_msg_limits(&buf);
|
||||
|
||||
HEADER_PPRINT(glibtop_get_msg_limits);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT(msgpool, "%llu");
|
||||
PPRINT(msgmap, "%llu");
|
||||
PPRINT(msgmax, "%llu");
|
||||
PPRINT(msgmnb, "%llu");
|
||||
PPRINT(msgmni, "%llu");
|
||||
PPRINT(msgssz, "%llu");
|
||||
PPRINT(msgtql, "%llu");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT_GUINT64(msgpool);
|
||||
PPRINT_GUINT64(msgmap);
|
||||
PPRINT_GUINT64(msgmax);
|
||||
PPRINT_GUINT64(msgmnb);
|
||||
PPRINT_GUINT64(msgmni);
|
||||
PPRINT_GUINT64(msgssz);
|
||||
PPRINT_GUINT64(msgtql);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
|
||||
@@ -232,7 +237,7 @@ static void pprint_get_netload(const char *iface)
|
||||
|
||||
HEADER_PPRINT(glibtop_get_netload);
|
||||
printf("glibtop_get_netload (iface = \"%s\")\n", iface);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT_FLAGS(flags);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
|
||||
@@ -266,12 +271,12 @@ static void pprint_get_swap(void)
|
||||
glibtop_get_swap(&buf);
|
||||
|
||||
HEADER_PPRINT(glibtop_get_swap);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT(total, "%llu");
|
||||
PPRINT(used, "%llu");
|
||||
PPRINT(free, "%llu");
|
||||
PPRINT(pagein, "%llu");
|
||||
PPRINT(pageout, "%llu");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT_GUINT64(total);
|
||||
PPRINT_GUINT64(used);
|
||||
PPRINT_GUINT64(free);
|
||||
PPRINT_GUINT64(pagein);
|
||||
PPRINT_GUINT64(pageout);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
|
||||
@@ -284,10 +289,10 @@ static void pprint_get_uptime(void)
|
||||
glibtop_get_uptime(&buf);
|
||||
|
||||
HEADER_PPRINT(glibtop_get_uptime);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT(uptime, "%f");
|
||||
PPRINT(idletime, "%f");
|
||||
PPRINT(boot_time, "%llu");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT(uptime, "f");
|
||||
PPRINT(idletime, "f");
|
||||
PPRINT_GUINT64(boot_time);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
|
||||
@@ -301,12 +306,12 @@ static void pprint_get_proc_kernel(pid_t pid)
|
||||
glibtop_get_proc_kernel(&buf, pid);
|
||||
|
||||
HEADER_PPRINT(glibtop_get_proc_kernel);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT(k_flags, "%llu");
|
||||
PPRINT(min_flt, "%llu");
|
||||
PPRINT(maj_flt, "%llu");
|
||||
PPRINT(cmin_flt, "%llu");
|
||||
PPRINT(cmaj_flt, "%llu");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT_GUINT64(k_flags);
|
||||
PPRINT_GUINT64(min_flt);
|
||||
PPRINT_GUINT64(maj_flt);
|
||||
PPRINT_GUINT64(cmin_flt);
|
||||
PPRINT_GUINT64(cmaj_flt);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
|
||||
@@ -318,13 +323,13 @@ static void pprint_get_proc_mem(pid_t pid)
|
||||
glibtop_get_proc_mem(&buf, pid);
|
||||
|
||||
HEADER_PPRINT(glibtop_get_proc_mem);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT(size, "%llu");
|
||||
PPRINT(vsize, "%llu");
|
||||
PPRINT(resident, "%llu");
|
||||
PPRINT(share, "%llu");
|
||||
PPRINT(rss, "%llu");
|
||||
PPRINT(rss_rlim, "%llu");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT_GUINT64(size);
|
||||
PPRINT_GUINT64(vsize);
|
||||
PPRINT_GUINT64(resident);
|
||||
PPRINT_GUINT64(share);
|
||||
PPRINT_GUINT64(rss);
|
||||
PPRINT_GUINT64(rss_rlim);
|
||||
FOOTER_PPRINT();
|
||||
}
|
||||
|
||||
@@ -338,9 +343,9 @@ static void pprint_get_proc_affinity(pid_t pid)
|
||||
cpus = glibtop_get_proc_affinity(&buf, pid);
|
||||
|
||||
HEADER_PPRINT(glibtop_get_proc_affinity);
|
||||
PPRINT(flags, "%#llx");
|
||||
PPRINT(number, "%u");
|
||||
PPRINT(all, "%d");
|
||||
PPRINT_FLAGS(flags);
|
||||
PPRINT(number, "u");
|
||||
PPRINT(all, "d");
|
||||
|
||||
printf("\taffinity=");
|
||||
for (i = 0; i < buf.number; i++) {
|
||||
|
||||
@@ -162,10 +162,10 @@ main (int argc, char *argv [])
|
||||
|
||||
fputc('\n', stderr);
|
||||
|
||||
g_print("smaps flags:%#llx size:%lluKiB rss:%lluKiB "
|
||||
"shared_clean:%lluKib shared_dirty:%lluKiB "
|
||||
"private_clean:%lluKiB private_dirty: %lluKiB\n",
|
||||
maps[i].flags,
|
||||
g_print("smaps flags:%#llx size:%" G_GUINT64_FORMAT "KiB rss:%" G_GUINT64_FORMAT "KiB "
|
||||
"shared_clean:%" G_GUINT64_FORMAT "Kib shared_dirty:%" G_GUINT64_FORMAT "KiB "
|
||||
"private_clean:%" G_GUINT64_FORMAT "KiB private_dirty: %" G_GUINT64_FORMAT "KiB\n",
|
||||
(unsigned long long)maps[i].flags,
|
||||
maps[i].size >> 10,
|
||||
maps[i].rss >> 10,
|
||||
maps[i].shared_clean >> 10,
|
||||
|
||||
Reference in New Issue
Block a user