diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2012-01-09 18:08:20 -0600 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-01-09 18:08:20 -0600 |
| commit | c2dbfc1d6ca677f9b6fb8eaa60e4003a903e26bd (patch) | |
| tree | 1835c4773d4f647f337fa40cecb8cbff48a0fb9e /src/base/hostinfo.hh | |
| parent | 4b772782871f265cf7372c984ad750803396938c (diff) | |
| download | gem5-c2dbfc1d6ca677f9b6fb8eaa60e4003a903e26bd.tar.xz | |
MAC: Make gem5 compile and run on MacOSX 10.7.2
Adaptations to make gem5 compile and run on OSX 10.7.2, with a stock
gcc 4.2.1 and the remaining dependencies from macports, i.e. python
2.7,.2 swig 2.0.4, mercurial 2.0. The changes include an adaptation of
the SConstruct to handle non-library linker flags, and Darwin-specific
code to find the memory usage of gem5. A number of Ruby files relied
on ambigious uint (without the 32 suffix) which caused compilation
errors.
Diffstat (limited to 'src/base/hostinfo.hh')
| -rw-r--r-- | src/base/hostinfo.hh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/base/hostinfo.hh b/src/base/hostinfo.hh index ac7d40f13..d9a30481a 100644 --- a/src/base/hostinfo.hh +++ b/src/base/hostinfo.hh @@ -39,7 +39,11 @@ std::string &hostname(); uint64_t procInfo(const char *filename, const char *target); -inline uint64_t memUsage() -{ return procInfo("/proc/self/status", "VmSize:"); } +/** + * Determine the simulator process' total virtual memory usage. + * + * @return virtual memory usage in kilobytes + */ +uint64_t memUsage(); #endif // __HOSTINFO_HH__ |