From 14112e51697e56788fcb32f4255833499c2738b5 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Tue, 23 Jun 2009 18:21:13 +0000 Subject: [PATCH] Actually, these need to be signed integers, not unsigned. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73978 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/Timer.h | 20 ++++++++++---------- lib/Support/Timer.cpp | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/llvm/Support/Timer.h b/include/llvm/Support/Timer.h index 9e19a1c432b..f34fc954101 100644 --- a/include/llvm/Support/Timer.h +++ b/include/llvm/Support/Timer.h @@ -34,12 +34,12 @@ class TimerGroup; /// if they are never started. /// class Timer { - uint64_t Elapsed; // Wall clock time elapsed in seconds - uint64_t UserTime; // User time elapsed - uint64_t SystemTime; // System time elapsed - uint64_t MemUsed; // Memory allocated (in bytes) - uint64_t PeakMem; // Peak memory used - uint64_t PeakMemBase; // Temporary for peak calculation... + int64_t Elapsed; // Wall clock time elapsed in seconds + int64_t UserTime; // User time elapsed + int64_t SystemTime; // System time elapsed + int64_t MemUsed; // Memory allocated (in bytes) + int64_t PeakMem; // Peak memory used + int64_t PeakMemBase; // Temporary for peak calculation... std::string Name; // The name of this time variable bool Started; // Has this time variable ever been started? TimerGroup *TG; // The TimerGroup this Timer is in. @@ -49,10 +49,10 @@ public: Timer(const Timer &T); ~Timer(); - uint64_t getProcessTime() const { return UserTime+SystemTime; } - uint64_t getWallTime() const { return Elapsed; } - uint64_t getMemUsed() const { return MemUsed; } - uint64_t getPeakMem() const { return PeakMem; } + int64_t getProcessTime() const { return UserTime+SystemTime; } + int64_t getWallTime() const { return Elapsed; } + int64_t getMemUsed() const { return MemUsed; } + int64_t getPeakMem() const { return PeakMem; } std::string getName() const { return Name; } const Timer &operator=(const Timer &T) { diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp index f4e97c4dc70..69f967c7389 100644 --- a/lib/Support/Timer.cpp +++ b/lib/Support/Timer.cpp @@ -112,7 +112,7 @@ static inline size_t getMemUsage() { } struct TimeRecord { - uint64_t Elapsed, UserTime, SystemTime, MemUsed; + int64_t Elapsed, UserTime, SystemTime, MemUsed; }; static TimeRecord getTimeRecord(bool Start) { @@ -122,7 +122,7 @@ static TimeRecord getTimeRecord(bool Start) { sys::TimeValue user(0,0); sys::TimeValue sys(0,0); - uint64_t MemUsed = 0; + int64_t MemUsed = 0; if (Start) { MemUsed = getMemUsage(); sys::Process::GetTimeUsage(now,user,sys);