Use size_t instead of long to represent memory usage. long is 32 bits

on 64-bit Windows.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19393 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/Timer.h b/include/llvm/Support/Timer.h
index a31dd3d93cf6ae370a95f946fde1399071970862..86194d16b6fc2b897d7bc03950e45ec1f9f04f25 100644 (file)
--- a/include/llvm/Support/Timer.h
+++ b/include/llvm/Support/Timer.h
@@ -36,9 +36,9 @@ class Timer {
   double Elapsed;        // Wall clock time elapsed in seconds
   double UserTime;       // User time elapsed
   double SystemTime;     // System time elapsed
-  long   MemUsed;        // Memory allocated (in bytes)
-  long   PeakMem;        // Peak memory used
-  long   PeakMemBase;    // Temporary for peak calculation...
+  size_t MemUsed;        // Memory allocated (in bytes)
+  size_t PeakMem;        // Peak memory used
+  size_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.
@@ -50,8 +50,8 @@ public:
 
   double getProcessTime() const { return UserTime+SystemTime; }
   double getWallTime() const { return Elapsed; }
-  long getMemUsed() const { return MemUsed; }
-  long getPeakMem() const { return PeakMem; }
+  size_t getMemUsed() const { return MemUsed; }
+  size_t getPeakMem() const { return PeakMem; }
   std::string getName() const { return Name; }
 
   const Timer &operator=(const Timer &T) {

diff --git a/include/llvm/System/Process.h b/include/llvm/System/Process.h
index 5070bbe4047d7361f06b76d281761b80a24c1d4d..80fadbad6c8032089ea03d6c4bfa8008df429b40 100644 (file)
--- a/include/llvm/System/Process.h
+++ b/include/llvm/System/Process.h
@@ -40,14 +40,14 @@ namespace sys {
       /// allocated space. 
       /// @throws nothing
       /// @brief Return process memory usage.
-      static uint64_t GetMallocUsage();
+      static size_t GetMallocUsage();
 
       /// This static function will return the total memory usage of the 
       /// process. This includes code, data, stack and mapped pages usage. Notei
       /// that the value returned here is not necessarily the Running Set Size,
       /// it is the total virtual memory usage, regardless of mapped state of
       /// that memory.
-      static uint64_t GetTotalMemoryUsage();
+      static size_t GetTotalMemoryUsage();
 
       /// This static function will set \p user_time to the amount of CPU time 
       /// spent in user (non-kernel) mode and \p sys_time to the amount of CPU

diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp
index 38a8b449f34edf3b38e0e20ed26d4da978fce13b..bea81648efc750285810e70d000fe1b455645093 100644 (file)
--- a/lib/Support/Timer.cpp
+++ b/lib/Support/Timer.cpp
@@ -93,15 +93,15 @@ Timer::~Timer() {
   }
 }
 
-static inline long getMemUsage() {
+static inline size_t getMemUsage() {
   if (TrackSpace)
-    return (long)sys::Process::GetMallocUsage();
+    return sys::Process::GetMallocUsage();
   return 0;
 }
 
 struct TimeRecord {
   double Elapsed, UserTime, SystemTime;
-  long MemUsed;
+  size_t MemUsed;
 };
 
 static TimeRecord getTimeRecord(bool Start) {
@@ -111,7 +111,7 @@ static TimeRecord getTimeRecord(bool Start) {
   sys::TimeValue user(0,0);
   sys::TimeValue sys(0,0);
 
-  long MemUsed = 0;
+  size_t MemUsed = 0;
   if (Start) {
     sys::Process::GetTimeUsage(now,user,sys);
     MemUsed = getMemUsage();
@@ -171,7 +171,7 @@ void Timer::sum(const Timer &T) {
 /// currently active timers, which will be printed when the timer group prints
 ///
 void Timer::addPeakMemoryMeasurement() {
-  long MemUsed = getMemUsage();
+  size_t MemUsed = getMemUsage();
 
   for (std::vector<Timer*>::iterator I = ActiveTimers.begin(),
          E = ActiveTimers.end(); I != E; ++I)

diff --git a/lib/System/Unix/Process.cpp b/lib/System/Unix/Process.cpp
index cccd3ffcb67bbd6f218da5aae5ec62d2ee38fbb1..1c1373ebb5cdbcb05d5739c2f6adaa09fa2ef801 100644 (file)
--- a/lib/System/Unix/Process.cpp
+++ b/lib/System/Unix/Process.cpp
@@ -47,7 +47,7 @@ Process::GetPageSize()
 static char* som = reinterpret_cast<char*>(::sbrk(0));
 #endif
 
-uint64_t 
+size_t 
 Process::GetMallocUsage()
 {
 #if defined(HAVE_MALLINFO)
@@ -68,7 +68,7 @@ Process::GetMallocUsage()
 #endif
 }
 
-uint64_t
+size_t
 Process::GetTotalMemoryUsage()
 {
 #if defined(HAVE_MALLINFO)

diff --git a/lib/System/Unix/Process.inc b/lib/System/Unix/Process.inc
index cccd3ffcb67bbd6f218da5aae5ec62d2ee38fbb1..1c1373ebb5cdbcb05d5739c2f6adaa09fa2ef801 100644 (file)
--- a/lib/System/Unix/Process.inc
+++ b/lib/System/Unix/Process.inc
@@ -47,7 +47,7 @@ Process::GetPageSize()
 static char* som = reinterpret_cast<char*>(::sbrk(0));
 #endif
 
-uint64_t 
+size_t 
 Process::GetMallocUsage()
 {
 #if defined(HAVE_MALLINFO)
@@ -68,7 +68,7 @@ Process::GetMallocUsage()
 #endif
 }
 
-uint64_t
+size_t
 Process::GetTotalMemoryUsage()
 {
 #if defined(HAVE_MALLINFO)

diff --git a/lib/System/Win32/Process.cpp b/lib/System/Win32/Process.cpp
index dc4664109dee96ff01adbc31ede0406502c5d31f..392bac2e471a9805b8f21c41c96cca434ac8abd1 100644 (file)
--- a/lib/System/Win32/Process.cpp
+++ b/lib/System/Win32/Process.cpp
@@ -51,7 +51,7 @@ Process::GetPageSize() {
   return PageSize;
 }
 
-uint64_t 
+size_t 
 Process::GetMallocUsage()
 {
   _HEAPINFO hinfo;
@@ -65,7 +65,7 @@ Process::GetMallocUsage()
   return size;
 }
 
-uint64_t
+size_t
 Process::GetTotalMemoryUsage()
 {
   PROCESS_MEMORY_COUNTERS pmc;

diff --git a/lib/System/Win32/Process.inc b/lib/System/Win32/Process.inc
index dc4664109dee96ff01adbc31ede0406502c5d31f..392bac2e471a9805b8f21c41c96cca434ac8abd1 100644 (file)
--- a/lib/System/Win32/Process.inc
+++ b/lib/System/Win32/Process.inc
@@ -51,7 +51,7 @@ Process::GetPageSize() {
   return PageSize;
 }
 
-uint64_t 
+size_t 
 Process::GetMallocUsage()
 {
   _HEAPINFO hinfo;
@@ -65,7 +65,7 @@ Process::GetMallocUsage()
   return size;
 }
 
-uint64_t
+size_t
 Process::GetTotalMemoryUsage()
 {
   PROCESS_MEMORY_COUNTERS pmc;