diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2017-04-17 21:32:41 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2017-04-17 21:32:41 -0400 |
| commit | 71e41bc4935c8225ba14413900fcd69394b674da (patch) | |
| tree | 9941bc043d7b4fde94fc1f832288307ca58d582b | |
| parent | 644c8130839d046599d254fded7da491b69b8289 (diff) | |
| download | mongo-71e41bc4935c8225ba14413900fcd69394b674da.tar.gz | |
SERVER-28833 32-bit FTDC fixes
| -rw-r--r-- | src/mongo/util/perfctr_collect_test.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/util/procparser.cpp | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/mongo/util/perfctr_collect_test.cpp b/src/mongo/util/perfctr_collect_test.cpp index 516754a440a..a5d519f69ad 100644 --- a/src/mongo/util/perfctr_collect_test.cpp +++ b/src/mongo/util/perfctr_collect_test.cpp @@ -310,13 +310,9 @@ TEST(FTDCPerfCollector, TestMultipleNestedCounterGroups) { COLLECT_COUNTERS; ASSERT_TIMEBASE - // We boldly assume that machines we test on have at least two processors ASSERT_NESTED_GROUP_AND_RAW_COUNTER("cpu", "0", "\\Processor\\% Idle Time"); ASSERT_NESTED_GROUP_AND_RAW_COUNTER("cpu", "0", "\\Processor\\% Processor Time"); - ASSERT_NESTED_GROUP_AND_RAW_COUNTER("cpu", "1", "\\Processor\\% Idle Time"); - ASSERT_NESTED_GROUP_AND_RAW_COUNTER("cpu", "1", "\\Processor\\% Processor Time"); - ASSERT_NO_NESTED_GROUP_AND_RAW_COUNTER("cpu", "_Total", "\\Processor\\% Idle Time"); ASSERT_NO_NESTED_GROUP_AND_RAW_COUNTER("cpu", "_Total", "\\Processor\\% Processor Time"); diff --git a/src/mongo/util/procparser.cpp b/src/mongo/util/procparser.cpp index 2dfc5db662c..bafc674fc06 100644 --- a/src/mongo/util/procparser.cpp +++ b/src/mongo/util/procparser.cpp @@ -274,7 +274,7 @@ Status parseProcStat(const std::vector<StringData>& keys, value = 0; } - builder->appendNumber(key, value); + builder->appendNumber(key, static_cast<long long>(value)); } } } @@ -378,9 +378,9 @@ Status parseProcMemInfo(const std::vector<StringData>& keys, keyWithSuffix.append("_kb"); } - builder->appendNumber(keyWithSuffix, value); + builder->appendNumber(keyWithSuffix, static_cast<long long>(value)); } else { - builder->appendNumber(key, value); + builder->appendNumber(key, static_cast<long long>(value)); } } } @@ -511,7 +511,7 @@ Status parseProcDiskStats(const std::vector<StringData>& disks, BSONObjBuilder sub(builder->subobjStart(disk)); for (size_t index = 0; index < stats.size() && index < kDiskFieldCount; ++index) { - sub.appendNumber(kDiskFields[index], stats[index]); + sub.appendNumber(kDiskFields[index], static_cast<long long>(stats[index])); } sub.doneFast(); |