0.9.5 preview1

source/Memory.cpp

@@ -1,60 +1,54 @@
-#include <map>
-#include <renderd7/Memory.hpp>
-
-static RenderD7::Memory::memory_metrics metrics;
-
-bool rd7_enable_memtrack;
-
-void *operator new(size_t size) {
-  void *ptr = malloc(size);
-  if (rd7_enable_memtrack)
-    metrics.t_TotalAllocated += size;
-  return ptr;
-}
-
-void operator delete(void *memory, size_t size) {
-  if (rd7_enable_memtrack)
-    metrics.t_TotalFreed += size;
-  free(memory);
-}
-
-int allocations = 0;
-int total_size = 0;
-std::map<void *, size_t> sizes;
-
-void *operator new[](size_t size) {
-  if (rd7_enable_memtrack)
-    allocations++;
-  if (rd7_enable_memtrack)
-    total_size += size;
-  void *ptr = malloc(size);
-  if (rd7_enable_memtrack)
-    sizes[ptr] = size;
-  if (rd7_enable_memtrack)
-    metrics.t_TotalAllocated += size;
-  return ptr;
-}
-
-void operator delete[](void *ptr) {
-  if (rd7_enable_memtrack)
-    allocations--;
-  if (rd7_enable_memtrack)
-    total_size -= sizes[ptr];
-  if (rd7_enable_memtrack)
-    metrics.t_TotalFreed += sizes[ptr];
-  if (rd7_enable_memtrack)
-    sizes.erase(ptr);
-  free(ptr);
-}
-
-namespace RenderD7 {
-
-namespace Memory {
-
-size_t GetTotalAllocated() { return metrics.t_TotalAllocated; }
-
-size_t GetTotalFreed() { return metrics.t_TotalFreed; }
-
-size_t GetCurrent() { return metrics.t_CurrentlyAllocated(); }
-} // namespace Memory
-} // namespace RenderD7
+#include <cstdlib>
+#include <map>
+#include <renderd7/Memory.hpp>
+
+static RenderD7::Memory::memory_metrics metrics;
+
+bool rd7_enable_memtrack;
+
+#ifdef RENDERD7_MEMTRACK
+void *operator new(size_t size) {
+  void *ptr = malloc(size);
+  if (rd7_enable_memtrack) metrics.t_TotalAllocated += size;
+  return ptr;
+}
+
+void operator delete(void *memory, size_t size) {
+  if (rd7_enable_memtrack) metrics.t_TotalFreed += size;
+  free(memory);
+}
+
+int allocations = 0;
+int total_size = 0;
+std::map<void *, size_t> sizes;
+
+void *operator new[](size_t size) {
+  if (rd7_enable_memtrack) allocations++;
+  if (rd7_enable_memtrack) total_size += size;
+  void *ptr = malloc(size);
+  if (rd7_enable_memtrack) sizes[ptr] = size;
+  if (rd7_enable_memtrack) metrics.t_TotalAllocated += size;
+  return ptr;
+}
+
+void operator delete[](void *ptr) {
+  if (rd7_enable_memtrack) allocations--;
+  if (rd7_enable_memtrack) total_size -= sizes[ptr];
+  if (rd7_enable_memtrack) metrics.t_TotalFreed += sizes[ptr];
+  if (rd7_enable_memtrack) sizes.erase(ptr);
+  free(ptr);
+}
+
+#endif
+
+namespace RenderD7 {
+
+namespace Memory {
+
+size_t GetTotalAllocated() { return metrics.t_TotalAllocated; }
+
+size_t GetTotalFreed() { return metrics.t_TotalFreed; }
+
+size_t GetCurrent() { return metrics.t_CurrentlyAllocated(); }
+}  // namespace Memory
+}  // namespace RenderD7