oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to fix all format flags in pprint example.

Browse Source
This commit is contained in:
Benoît Dejean
2018-02-17 10:03:02 +01:00
parent f80b08a865
commit b450bbc67c
4 changed files with 109 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/mountlist.c
View File

@@ -99,7 +99,7 @@ main (int argc, char *argv [])
glibtop_get_fsusage (&fsusage, glibtop_get_fsusage (&fsusage,
mount_entries [index].mountdir); 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, mount_entries [index].mountdir,
fsusage.blocks, fsusage.bfree, fsusage.blocks, fsusage.bfree,
fsusage.bavail, fsusage.files, fsusage.bavail, fsusage.files,

24
examples/netload.c
View File

@@ -118,22 +118,22 @@ main (int argc, char *argv [])
"\tAddress:\t\t0x%08x - %s\n" "\tAddress:\t\t0x%08x - %s\n"
"\tSubnet:\t\t\t0x%08x - %s\n\n" "\tSubnet:\t\t\t0x%08x - %s\n\n"
"\tMTU:\t\t\t%d\n" "\tMTU:\t\t\t%d\n"
"\tCollisions:\t\t%llu\n\n" "\tCollisions:\t\t%" G_GUINT64_FORMAT "\n\n"
"\tPackets In:\t\t%llu\n" "\tPackets In:\t\t%" G_GUINT64_FORMAT "\n"
"\tPackets Out:\t\t%llu\n" "\tPackets Out:\t\t%" G_GUINT64_FORMAT "\n"
"\tPackets Total:\t\t%llu\n\n" "\tPackets Total:\t\t%" G_GUINT64_FORMAT "\n\n"
"\tBytes In:\t\t%llu\n" "\tBytes In:\t\t%" G_GUINT64_FORMAT "\n"
"\tBytes Out:\t\t%llu\n" "\tBytes Out:\t\t%" G_GUINT64_FORMAT "\n"
"\tBytes Total:\t\t%llu\n\n" "\tBytes Total:\t\t%" G_GUINT64_FORMAT "\n\n"
"\tErrors In:\t\t%llu\n" "\tErrors In:\t\t%" G_GUINT64_FORMAT "\n"
"\tErrors Out:\t\t%llu\n" "\tErrors Out:\t\t%" G_GUINT64_FORMAT "\n"
"\tErrors Total:\t\t%llu\n\n" "\tErrors Total:\t\t%" G_GUINT64_FORMAT "\n\n"
"\tAddress6:\t\t%s\n" "\tAddress6:\t\t%s\n"
"\tPrefix6:\t\t%s\n" "\tPrefix6:\t\t%s\n"
"\tScope6:\t\t\t%#03x\n\n" "\tScope6:\t\t\t%#03x\n\n"
"\tHarware Address:\t%s\n\n", "\tHarware Address:\t%s\n\n",
netload.flags, (unsigned long long)netload.flags,
netload.if_flags, (unsigned long long)netload.if_flags,
(guint32) netload.address, address_string, (guint32) netload.address, address_string,
(guint32) netload.subnet, subnet_string, (guint32) netload.subnet, subnet_string,
netload.mtu, netload.mtu,

179
examples/pprint.c
View File

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

8
examples/procmap.c
View File

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