commit 4d2488a838132e7dc8fb86238ed225a6f8bc0ec4
author Colin Cross <ccross@android.com> Tue Jun 17 14:38:34 2014 -0700
committer Colin Cross <ccross@android.com> Tue Jun 17 14:50:29 2014 -0700
tree 4d7424240e125ec0c313e806acbde4fe61d75599
parent e2998ffe6f494f06b25aca372c1d35cd47390b98

procrank: support >4GB of memory from 32-bit procrank

Use uint64_t for sizes.

Change-Id: Ic686b4cbf4406aec1e9b01810924488bff63722e

procrank/procrank.c

diff --git a/procrank/procrank.c b/procrank/procrank.c
index 945e940..de26cd1 100644
--- a/procrank/procrank.c
+++ b/procrank/procrank.c
@@ -16,24 +16,25 @@
 
 #include <dirent.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
 
 #include <pagemap/pagemap.h>
 
 struct proc_info {
     pid_t pid;
     pm_memusage_t usage;
-    unsigned long wss;
+    uint64_t wss;
 };
 
 static void usage(char *myname);
 static int getprocname(pid_t pid, char *buf, int len);
-static int numcmp(long long a, long long b);
+static int numcmp(uint64_t a, uint64_t b);
 
 #define declare_sort(field) \
     static int sort_by_ ## field (const void *a, const void *b)
@@ -85,7 +86,7 @@
             5,
             0
     };
-    long mem[] = { 0, 0, 0, 0, 0, 0 };
+    uint64_t mem[] = { 0, 0, 0, 0, 0, 0 };
 
     char* p = buffer;
     while (*p && numFound < 6) {
@@ -112,7 +113,8 @@
         if (*p) p++;
     }
 
-    printf("RAM: %ldK total, %ldK free, %ldK buffers, %ldK cached, %ldK shmem, %ldK slab\n",
+    printf("RAM: %" PRIu64 "K total, %" PRIu64 "K free, %" PRIu64 "K buffers, "
+            "%" PRIu64 "K cached, %" PRIu64 "K shmem, %" PRIu64 "K slab\n",
             mem[0], mem[1], mem[2], mem[3], mem[4], mem[5]);
 }
 
@@ -122,9 +124,9 @@
     pid_t *pids;
     struct proc_info **procs;
     size_t num_procs;
-    unsigned long total_pss;
-    unsigned long total_uss;
-    unsigned long total_swap;
+    uint64_t total_pss;
+    uint64_t total_uss;
+    uint64_t total_swap;
     char cmdline[256]; // this must be within the range of int
     int error;
     bool has_swap = false;
@@ -314,15 +316,15 @@
     /* Print the total line */
     printf("%5s  ", "");
     if (ws) {
-        printf("%7s  %6ldK  %6ldK  ",
+        printf("%7s  %6" PRIu64 "K  %" PRIu64 "K  ",
             "", total_pss / 1024, total_uss / 1024);
     } else {
-        printf("%8s  %7s  %6ldK  %6ldK  ",
+        printf("%8s  %7s  %6" PRIu64 "K  %6" PRIu64 "K  ",
             "", "", total_pss / 1024, total_uss / 1024);
     }
 
     if (has_swap) {
-        printf("%6ldK  ", total_swap);
+        printf("%6" PRIu64 "K  ", total_swap);
     }
 
     printf("TOTAL\n");
@@ -410,7 +412,7 @@
     return rc;
 }
 
-static int numcmp(long long a, long long b) {
+static int numcmp(uint64_t a, uint64_t b) {
     if (a < b) return -1;
     if (a > b) return 1;
     return 0;