Finegrainify namespacification
Make the Timer code give correct user/system/user+system times when -track-memory is enabled
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10463 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp
index d14a225..5d493b8 100644
--- a/lib/Support/Timer.cpp
+++ b/lib/Support/Timer.cpp
@@ -22,8 +22,10 @@
#include <functional>
#include <fstream>
#include <map>
+using namespace llvm;
-namespace llvm {
+// GetLibSupportInfoOutputFile - Return a file stream to print our output on...
+namespace llvm { extern std::ostream *GetLibSupportInfoOutputFile(); }
// getLibSupportInfoOutputFilename - This ugly hack is brought to you courtesy
// of constructor/destructor ordering being unspecified by C++. Basically the
@@ -122,9 +124,9 @@
gettimeofday(&T, 0);
if (!Start) {
- MemUsed = getMemUsage();
if (getrusage(RUSAGE_SELF, &RU))
perror("getrusage call failed: -time-passes info incorrect!");
+ MemUsed = getMemUsage();
}
TimeRecord Result;
@@ -268,7 +270,7 @@
// GetLibSupportInfoOutputFile - Return a file stream to print our output on...
std::ostream *
-GetLibSupportInfoOutputFile() {
+llvm::GetLibSupportInfoOutputFile() {
std::string &LibSupportInfoOutputFilename = getLibSupportInfoOutputFilename();
if (LibSupportInfoOutputFilename.empty())
return &std::cerr;
@@ -353,4 +355,3 @@
}
}
-} // End llvm namespace