mem: decode hugetlb page size in mmap flags

[strace] / sysinfo.c

diff --git a/sysinfo.c b/sysinfo.c
index e37c4a2c657a8951406157ddc4d78d2f6fa45b0b..5519bf3a503ae9e50f97e1558b2b16cb833a9a17 100644 (file)
--- a/sysinfo.c
+++ b/sysinfo.c
@@ -1,28 +1,81 @@
+/*
+ * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993-1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 2012 H.J. Lu <hongjiu.lu@intel.com>
+ * Copyright (c) 2012 Denys Vlasenko <vda.linux@googlemail.com>
+ * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com>
+ * Copyright (c) 2014-2017 The strace developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "defs.h"
+#include DEF_MPERS_TYPE(sysinfo_t)
 #include <sys/sysinfo.h>
+typedef struct sysinfo sysinfo_t;
+#include MPERS_DEFS
 
-int
-sys_sysinfo(struct tcb *tcp)
+SYS_FUNC(sysinfo)
 {
-       struct sysinfo si;
+       sysinfo_t si;
+
+       if (entering(tcp))
+               return 0;
 
-       if (exiting(tcp)) {
-               if (syserror(tcp) || !verbose(tcp))
-                       tprintf("%#lx", tcp->u_arg[0]);
-               else if (umove(tcp, tcp->u_arg[0], &si) < 0)
-                       tprints("{...}");
-               else {
-                       tprintf("{uptime=%lu, loads=[%lu, %lu, %lu] ",
-                               (long) si.uptime, (long) si.loads[0],
-                               (long) si.loads[1], (long) si.loads[2]);
-                       tprintf("totalram=%lu, freeram=%lu, ",
-                               (long) si.totalram, (long) si.freeram);
-                       tprintf("sharedram=%lu, bufferram=%lu} ",
-                               (long) si.sharedram, (long) si.bufferram);
-                       tprintf("totalswap=%lu, freeswap=%lu, procs=%u}",
-                               (long) si.totalswap, (long) si.freeswap,
-                               (unsigned)si.procs);
-               }
+       if (!umove_or_printaddr(tcp, tcp->u_arg[0], &si)) {
+               tprintf("{uptime=%llu"
+                       ", loads=[%llu, %llu, %llu]"
+                       ", totalram=%llu"
+                       ", freeram=%llu"
+                       ", sharedram=%llu"
+                       ", bufferram=%llu"
+                       ", totalswap=%llu"
+                       ", freeswap=%llu"
+                       ", procs=%u"
+                       ", totalhigh=%llu"
+                       ", freehigh=%llu"
+                       ", mem_unit=%u"
+                       "}",
+                       zero_extend_signed_to_ull(si.uptime)
+                       , zero_extend_signed_to_ull(si.loads[0])
+                       , zero_extend_signed_to_ull(si.loads[1])
+                       , zero_extend_signed_to_ull(si.loads[2])
+                       , zero_extend_signed_to_ull(si.totalram)
+                       , zero_extend_signed_to_ull(si.freeram)
+                       , zero_extend_signed_to_ull(si.sharedram)
+                       , zero_extend_signed_to_ull(si.bufferram)
+                       , zero_extend_signed_to_ull(si.totalswap)
+                       , zero_extend_signed_to_ull(si.freeswap)
+                       , (unsigned) si.procs
+                       , zero_extend_signed_to_ull(si.totalhigh)
+                       , zero_extend_signed_to_ull(si.freehigh)
+                       , si.mem_unit
+                       );
        }
+
        return 0;
 }