Changeset 8afe31 for molecuilder/src/helpers.cpp

Timestamp:

Oct 5, 2009, 4:05:53 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

58808e

Parents:

e1f6d7 (diff), bf497f (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' into ConvexHull

Conflicts:

.gitignore
molecuilder/src/Makefile.am
molecuilder/src/atom.cpp
molecuilder/src/tesselation.cpp

no serious overlaps, just a free Frees that were not present in ConcaveHull were MemoryAllocator class was added.

File:

• molecuilder/src/helpers.cpp (modified) (4 diffs, 1 prop)

molecuilder/src/helpers.cpp

@@ -6 +6 @@
 
 #include "helpers.hpp"
+#include "memoryusageobserver.hpp"
 
 /********************************************** helpful functions *********************************/
@@ -34 +35 @@
 void debug_in(const char *output, const char *file, const int line) {}  // print nothing
 #endif
-
-/** Wrapper for allocating'ing a memory range with *output if it fails.
- * \param size number of chars to alloc for \a *buffer
- * \param *output message if malloc fails
- * \return pointer to memory range
- */
-void * Malloc(size_t size, const char* output)
-{
-  void *buffer = NULL;
-  buffer = (void *)malloc(size); // alloc
-  if (buffer == NULL)
-    cout << Verbose(0) << "Malloc failed - pointer is NULL: " << output << endl;
-  return(buffer);
-};
-
-/** Wrapper for allocating'ing a memory range with *output if it fails.
- * \param size number of chars to alloc for \a *buffer
- * \param *output message if malloc fails
- * \return pointer to memory range
- */
-void * Calloc(size_t size, const char* output)
-{
-  void *buffer = NULL;
-  buffer = (void *)calloc(size, (size_t)0); // alloc
-  if (buffer == NULL)
-    cout << Verbose(0) << "Calloc failed - pointer is NULL: " << output << endl;
-  return(buffer);
-};
-
-/** Wrapper for reallocating'ing a memory range with *output if it fails.
- * \param *OldPointer pointer to old memory range
- * \param size number of chars to alloc for \a *buffer
- * \param *output message if malloc fails
- * \return pointer to memory range
- */
-void * ReAlloc(void * OldPointer, size_t size, const char* output)
-{
-  void *buffer = NULL;
-  if (OldPointer == NULL)
-    //cout << Verbose(0) << "ReAlloc impossible - old is NULL: " << output << endl;
-    buffer = (void *)malloc(size); // malloc
-  else
-    buffer = (void *)realloc(OldPointer, size); // realloc
-  if (buffer == NULL)
-    cout << Verbose(0) << "ReAlloc failed - new is NULL: " << output << endl;
-  return(buffer);
-};
-
-/** Wrapper for free'ing an allocated memory range with *output if it fails.
- * \param *buffer pointer to buffer to be free'd
- * \param *output message if free fails
- */
-void Free(void ** buffer, const char* output)
-{
-  if (*buffer == NULL) {
-    //cout << Verbose(5) << "Free not necesary: " << output << endl;
-  } else {
-    free(*buffer);
-    *buffer = NULL;
-  }
-};
-
-/** Malloc string array and set its length to the allocated length.
- * \param *output message if malloc fails
- * \param size number of chars to alloc for \a *buffer
- * \return pointer to string array
- */
-char* MallocString(size_t size, const char* output)
-{
-  size_t i;
-  char *buffer;
-  buffer = (char *)malloc(sizeof(char) * (size+1)); // alloc
-  if (buffer == NULL)
-    cout << Verbose(0) << output << endl;
-  for (i=size;i--;)  // reset
-    buffer[i] = i % 2 == 0 ? 'p': 'c';
-  buffer[size] = '\0'; // and set length marker on its end
-  return(buffer);
-}
 
 /** modulo operator for doubles.
@@ -170 +92 @@
   }
   // allocate string
-  returnstring = (char *) Malloc(sizeof(char)*(order+2), "FixedDigitNumber: *returnstring");
+  returnstring = Malloc<char>(order + 2, "FixedDigitNumber: *returnstring");
   // terminate  and fill string array from end backward
   returnstring[order] = '\0';
@@ -196 +118 @@
 };
 
+/**
+ * Allocates a memory range using malloc().
+ * Prints the provided error message in case of a failure.
+ *
+ * \param number of memory slices of type X to allocate
+ * \param failure message which is printed if the allocation fails
+ * \return pointer to the allocated memory range, will be NULL if a failure occurred
+ */
+template <> char* Malloc<char>(size_t size, const char* output)
+{
+  char* buffer = NULL;
+  buffer = (char*) malloc(sizeof(char) * (size + 1));
+  for (size_t i = size; i--;)
+    buffer[i] = (i % 2 == 0) ? 'p': 'c';
+  buffer[size] = '\0';
 
+  if (buffer != NULL) {
+    MemoryUsageObserver::getInstance()->addMemory(buffer, size);
+  } else {
+    cout << Verbose(0) << "Malloc for datatype " << typeid(char).name()
+      << " failed - pointer is NULL: " << output << endl;
+  }
+
+  return buffer;
+};
+
+