diff options
| author | Benoît Dejean <bdejean@gmail.com> | 2017-01-28 11:39:39 +0100 |
|---|---|---|
| committer | Benoît Dejean <bdejean@gmail.com> | 2017-02-16 19:52:57 +0100 |
| commit | 35bf89632ae94370e77c220925a10ebc53ee8c75 (patch) | |
| tree | d270a7575a78ce2c1c71987ad9dec406f982b6ac | |
| parent | 4285abe72bfb0bbae370151444bf2d5a8d5247c6 (diff) | |
| download | libgtop-35bf89632ae94370e77c220925a10ebc53ee8c75.tar.gz | |
Better output format for arrays.
| -rw-r--r-- | examples/pprint.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/examples/pprint.c b/examples/pprint.c index 7c1e9ebf..683afde8 100644 --- a/examples/pprint.c +++ b/examples/pprint.c @@ -28,10 +28,11 @@ (unsigned long) buf_offsetof(ARRAY), \ (unsigned long) G_N_ELEMENTS(buf.ARRAY)); \ for (i = 0; i < (SIZE); ++i) { \ - printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \ if (!buf.ARRAY[i] && i < (SIZE - 1) && !buf.ARRAY[i + 1]) { \ do { i++; } while (i < SIZE && !buf.ARRAY[i]); \ printf("..., "); \ + } else { \ + printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \ } \ } \ printf("}\n"); \ @@ -39,12 +40,12 @@ #define PPRINT_ENTRY_ARRAY(ARRAY, SIZE) do { \ size_t i; \ -printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ", \ -(unsigned long) sizeof buf->ARRAY, 0,\ +printf("\t%4lu B " #ARRAY "[%lu/%lu] = { \n", \ +(unsigned long) sizeof buf->ARRAY, (unsigned long)(SIZE), \ (unsigned long) G_N_ELEMENTS(buf->ARRAY)); \ for(i = 0; i < SIZE; ++i) { \ if (buf->ARRAY[i].values) { \ - printf ("[ "); \ + printf ("\t[ "); \ PPRINT_HASHTABLE(buf->ARRAY[i].values); \ printf ("]\n"); \ } \ @@ -70,8 +71,8 @@ static void pprint_get_sysinfo(void) HEADER_PPRINT(glibtop_get_sysinfo); //PPRINT(flags, "%#llx"); - //PPRINT(ncpu, "%llu"); - PPRINT_ENTRY_ARRAY(cpuinfo, 4); + // PPRINT(ncpu, "%llu"); + PPRINT_ENTRY_ARRAY(cpuinfo, buf->ncpu); FOOTER_PPRINT(); } |