Merge branch 'release/v2.8.1'

Author: DigitalInBlue

CMakeLists.txt

@@ -41,8 +41,6 @@ macro(CeleroSetDefaultCompilerOptions)
         if(CELERO_TREAT_WARNINGS_AS_ERRORS)
             target_compile_options(${PROJECT_NAME} PRIVATE /WX)
 		endif()
-		set_target_properties(${PROJECT_NAME} PROPERTIES
-			ARCHIVE_OUTPUT_NAME "${PROJECT_NAME}$<$<CONFIG:Debug>:d>$<$<BOOL:${CELERO_COMPILE_DYNAMIC_LIBRARIES}>:.dll>")
 
 	elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
 		target_compile_options(${PROJECT_NAME} PRIVATE -Wall)
@@ -92,10 +90,8 @@ option(CELERO_TREAT_WARNINGS_AS_ERRORS "Treat compile warnings as errors." ON)
 
 if(CELERO_COMPILE_DYNAMIC_LIBRARIES)
 	SET(CELERO_USER_DEFINED_SHARED_OR_STATIC "SHARED")
-	message(STATUS "Celero: Shared lib build")
 else()
 	SET(CELERO_USER_DEFINED_SHARED_OR_STATIC "STATIC")
-	message(STATUS "Celero: Static lib build")
 endif()
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -107,10 +103,10 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(CMAKE_DEBUG_POSTFIX          "d" CACHE STRING "add a postfix, usually d on windows")
-set(CMAKE_RELEASE_POSTFIX        ""  CACHE STRING "add a postfix, usually empty on windows")
-set(CMAKE_RELWITHDEBINFO_POSTFIX ""  CACHE STRING "add a postfix, usually empty on windows")
-set(CMAKE_MINSIZEREL_POSTFIX     ""  CACHE STRING "add a postfix, usually empty on windows")
+set(CMAKE_DEBUG_POSTFIX          "-d" CACHE STRING "add a postfix, usually d on windows")
+set(CMAKE_RELEASE_POSTFIX        "" CACHE STRING "add a postfix, usually empty on windows")
+set(CMAKE_RELWITHDEBINFO_POSTFIX "-rd" CACHE STRING "add a postfix, usually empty on windows")
+set(CMAKE_MINSIZEREL_POSTFIX     "" CACHE STRING "add a postfix, usually empty on windows")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 

experiments/ExperimentSortingRandomIntsUDM/ExperimentSortingRandomIntsUDM.cpp

@@ -126,6 +126,36 @@ class SortFixture : public celero::TestFixture
 		}
 	};
 
+	/// Used for debugging multiple UDM's
+	class RandomUDM : public celero::UserDefinedMeasurementTemplate<size_t>
+	{
+		std::string getName() const override
+		{
+			return "Random";
+		}
+
+		// Turn off some of the output reporting.
+		bool reportStandardDeviation() const override
+		{
+			return false;
+		}
+
+		bool reportSkewness() const override
+		{
+			return false;
+		}
+
+		bool reportKurtosis() const override
+		{
+			return false;
+		}
+
+		bool reportZScore() const override
+		{
+			return false;
+		}
+	};
+
 	SortFixture()
 	{
 	}
@@ -173,17 +203,20 @@ class SortFixture : public celero::TestFixture
 
 		this->copyCountUDM->addValue(CopyCountingInt::getCount());
 		CopyCountingInt::resetCount();
+
+		this->randomUDM->addValue(static_cast<size_t>(rand()));
 	}
 
 	std::vector<std::shared_ptr<celero::UserDefinedMeasurement>> getUserDefinedMeasurements() const override
 	{
-		return {this->copyCountUDM};
+		return {this->copyCountUDM, this->randomUDM};
 	}
 
 	std::vector<CopyCountingInt> array;
 	int64_t arraySize{0};
 
 	std::shared_ptr<CopyCountUDM> copyCountUDM{new CopyCountUDM};
+	std::shared_ptr<RandomUDM> randomUDM{new RandomUDM};
 };
 
 static const int SamplesCount = 2000;

src/Memory.cpp

@@ -17,17 +17,19 @@
 ///
 
 #include <celero/Memory.h>
+
 #include <sstream>
 
 #ifdef _WIN32
 #include <windows.h>
-
+//
 #include <psapi.h>
 #elif defined(__APPLE__)
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include <array>
 #include <cstring>
 #else
@@ -257,6 +259,8 @@ int64_t celero::GetRAMPhysicalUsedByCurrentProcess()
 	PROCESS_MEMORY_COUNTERS_EX pmc;
 	GetProcessMemoryInfo(GetCurrentProcess(), reinterpret_cast<PPROCESS_MEMORY_COUNTERS>(&pmc), sizeof(pmc));
 	return static_cast<int64_t>(pmc.WorkingSetSize);
+#elif defined(__APPLE__)
+	return -1;
 #else
 	constexpr int BufferSize{128};
 	int64_t result = 0;
@@ -353,6 +357,8 @@ int64_t celero::GetRAMVirtualUsedByCurrentProcess()
 	PROCESS_MEMORY_COUNTERS_EX pmc;
 	GetProcessMemoryInfo(GetCurrentProcess(), reinterpret_cast<PPROCESS_MEMORY_COUNTERS>(&pmc), sizeof(pmc));
 	return pmc.PrivateUsage;
+#elif defined(__APPLE__)
+	return -1;
 #else
 	// Verified Correct.
 	constexpr int BufferSize{128};