summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Cotter <matt.cotter@mongodb.com>2016-06-03 15:35:24 -0400
committerMatt Cotter <matt.cotter@mongodb.com>2016-06-06 11:13:09 -0400
commit5018df28b12f0697cf2ba3d6d35b0e16808a42ab (patch)
tree2f89d35ac9ed690c186aa3f2d2e33bf522e242f5
parent248a31ad142701d1526949801b26c51baa2721fc (diff)
downloadmongo-5018df28b12f0697cf2ba3d6d35b0e16808a42ab.tar.gz
SERVER-24363 cast mallinfo members to long long before adding
-rw-r--r--src/mongo/util/processinfo_linux.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
index c831e135f0d..56c5e626b5d 100644
--- a/src/mongo/util/processinfo_linux.cpp
+++ b/src/mongo/util/processinfo_linux.cpp
@@ -451,7 +451,8 @@ void ProcessInfo::getExtraInfo(BSONObjBuilder& info) {
struct mallinfo malloc_info =
mallinfo(); // structure has same name as function that returns it. (see malloc.h)
info.append("heap_usage_bytes",
- malloc_info.uordblks /*main arena*/ + malloc_info.hblkhd /*mmap blocks*/);
+ static_cast<long long>(malloc_info.uordblks) /*main arena*/ +
+ static_cast<long long>(malloc_info.hblkhd) /*mmap blocks*/);
// docs claim hblkhd is included in uordblks but it isn't
LinuxProc p(_pid);