diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-26 15:13:06 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-26 15:16:01 +0200 |
| commit | 71ac5de5a4473d20fb11cb454f62d8e5c90f020c (patch) | |
| tree | d90ebcf85b8f7f674aeb0a2d2df81a430673de66 /lib/intel_os.c | |
| parent | baa6f8b34f54b68c15fc86d86de77d954e458aac (diff) | |
lib/intel_* Use igt checks and macros
Various stuff all over. Most done with the igt.cocci spatch, but
with a few fixups by hand. And add igt_core.h includes where needed.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib/intel_os.c')
| -rw-r--r-- | lib/intel_os.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/intel_os.c b/lib/intel_os.c index 4194744a..538327a8 100644 --- a/lib/intel_os.c +++ b/lib/intel_os.c @@ -67,7 +67,7 @@ intel_get_total_ram_mb(void) int ret; ret = sysinfo(&sysinf); - assert(ret == 0); + igt_assert(ret == 0); retval = sysinf.totalram; retval *= sysinf.mem_unit; @@ -108,7 +108,7 @@ intel_get_avail_ram_mb(void) } ret = sysinfo(&sysinf); - assert(ret == 0); + igt_assert(ret == 0); retval = sysinf.freeram; retval *= sysinf.mem_unit; @@ -142,7 +142,7 @@ intel_get_total_swap_mb(void) int ret; ret = sysinfo(&sysinf); - assert(ret == 0); + igt_assert(ret == 0); retval = sysinf.freeswap; retval *= sysinf.mem_unit; @@ -154,7 +154,7 @@ intel_get_total_swap_mb(void) int n, i; if ((n = swapctl(SC_GETNSWP, NULL)) == -1) { - perror("swapctl: GETNSWP"); + igt_warn("swapctl: GETNSWP"); return 0; } if (n == 0) { @@ -165,7 +165,7 @@ intel_get_total_swap_mb(void) swt = malloc(sizeof(struct swaptable) + (n * sizeof(swapent_t))); buf = malloc(n * MAXPATHLEN); if (!swt || !buf) { - perror("malloc"); + igt_warn("malloc"); } else { swt->swt_n = n; for (i = 0 ; i < n; i++) { @@ -173,7 +173,7 @@ intel_get_total_swap_mb(void) } if ((n = swapctl(SC_LIST, swt)) == -1) { - perror("swapctl: LIST"); + igt_warn("swapctl: LIST"); } else { for (i = 0; i < swt->swt_n; i++) { totalpages += swt->swt_ent[i].ste_pages; @@ -273,8 +273,8 @@ void *mmio; int main(int argc, char **argv) { - printf("Total RAM: %" PRIu64 " Mb\n", intel_get_total_ram_mb()); - printf("Total Swap: %" PRIu64 " Mb\n", intel_get_total_swap_mb()); + igt_info("Total RAM: %"PRIu64" Mb\n", intel_get_total_ram_mb()); + igt_info("Total Swap: %"PRIu64" Mb\n", intel_get_total_swap_mb()); return 0; } |