Merge pull request #63 from stalleyj/memory

Return -1 when unable to get memory value

README.md

@@ -19,9 +19,10 @@ This project uses a semver-parsable X.0.Z version number for releases, where X i
 Non-release versions of this project (for example on github.com/RuntimeTools/omr-agentcore) will use semver-parsable X.0.Z-dev.B version numbers, where X.0.Z is the last release with Z incremented and B is an integer. For further information on the development process go to the  [appmetrics wiki][3]: [Developing](https://github.com/RuntimeTools/appmetrics/wiki/Developing).
 
 ## Version
-3.2.5
+3.2.6
 
 ## Release History
+`3.2.6` - Bug fixes.
 `3.2.5` - Bug fixes.
 `3.2.4` - Node on z/OS support.
 `3.2.3` - Swift 4 support.

binding.gyp

@@ -5,7 +5,7 @@
 #    "externalbinariesdir%": "<(PRODUCT_DIR)/deploy/external/binaries",
     "externalbinariesdir%": "./plugins",
     'build_id%': '.<!(["python", "./generate_build_id.py"])',
-    'coreversion%': '3.2.5',
+    'coreversion%': '3.2.6',
     "conditions": [
       ['OS=="aix"', {
         "portdir": "aix",

src/ibmras/monitoring/agent/Agent.cpp

@@ -194,7 +194,7 @@ std::string Agent::getBuildDate() {
 }
 
 std::string Agent::getVersion() {
-	return "3.2.5";
+	return "3.2.6";
 }
 
 void Agent::setLogLevels() {

src/ibmras/monitoring/plugins/common/memory/MemoryPlugin.cpp

@@ -512,9 +512,9 @@ int64 MemoryPlugin::getTotalPhysicalMemorySize() {
     num_pages = sysconf(_SC_PHYS_PAGES);
 
 	if (pagesize == -1 || num_pages == -1) {
-		return 0;
+		return -1;
     } else {
-		return (int64) pagesize *num_pages;
+		return (int64) pagesize * num_pages;
 	}
 	/*
 	 * There is a bug in OSX Mavericks which may cause the compilation to fail
@@ -528,19 +528,19 @@ int64 MemoryPlugin::getTotalPhysicalMemorySize() {
 	int mib[2] = {CTL_HW, HW_MEMSIZE};
 	unsigned long physicalMemSize;
 	size_t len = sizeof(physicalMemSize);
-	if(!sysctl(mib, 2, &physicalMemSize, &len, NULL, 0)) {
+	if (!sysctl(mib, 2, &physicalMemSize, &len, NULL, 0)) {
 		return physicalMemSize;
-	}else {
+	} else {
 		aCF.logMessage(debug, strerror(errno));
 		return -1;
 	}
 #elif defined(CTL_HW) && defined(HW_PHYSMEM) //32Bit
 	int mib[2] = {CTL_HW, HW_PHYSMEM};
 		unsigned long physicalMemSize;
 		size_t len = sizeof(physicalMemSize);
-		if(!sysctl(mib, 2, &physicalMemSize, &len, NULL, 0)) {
+		if (!sysctl(mib, 2, &physicalMemSize, &len, NULL, 0)) {
 			return physicalMemSize;
-		}else {
+		} else {
 			aCF.logMessage(debug, strerror(errno));
 			return -1;
 		}