From 04d5b7bfe1cb946483a2feda9aea0491e0a071e4 Mon Sep 17 00:00:00 2001
From: Peter Peterson <petersonpf@ornl.gov>
Date: Mon, 7 Feb 2011 14:23:04 +0000
Subject: [PATCH] Completely messed that one up. Commenting out the offending
code for the moment. Refs #2282.
---
Code/Mantid/Framework/Kernel/src/Memory.cpp | 38 ++++++++++-----------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/Code/Mantid/Framework/Kernel/src/Memory.cpp b/Code/Mantid/Framework/Kernel/src/Memory.cpp
index 38958848ce1..0e2a8a0a76a 100644
--- a/Code/Mantid/Framework/Kernel/src/Memory.cpp
+++ b/Code/Mantid/Framework/Kernel/src/Memory.cpp
@@ -217,25 +217,25 @@ void process_mem_system(size_t & sys_avail, size_t & sys_total)
//g_log.debug() << "Mac - Adding reserved but unused memory of " << unusedReserved << " KB\n";
sys_avail += unusedReserved;
#elif _WIN32
- MemoryInfo mi;
-
- GlobalMemoryStatusEx( &memStatus );
-
- if (memStatus.ullTotalPhys < memStatus.ullTotalVirtual)
- {
- mi.availMemory = static_cast<int>(memStatus.ullAvailPhys/1024);
- mi.totalMemory = static_cast<int>(memStatus.ullTotalPhys/1024);
- }
- else// All virtual memory will be physical, but a process cannot have more than TotalVirtual.
- {
- mi.availMemory = static_cast<int>(memStatus.ullAvailVirtual/1024);
- mi.totalMemory = static_cast<int>(memStatus.ullTotalVirtual/1024);
- }
-
- mi.freeRatio = static_cast<int>(100.0*mi.availMemory/mi.totalMemory);
- //g_log.debug() << "Percentage of memory taken to be available for use: "
- // << mi.freeRatio << "%.\n";
- return mi;
+// MemoryInfo mi;
+//
+// GlobalMemoryStatusEx( &memStatus );
+//
+// if (memStatus.ullTotalPhys < memStatus.ullTotalVirtual)
+// {
+// mi.availMemory = static_cast<int>(memStatus.ullAvailPhys/1024);
+// mi.totalMemory = static_cast<int>(memStatus.ullTotalPhys/1024);
+// }
+// else// All virtual memory will be physical, but a process cannot have more than TotalVirtual.
+// {
+// mi.availMemory = static_cast<int>(memStatus.ullAvailVirtual/1024);
+// mi.totalMemory = static_cast<int>(memStatus.ullTotalVirtual/1024);
+// }
+//
+// mi.freeRatio = static_cast<int>(100.0*mi.availMemory/mi.totalMemory);
+// //g_log.debug() << "Percentage of memory taken to be available for use: "
+// // << mi.freeRatio << "%.\n";
+// return mi;
#endif
}
--
GitLab