Merge branch 'develop-linux' into marchcat/slua-linux

# Conflicts:
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llstartup.cpp

1 files changed, 37 insertions, 95 deletions

diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 270ca40086..e3335ca4aa 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -509,57 +509,46 @@ const S32 LLOSInfo::getOSBitness() const
     return mOSBitness;
 }
 
-//static
-U32 LLOSInfo::getProcessVirtualSizeKB()
-{
-    U32 virtual_size = 0;
-#if LL_LINUX
-#   define STATUS_SIZE 2048
-    LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb");
-    if (status_filep)
-    {
-        S32 numRead = 0;
-        char buff[STATUS_SIZE];     /* Flawfinder: ignore */
+namespace {
 
-        size_t nbytes = fread(buff, 1, STATUS_SIZE-1, status_filep);
-        buff[nbytes] = '\0';
+    U32 readFromProcStat( std::string entryName )
+    {
+        U32 val{};
+#if LL_LINUX
+        constexpr U32 STATUS_SIZE  = 2048;
 
-        // All these guys return numbers in KB
-        char *memp = strstr(buff, "VmSize:");
-        if (memp)
+        LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb");
+        if (status_filep)
         {
-            numRead += sscanf(memp, "%*s %u", &virtual_size);
+            char buff[STATUS_SIZE];     /* Flawfinder: ignore */
+
+            size_t nbytes = fread(buff, 1, STATUS_SIZE-1, status_filep);
+            buff[nbytes] = '\0';
+
+            // All these guys return numbers in KB
+            char *memp = strstr(buff, entryName.c_str());
+            if (memp)
+            {
+                (void) sscanf(memp, "%*s %u", &val);
+            }
+            fclose(status_filep);
         }
-        fclose(status_filep);
-    }
 #endif
-    return virtual_size;
+        return val;
+    }
+
 }
 
 //static
-U32 LLOSInfo::getProcessResidentSizeKB()
+U32 LLOSInfo::getProcessVirtualSizeKB()
 {
-    U32 resident_size = 0;
-#if LL_LINUX
-    LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb");
-    if (status_filep != NULL)
-    {
-        S32 numRead = 0;
-        char buff[STATUS_SIZE];     /* Flawfinder: ignore */
-
-        size_t nbytes = fread(buff, 1, STATUS_SIZE-1, status_filep);
-        buff[nbytes] = '\0';
+    return readFromProcStat( "VmSize:" );
+}
 
-        // All these guys return numbers in KB
-        char *memp = strstr(buff, "VmRSS:");
-        if (memp)
-        {
-            numRead += sscanf(memp, "%*s %u", &resident_size);
-        }
-        fclose(status_filep);
-    }
-#endif
-    return resident_size;
+//static
+U32 LLOSInfo::getProcessResidentSizeKB()
+{
+    return readFromProcStat( "VmRSS:" );
 }
 
 //static
@@ -724,7 +713,7 @@ public:
     void add(const LLSD::String& name, const T& value,
              typename boost::enable_if<boost::is_integral<T> >::type* = 0)
     {
-        mStats[name] = LLSD::Integer(value);
+        mStats[name] = LLSD::Integer(llmin<T>(value, S32_MAX));
     }
 
     // Store every floating-point type as LLSD::Real.
@@ -833,57 +822,8 @@ void LLMemoryInfo::getAvailableMemoryKB(U32Kilobytes& avail_mem_kb)
     }
 
 #elif LL_LINUX
-    // mStatsMap is derived from MEMINFO_FILE:
-    // $ cat /proc/meminfo
-    // MemTotal:        4108424 kB
-    // MemFree:         1244064 kB
-    // Buffers:           85164 kB
-    // Cached:          1990264 kB
-    // SwapCached:            0 kB
-    // Active:          1176648 kB
-    // Inactive:        1427532 kB
-    // Active(anon):     529152 kB
-    // Inactive(anon):    15924 kB
-    // Active(file):     647496 kB
-    // Inactive(file):  1411608 kB
-    // Unevictable:          16 kB
-    // Mlocked:              16 kB
-    // HighTotal:       3266316 kB
-    // HighFree:         721308 kB
-    // LowTotal:         842108 kB
-    // LowFree:          522756 kB
-    // SwapTotal:       6384632 kB
-    // SwapFree:        6384632 kB
-    // Dirty:                28 kB
-    // Writeback:             0 kB
-    // AnonPages:        528820 kB
-    // Mapped:            89472 kB
-    // Shmem:             16324 kB
-    // Slab:             159624 kB
-    // SReclaimable:     145168 kB
-    // SUnreclaim:        14456 kB
-    // KernelStack:        2560 kB
-    // PageTables:         5560 kB
-    // NFS_Unstable:          0 kB
-    // Bounce:                0 kB
-    // WritebackTmp:          0 kB
-    // CommitLimit:     8438844 kB
-    // Committed_AS:    1271596 kB
-    // VmallocTotal:     122880 kB
-    // VmallocUsed:       65252 kB
-    // VmallocChunk:      52356 kB
-    // HardwareCorrupted:     0 kB
-    // HugePages_Total:       0
-    // HugePages_Free:        0
-    // HugePages_Rsvd:        0
-    // HugePages_Surp:        0
-    // Hugepagesize:       2048 kB
-    // DirectMap4k:      434168 kB
-    // DirectMap2M:      477184 kB
-    // (could also run 'free', but easier to read a file than run a program)
-    LLSD statsMap(loadStatsMap());
-
-    avail_mem_kb = (U32Kilobytes)statsMap["MemFree"].asInteger();
+    U64 phys = U64(getpagesize()) * U64(get_avphys_pages());
+    avail_mem_kb = U64Bytes(phys);
 #else
     //do not know how to collect available memory info for other systems.
     //leave it blank here for now.
@@ -1083,7 +1023,7 @@ LLSD LLMemoryInfo::loadStatsMap()
     }
 
 #elif LL_LINUX
-    std::ifstream meminfo(MEMINFO_FILE);
+    llifstream meminfo(MEMINFO_FILE);
     if (meminfo.is_open())
     {
         // MemTotal:        4108424 kB
@@ -1123,9 +1063,10 @@ LLSD LLMemoryInfo::loadStatsMap()
                 LLSD::String key(matched[1].first, matched[1].second);
                 LLSD::String value_str(matched[2].first, matched[2].second);
                 LLSD::Integer value(0);
+                S64 intval = 0;
                 try
                 {
-                    value = boost::lexical_cast<LLSD::Integer>(value_str);
+                    intval = llclamp(boost::lexical_cast<S64>(value_str), S32_MIN, S32_MAX);
                 }
                 catch (const boost::bad_lexical_cast&)
                 {
@@ -1134,6 +1075,7 @@ LLSD LLMemoryInfo::loadStatsMap()
                                              << line << LL_ENDL;
                     continue;
                 }
+                value = LLSD::Integer(intval);
                 // Store this statistic.
                 stats.add(key, value);
             }