Changeset bf497f for molecuilder/src/memoryusageobserver.cpp

Timestamp:

Oct 5, 2009, 2:59:11 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

5dda23, 729279, 8afe31

Parents:

7794d8 (diff), 39d983 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ConcaveHull' of ​ssh://stud64d-02/home/metzler/workspace/espack into ConcaveHull

Conflicts:

molecuilder/src/builder.cpp
molecuilder/src/memoryusageobserver.cpp
molecuilder/src/memoryusageobserver.hpp
molecuilder/src/memoryusageobserverunittest.cpp
molecuilder/src/memoryusageobserverunittest.hpp

This conflict arised, because the #19 commit was already pushed to the server, but the commit was later "amended" locally. This is fixed, there were no real overlaps anyway.

File:

• molecuilder/src/memoryusageobserver.cpp (modified) (5 diffs)

molecuilder/src/memoryusageobserver.cpp

@@ -15 +15 @@
 MemoryUsageObserver::MemoryUsageObserver() {
   instance = NULL;
+  maximumSize = 0;
+  totalSize = 0;
 }
 
@@ -24 +26 @@
     memoryUsers.erase(current);
   }
+
+  maximumSize = 0;
+  totalSize = 0;
 }
 
@@ -57 +62 @@
  */
 void MemoryUsageObserver::addMemory(void* pointer, size_t size) {
+  // Memory might become reseized so we need to check whether the provided pointer is already tracked.
+  map<void*, size_t>::iterator current = memoryUsers.find(pointer);
+  if (current != memoryUsers.end()) {
+    totalSize -= current->second;
+  }
+
   memoryUsers[pointer] = size;
+  totalSize += size;
+  maximumSize = (totalSize > maximumSize) ? totalSize : maximumSize;
 }
 
@@ -74 +87 @@
   }
 
+  totalSize -= current->second;
   memoryUsers.erase(current);
 }
@@ -81 +95 @@
  */
 size_t MemoryUsageObserver::getUsedMemorySize() {
-  size_t totalSize = 0;
-
-  for (map<void*, size_t>::iterator current = memoryUsers.begin(); current != memoryUsers.end(); current++) {
-    totalSize += current->second;
-  }
-
   return totalSize;
 }
+
+/**
+ * Gets the maximum size of allocated memory until now.
+ */
+size_t MemoryUsageObserver::getMaximumUsedMemory() {
+  return maximumSize;
+}