Changeset 17250 for trunk

Timestamp:

10/18/13 13:28:43 (11 years ago)

Author:

tbretz

Message:

Updated exception handling to make Mars happy.

File:

• trunk/Mars/mcore/MemoryManager.h (modified) (2 diffs)

trunk/Mars/mcore/MemoryManager.h

@@ -21 +21 @@
 
 public:
-    MemoryStock(size_t chunk, size_t max) : fChunkSize(chunk), fMaxMemory(max),
+    MemoryStock(size_t chunk, size_t max) : fChunkSize(chunk), fMaxMemory(max<chunk?chunk:max),
         fInUse(0), fAllocated(0), fMaxInUse(0)
     {
-        if (chunk>max)
-            throw std::runtime_error("Size mismatch: Size of a single chunk exceeds maximum size of memory");
     }
 
@@ -138 +136 @@
 
     size_t getChunkSize() const { return fMemoryStock->fChunkSize; }
-    void   setChunkSize(const size_t size)
+    bool   setChunkSize(const size_t size)
     {
-        if (getInUse() != 0)
+#ifdef __EXCEPTIONS
+        if (getInUse())
             throw std::runtime_error("Cannot change the chunk size while there is memory in use");
+        if (getMaxMemory()<size)
+            throw std::runtime_error("Chunk size("+to_string(size)+") larger thann allowed memory ("+to_string(getMaxMemory())+")");
+#else
+        if (getInUse() || getMaxMemory()<size)
+            return false;
 
-        if (getMaxMemory() < size)
-        {
-            std::ostringstream str;
-            str << "Chunk size(" << size << ") larger thank allowed memory(" << getMaxMemory() << "). Cannot allocate a single chunk.";
-            throw std::runtime_error(str.str());
-        }
         fMemoryStock->fChunkSize = size;
+        return true;
     }
+
     size_t getMaxMemory() const { return fMemoryStock->fMaxMemory; }
     size_t getInUse() const { return fMemoryStock->fInUse; }