diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-05-24 04:14:53 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-05-24 04:14:53 +0000 |
| commit | 859388b8b4a544d6206cef4538a1f364e1e00fce (patch) | |
| tree | d5f8cfe7faa0e31654b196d66065abf9becbb18d /cpp/src/qpid | |
| parent | e33e56e6fb2cc0cc50a9685031489dddb4718d14 (diff) | |
| download | qpid-python-859388b8b4a544d6206cef4538a1f364e1e00fce.tar.gz | |
NO-JIRA: Rearrange memory status code
Currently only Linux has a useful implementation and everyone else uses a null implementation.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1342137 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid')
| -rw-r--r-- | cpp/src/qpid/sys/MemStat.cpp (renamed from cpp/src/qpid/sys/windows/MemStat.cpp) | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/posix/MemStat.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/qpid/sys/windows/MemStat.cpp b/cpp/src/qpid/sys/MemStat.cpp index b1d25c5fc5..c71fba785c 100644 --- a/cpp/src/qpid/sys/windows/MemStat.cpp +++ b/cpp/src/qpid/sys/MemStat.cpp @@ -21,9 +21,11 @@ #include "qpid/sys/MemStat.h" +// Null memory stats provider: +// This is for platforms that do not have a way to get allocated +// memory status void qpid::sys::MemStat::loadMemInfo(qmf::org::apache::qpid::broker::Memory*) { - // TODO: Add Windows-specific memory stats to the object and load them here. } diff --git a/cpp/src/qpid/sys/posix/MemStat.cpp b/cpp/src/qpid/sys/posix/MemStat.cpp index 72c53e5886..2fbf119cab 100644 --- a/cpp/src/qpid/sys/posix/MemStat.cpp +++ b/cpp/src/qpid/sys/posix/MemStat.cpp @@ -20,6 +20,7 @@ */ #include "qpid/sys/MemStat.h" + #include <malloc.h> void qpid::sys::MemStat::loadMemInfo(qmf::org::apache::qpid::broker::Memory* object) @@ -35,4 +36,3 @@ void qpid::sys::MemStat::loadMemInfo(qmf::org::apache::qpid::broker::Memory* obj object->set_malloc_keepcost(info.keepcost); } - |