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 a31dd3d..86194d1 100644
--- a/include/llvm/Support/Timer.h
+++ b/include/llvm/Support/Timer.h
@@ -36,9 +36,9 @@
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 @@
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 5070bbe..80fadba 100644
--- a/include/llvm/System/Process.h
+++ b/include/llvm/System/Process.h
@@ -40,14 +40,14 @@
/// 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 38a8b44..bea8164 100644
--- a/lib/Support/Timer.cpp
+++ b/lib/Support/Timer.cpp
@@ -93,15 +93,15 @@
}
}
-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 @@
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 @@
/// 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 cccd3ff..1c1373e 100644
--- a/lib/System/Unix/Process.cpp
+++ b/lib/System/Unix/Process.cpp
@@ -47,7 +47,7 @@
static char* som = reinterpret_cast<char*>(::sbrk(0));
#endif
-uint64_t
+size_t
Process::GetMallocUsage()
{
#if defined(HAVE_MALLINFO)
@@ -68,7 +68,7 @@
#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 cccd3ff..1c1373e 100644
--- a/lib/System/Unix/Process.inc
+++ b/lib/System/Unix/Process.inc
@@ -47,7 +47,7 @@
static char* som = reinterpret_cast<char*>(::sbrk(0));
#endif
-uint64_t
+size_t
Process::GetMallocUsage()
{
#if defined(HAVE_MALLINFO)
@@ -68,7 +68,7 @@
#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 dc46641..392bac2 100644
--- a/lib/System/Win32/Process.cpp
+++ b/lib/System/Win32/Process.cpp
@@ -51,7 +51,7 @@
return PageSize;
}
-uint64_t
+size_t
Process::GetMallocUsage()
{
_HEAPINFO hinfo;
@@ -65,7 +65,7 @@
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 dc46641..392bac2 100644
--- a/lib/System/Win32/Process.inc
+++ b/lib/System/Win32/Process.inc
@@ -51,7 +51,7 @@
return PageSize;
}
-uint64_t
+size_t
Process::GetMallocUsage()
{
_HEAPINFO hinfo;
@@ -65,7 +65,7 @@
return size;
}
-uint64_t
+size_t
Process::GetTotalMemoryUsage()
{
PROCESS_MEMORY_COUNTERS pmc;