FormatBytes 추가.

TestApp1/TestApp1.cpp

@@ -7,6 +7,43 @@
 
 #include <DK.h>
 
+auto FormatBytes(size_t size, int maxDigits=3)->DKString
+{
+	if (size > 1)
+	{
+		maxDigits = Clamp(maxDigits, 1, 4);
+
+		const char* suffixList[7] = { "Bytes","KB","MB","GB","TB","PB","EB" };
+		int suffixIndex = 0;
+		while (size >= 1024000 && suffixIndex < 6)
+		{
+			suffixIndex++;
+			size = size >> 10;
+		}
+		double s = static_cast<double>(size);
+		if (size >= 1000 && suffixIndex < 6)
+		{
+			s = s / 1024.0;
+			suffixIndex++;
+		}
+		if (suffixIndex > 0)
+		{
+			int numDigits = [](int s)->int
+			{
+				int n = 0;
+				while (s > 0)
+				{
+					n++;
+					s /= 10;
+				}
+				return Max(n, 1);
+			}(s);
+			return DKString::Format("%.*f %s", Clamp<int>(maxDigits - numDigits, 0, 3), s, suffixList[suffixIndex]);
+		}
+		return DKString::Format("%d %s", int(size), suffixList[0]);
+	}
+	return DKString::Format("%d Byte", int(size));
+};
 
 class TestApp1 : public DKApplication
 {
@@ -38,15 +75,15 @@ public:
 		{
 			if (buckets[i].totalChunks > 0)
 			{
-				DKLogI("--> %lu: allocated:%lu, reserved:%.1fKB. (usage:%.1f%%)",
+				DKLogI("--> %lu: allocated:%lu, reserved:%ls. (usage:%.1f%%)",
 					buckets[i].chunkSize,
 					buckets[i].chunkSize * buckets[i].usedChunks,
-					double(buckets[i].chunkSize * (buckets[i].totalChunks - buckets[i].usedChunks)) / 1024.0,
+					(const wchar_t*)FormatBytes(buckets[i].chunkSize * (buckets[i].totalChunks - buckets[i].usedChunks)),
 					double(buckets[i].usedChunks) / double(buckets[i].totalChunks) * 100.0);
 				usedBytes += buckets[i].chunkSize * buckets[i].usedChunks;
 			}
 		}
-		DKLogI("MemoryPool Usage: %.1fMB / %.1fMB", double(usedBytes) / (1024 * 1024), double(DKMemoryPoolSize()) / (1024 * 1024));
+		DKLogI("MemoryPool Usage: %ls / %ls", (const wchar_t*)FormatBytes(usedBytes), (const wchar_t*)FormatBytes(DKMemoryPoolSize()));
 		delete[] buckets;
 	}
 };

TestApp1/TestApp1.vcxproj

@@ -22,7 +22,7 @@
     <ProjectGuid>{AE0AF61D-F069-4AFA-AE24-A75C6A233B37}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>TestApp1</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">