summaryrefslogtreecommitdiff
path: root/src/mongo/util
diff options
context:
space:
mode:
authorKevin Albertson <kevin.albertson@10gen.com>2018-01-02 16:53:16 -0500
committerKevin Albertson <kevin.albertson@10gen.com>2018-01-08 15:16:47 -0500
commit36eb9e78bc7466cac268c8b2995956a47e946ee5 (patch)
treec348de4aa14d91e14219f6a946f9327fc3548e61 /src/mongo/util
parent52c3dc23a9b8e532482d6be480a105a805b26faf (diff)
downloadmongo-36eb9e78bc7466cac268c8b2995956a47e946ee5.tar.gz
SERVER-6024 add stacktrace to unittests
Diffstat (limited to 'src/mongo/util')
-rw-r--r--src/mongo/util/stacktrace_posix.cpp2
-rw-r--r--src/mongo/util/stacktrace_windows.cpp12
2 files changed, 6 insertions, 8 deletions
diff --git a/src/mongo/util/stacktrace_posix.cpp b/src/mongo/util/stacktrace_posix.cpp
index 010bb039e95..b18f76f3f2f 100644
--- a/src/mongo/util/stacktrace_posix.cpp
+++ b/src/mongo/util/stacktrace_posix.cpp
@@ -181,7 +181,7 @@ void printStackTrace(std::ostream& os) {
// Collect symbol information for each backtrace address.
////////////////////////////////////////////////////////////
- os << std::hex << std::uppercase << '\n';
+ os << std::hex << std::uppercase;
for (int i = 0; i < addressCount; ++i) {
Dl_info& dlinfo(dlinfoForFrames[i]);
if (!dladdr(addresses[i], &dlinfo)) {
diff --git a/src/mongo/util/stacktrace_windows.cpp b/src/mongo/util/stacktrace_windows.cpp
index a2a2ea29162..42e189d3f02 100644
--- a/src/mongo/util/stacktrace_windows.cpp
+++ b/src/mongo/util/stacktrace_windows.cpp
@@ -327,21 +327,19 @@ void printWindowsStackTrace(CONTEXT& context, std::ostream& os) {
++sourceWidth;
size_t frameCount = traceList.size();
for (size_t i = 0; i < frameCount; ++i) {
- std::stringstream ss;
- ss << traceList[i].moduleName << " ";
+ os << traceList[i].moduleName << ' ';
size_t width = traceList[i].moduleName.length();
while (width < moduleWidth) {
- ss << " ";
+ os << ' ';
++width;
}
- ss << traceList[i].sourceAndLine << " ";
+ os << traceList[i].sourceAndLine << ' ';
width = traceList[i].sourceAndLine.length();
while (width < sourceWidth) {
- ss << " ";
+ os << ' ';
++width;
}
- ss << traceList[i].symbolAndOffset;
- log() << ss.str();
+ os << traceList[i].symbolAndOffset << '\n';
}
}