From 4fd8973e50f115120791caf054e5e75411b7c93e Mon Sep 17 00:00:00 2001
From: Ginn Chen <ginn.chen@oracle.com>
Date: Tue, 31 Jan 2012 14:32:10 +0800
Subject: [PATCH] Bug 717861 GetVsize and GetResident underestimate memory size
 on Solaris r=justin.lebar

---
 xpcom/base/nsMemoryReporterManager.cpp | 41 ++++++++++++++++++--------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 06b93f893e5c..26a09604ac34 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -145,21 +145,38 @@ static PRInt64 GetResident()
 
 static void XMappingIter(PRInt64& Vsize, PRInt64& Resident)
 {
+    Vsize = -1;
+    Resident = -1;
     int mapfd = open("/proc/self/xmap", O_RDONLY);
     struct stat st;
-    prxmap_t *prmapp;
+    prxmap_t *prmapp = NULL;
     if (mapfd >= 0) {
         if (!fstat(mapfd, &st)) {
             int nmap = st.st_size / sizeof(prxmap_t);
-            prmapp = (prxmap_t*)malloc((nmap + 1) * sizeof(prxmap_t));
-            int n = read(mapfd, prmapp, (nmap + 1) * sizeof(prxmap_t));
-            if (n > 0) {
-                Vsize = 0;
-                Resident = 0;
-                for (int i = 0; i < n / sizeof(prxmap_t); i++) {
-                    Vsize += prmapp[i].pr_size;
-                    Resident += prmapp[i].pr_rss * prmapp[i].pr_pagesize;
+            while (1) {
+                // stat(2) on /proc/<pid>/xmap returns an incorrect value,
+                // prior to the release of Solaris 11.
+                // Here is a workaround for it.
+                nmap *= 2;
+                prmapp = (prxmap_t*)malloc((nmap + 1) * sizeof(prxmap_t));
+                if (!prmapp) {
+                    // out of memory
+                    break;
                 }
+                int n = pread(mapfd, prmapp, (nmap + 1) * sizeof(prxmap_t), 0);
+                if (n < 0) {
+                    break;
+                }
+                if (nmap >= n / sizeof (prxmap_t)) {
+                    Vsize = 0;
+                    Resident = 0;
+                    for (int i = 0; i < n / sizeof (prxmap_t); i++) {
+                        Vsize += prmapp[i].pr_size;
+                        Resident += prmapp[i].pr_rss * prmapp[i].pr_pagesize;
+                    }
+                    break;
+                }
+                free(prmapp);
             }
             free(prmapp);
         }
@@ -169,16 +186,14 @@ static void XMappingIter(PRInt64& Vsize, PRInt64& Resident)
 
 static PRInt64 GetVsize()
 {
-    PRInt64 Vsize = -1;
-    PRInt64 Resident = -1;
+    PRInt64 Vsize, Resident;
     XMappingIter(Vsize, Resident);
     return Vsize;
 }
 
 static PRInt64 GetResident()
 {
-    PRInt64 Vsize = -1;
-    PRInt64 Resident = -1;
+    PRInt64 Vsize, Resident;
     XMappingIter(Vsize, Resident);
     return Resident;
 }