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

Better output format for arrays.

Browse Source
This commit is contained in:
Benoît Dejean
2017-01-28 11:39:39 +01:00
parent 4285abe72b
commit 35bf89632a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
examples/pprint.c
View File

@@ -28,10 +28,11 @@
(unsigned long) buf_offsetof(ARRAY), \ (unsigned long) buf_offsetof(ARRAY), \
(unsigned long) G_N_ELEMENTS(buf.ARRAY)); \ (unsigned long) G_N_ELEMENTS(buf.ARRAY)); \
for (i = 0; i < (SIZE); ++i) { \ for (i = 0; i < (SIZE); ++i) { \
printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \
if (!buf.ARRAY[i] && i < (SIZE - 1) && !buf.ARRAY[i + 1]) { \ if (!buf.ARRAY[i] && i < (SIZE - 1) && !buf.ARRAY[i + 1]) { \
do { i++; } while (i < SIZE && !buf.ARRAY[i]); \ do { i++; } while (i < SIZE && !buf.ARRAY[i]); \
printf("..., "); \ printf("..., "); \
} else { \
printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \
} \ } \
} \ } \
printf("}\n"); \ printf("}\n"); \
@@ -39,12 +40,12 @@
#define PPRINT_ENTRY_ARRAY(ARRAY, SIZE) do { \ #define PPRINT_ENTRY_ARRAY(ARRAY, SIZE) do { \
size_t i; \ size_t i; \
printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ", \ printf("\t%4lu B " #ARRAY "[%lu/%lu] = { \n", \
(unsigned long) sizeof buf->ARRAY, 0,\ (unsigned long) sizeof buf->ARRAY, (unsigned long)(SIZE), \
(unsigned long) G_N_ELEMENTS(buf->ARRAY)); \ (unsigned long) G_N_ELEMENTS(buf->ARRAY)); \
for(i = 0; i < SIZE; ++i) { \ for(i = 0; i < SIZE; ++i) { \
if (buf->ARRAY[i].values) { \ if (buf->ARRAY[i].values) { \
printf ("[ "); \ printf ("\t[ "); \
PPRINT_HASHTABLE(buf->ARRAY[i].values); \ PPRINT_HASHTABLE(buf->ARRAY[i].values); \
printf ("]\n"); \ printf ("]\n"); \
} \ } \
@@ -70,8 +71,8 @@ static void pprint_get_sysinfo(void)
HEADER_PPRINT(glibtop_get_sysinfo); HEADER_PPRINT(glibtop_get_sysinfo);
//PPRINT(flags, "%#llx"); //PPRINT(flags, "%#llx");
//PPRINT(ncpu, "%llu"); // PPRINT(ncpu, "%llu");
PPRINT_ENTRY_ARRAY(cpuinfo, 4); PPRINT_ENTRY_ARRAY(cpuinfo, buf->ncpu);
FOOTER_PPRINT(); FOOTER_PPRINT();
} }