Author: astitcher
Date: Thu May 24 04:14:53 2012
New Revision: 1342137
URL: http://svn.apache.org/viewvc?rev=1342137&view=rev
Log:
NO-JIRA: Rearrange memory status code
Currently only Linux has a useful implementation and everyone else uses a null
implementation.
Added:
qpid/trunk/qpid/cpp/src/qpid/sys/MemStat.cpp
- copied, changed from r1342136,
qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemStat.cpp
Removed:
qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemStat.cpp
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1342137&r1=1342136&r2=1342137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu May 24 04:14:53 2012
@@ -676,6 +676,11 @@ include (ssl.cmake)
# Check for syslog capabilities not present on all systems
check_symbol_exists (LOG_AUTHPRIV "sys/syslog.h" HAVE_LOG_AUTHPRIV)
check_symbol_exists (LOG_FTP "sys/syslog.h" HAVE_LOG_FTP)
+
+# Set default Memory Status module (Null implementation)
+set (qpid_memstat_module
+ qpid/sys/MemStat.cpp
+)
# Allow MSVC user to select 'WinXP-SP3/Windows Server 2003' as build target
version
set (win32_winnt_default OFF)
@@ -738,7 +743,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
qpid/sys/windows/SystemInfo.cpp
qpid/sys/windows/Thread.cpp
qpid/sys/windows/Time.cpp
- qpid/sys/windows/MemStat.cpp
qpid/client/windows/SaslFactory.cpp
${sslcommon_windows_SOURCES}
)
@@ -795,6 +799,10 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
if (CMAKE_COMPILER_IS_GNUCXX)
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
${GCC_CATCH_UNDEFINED} -pthread")
endif (CMAKE_COMPILER_IS_GNUCXX)
+ # On Linux override memory status module
+ set (qpid_memstat_module
+ qpid/sys/posix/MemStat.cpp
+ )
endif (CMAKE_SYSTEM_NAME STREQUAL Linux)
if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
@@ -802,7 +810,7 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
set (qpid_system_module
qpid/sys/solaris/SystemInfo.cpp
)
-# On Sun we want -lpthread -lthread as the 2nd last and last libs passed to
linker
+ # On Sun we want -lpthread -lthread as the 2nd last and last libs passed
to linker
set (qpidtypes_platform_LIBS ${qpidtypes_platform_LIBS}
pthread
thread
@@ -821,7 +829,6 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
qpid/sys/posix/FileSysDir.cpp
qpid/sys/posix/IOHandle.cpp
qpid/sys/posix/LockFile.cpp
- qpid/sys/posix/MemStat.cpp
qpid/sys/posix/Mutex.cpp
qpid/sys/posix/PipeHandle.cpp
qpid/sys/posix/PollableCondition.cpp
@@ -924,6 +931,7 @@ set (qpidcommon_SOURCES
qpid/sys/Timer.cpp
qpid/sys/TimerWarnings.cpp
qpid/amqp_0_10/Codecs.cpp
+ ${qpid_memstat_module}
)
add_msvc_version (qpidcommon library dll)
Copied: qpid/trunk/qpid/cpp/src/qpid/sys/MemStat.cpp (from r1342136,
qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemStat.cpp)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/MemStat.cpp?p2=qpid/trunk/qpid/cpp/src/qpid/sys/MemStat.cpp&p1=qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemStat.cpp&r1=1342136&r2=1342137&rev=1342137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/MemStat.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/MemStat.cpp Thu May 24 04:14:53 2012
@@ -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.
}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/MemStat.cpp?rev=1342137&r1=1342136&r2=1342137&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/MemStat.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/MemStat.cpp Thu May 24 04:14:53 2012
@@ -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
object->set_malloc_keepcost(info.keepcost);
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
