travis: add x86 musl

[strace] / printrusage.c

diff --git a/printrusage.c b/printrusage.c
index acf67eb191eed6bacafbd5df6893fbff15d1ac42..548af828b5a2738d506cce5ea06fcf0517cc3d7d 100644 (file)
--- a/printrusage.c
+++ b/printrusage.c
@@ -45,27 +45,27 @@ MPERS_PRINTER_DECL(void, printrusage, struct tcb *tcp, long addr)
                return;
 
        tprintf("{ru_utime={%llu, %llu}, ru_stime={%llu, %llu}, ",
-               widen_to_ull(ru.ru_utime.tv_sec),
-               widen_to_ull(ru.ru_utime.tv_usec),
-               widen_to_ull(ru.ru_stime.tv_sec),
-               widen_to_ull(ru.ru_stime.tv_usec));
+               zero_extend_signed_to_ull(ru.ru_utime.tv_sec),
+               zero_extend_signed_to_ull(ru.ru_utime.tv_usec),
+               zero_extend_signed_to_ull(ru.ru_stime.tv_sec),
+               zero_extend_signed_to_ull(ru.ru_stime.tv_usec));
        if (abbrev(tcp))
                tprints("...}");
        else {
-               tprintf("ru_maxrss=%llu, ", widen_to_ull(ru.ru_maxrss));
-               tprintf("ru_ixrss=%llu, ", widen_to_ull(ru.ru_ixrss));
-               tprintf("ru_idrss=%llu, ", widen_to_ull(ru.ru_idrss));
-               tprintf("ru_isrss=%llu, ", widen_to_ull(ru.ru_isrss));
-               tprintf("ru_minflt=%llu, ", widen_to_ull(ru.ru_minflt));
-               tprintf("ru_majflt=%llu, ", widen_to_ull(ru.ru_majflt));
-               tprintf("ru_nswap=%llu, ", widen_to_ull(ru.ru_nswap));
-               tprintf("ru_inblock=%llu, ", widen_to_ull(ru.ru_inblock));
-               tprintf("ru_oublock=%llu, ", widen_to_ull(ru.ru_oublock));
-               tprintf("ru_msgsnd=%llu, ", widen_to_ull(ru.ru_msgsnd));
-               tprintf("ru_msgrcv=%llu, ", widen_to_ull(ru.ru_msgrcv));
-               tprintf("ru_nsignals=%llu, ", widen_to_ull(ru.ru_nsignals));
-               tprintf("ru_nvcsw=%llu, ", widen_to_ull(ru.ru_nvcsw));
-               tprintf("ru_nivcsw=%llu}", widen_to_ull(ru.ru_nivcsw));
+               tprintf("ru_maxrss=%llu, ", zero_extend_signed_to_ull(ru.ru_maxrss));
+               tprintf("ru_ixrss=%llu, ", zero_extend_signed_to_ull(ru.ru_ixrss));
+               tprintf("ru_idrss=%llu, ", zero_extend_signed_to_ull(ru.ru_idrss));
+               tprintf("ru_isrss=%llu, ", zero_extend_signed_to_ull(ru.ru_isrss));
+               tprintf("ru_minflt=%llu, ", zero_extend_signed_to_ull(ru.ru_minflt));
+               tprintf("ru_majflt=%llu, ", zero_extend_signed_to_ull(ru.ru_majflt));
+               tprintf("ru_nswap=%llu, ", zero_extend_signed_to_ull(ru.ru_nswap));
+               tprintf("ru_inblock=%llu, ", zero_extend_signed_to_ull(ru.ru_inblock));
+               tprintf("ru_oublock=%llu, ", zero_extend_signed_to_ull(ru.ru_oublock));
+               tprintf("ru_msgsnd=%llu, ", zero_extend_signed_to_ull(ru.ru_msgsnd));
+               tprintf("ru_msgrcv=%llu, ", zero_extend_signed_to_ull(ru.ru_msgrcv));
+               tprintf("ru_nsignals=%llu, ", zero_extend_signed_to_ull(ru.ru_nsignals));
+               tprintf("ru_nvcsw=%llu, ", zero_extend_signed_to_ull(ru.ru_nvcsw));
+               tprintf("ru_nivcsw=%llu}", zero_extend_signed_to_ull(ru.ru_nivcsw));
        }
 }