diff options
| author | Owen Anderson <resistor@mac.com> | 2009-06-23 18:21:13 +0000 | 
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2009-06-23 18:21:13 +0000 | 
| commit | ddf74dc9861ec8788dc75c911340d59230a90672 (patch) | |
| tree | c2d7cce3c817ecf2164c6d756d5fb45788c76811 | |
| parent | 2d99f97c17a33f633b5035c3592d07ffde91fcf5 (diff) | |
| download | bcm5719-llvm-ddf74dc9861ec8788dc75c911340d59230a90672.tar.gz bcm5719-llvm-ddf74dc9861ec8788dc75c911340d59230a90672.zip  | |
Actually, these need to be signed integers, not unsigned.
llvm-svn: 73978
| -rw-r--r-- | llvm/include/llvm/Support/Timer.h | 20 | ||||
| -rw-r--r-- | llvm/lib/Support/Timer.cpp | 4 | 
2 files changed, 12 insertions, 12 deletions
diff --git a/llvm/include/llvm/Support/Timer.h b/llvm/include/llvm/Support/Timer.h index 9e19a1c432b..f34fc954101 100644 --- a/llvm/include/llvm/Support/Timer.h +++ b/llvm/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/llvm/lib/Support/Timer.cpp b/llvm/lib/Support/Timer.cpp index f4e97c4dc70..69f967c7389 100644 --- a/llvm/lib/Support/Timer.cpp +++ b/llvm/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);  | 

