Changeset 17677 for trunk/Mars

Timestamp:

04/18/14 22:00:37 (11 years ago)

Author:

tbretz

Message:

Fixed the last fix... using a variable type which allows hundreds of terabytes to be allocated is for sure no option. Actually, restricting the amount of memory which can be allocated is a feature not a problem. The correct way to fix the problem is to properly cast the variable before it is converted from kB to Byte.

File:

• trunk/Mars/mcore/zofits.h (modified) (5 diffs)

trunk/Mars/mcore/zofits.h

@@ -81 +81 @@
         /// static setter for the default number of threads to use. -1 means all available physical cores
         static uint32_t DefaultNumThreads(const uint32_t &_n=-2) { static uint32_t n=0; if (int32_t(_n)<-1) n=_n; return n; }
-        static uint64_t DefaultMaxMemory(const uint64_t &_n=0) { static uint64_t n=1000000; if (_n>0) n=_n; return n; }
+        static uint32_t DefaultMaxMemory(const uint32_t &_n=0) { static uint32_t n=1000000; if (_n>0) n=_n; return n; }
         static uint32_t DefaultMaxNumTiles(const uint32_t &_n=0) { static uint32_t n=1000; if (_n>0) n=_n; return n; }
         static uint32_t DefaultNumRowsPerTile(const uint32_t &_n=0) { static uint32_t n=100; if (_n>0) n=_n; return n; }
@@ -91 +91 @@
         zofits(uint32_t numTiles    = DefaultMaxNumTiles(),
                uint32_t rowPerTile  = DefaultNumRowsPerTile(),
-               uint64_t maxUsableMem= DefaultMaxMemory()) : ofits(),
-            fMemPool(0, maxUsableMem*1000),
+               uint32_t maxUsableMem= DefaultMaxMemory()) : ofits(),
+            fMemPool(0, size_t(maxUsableMem)*1000),
             fWriteToDiskQueue(std::bind(&zofits::WriteBufferToDisk, this, std::placeholders::_1), false)
         {
@@ -106 +106 @@
                uint32_t numTiles    = DefaultMaxNumTiles(),
                uint32_t rowPerTile  = DefaultNumRowsPerTile(),
-               uint64_t maxUsableMem= DefaultMaxMemory()) : ofits(fname),
+               uint32_t maxUsableMem= DefaultMaxMemory()) : ofits(fname),
                    fMemPool(0, maxUsableMem*1000),
                    fWriteToDiskQueue(std::bind(&zofits::WriteBufferToDisk, this, std::placeholders::_1), false)
@@ -155 +155 @@
                 //start the compression queues
                 for (auto it=fCompressionQueues.begin(); it!= fCompressionQueues.end(); it++)
-                {
                     it->start();
-                }
+
                 //start the disk writer
                 fWriteToDiskQueue.start();
@@ -536 +535 @@
 
         /// Overload of the ofits method. Just calls the zofits specific one with default, uncompressed options for this column
-        bool AddColumn(uint32_t cnt,
-                       char typechar,
-                       const std::string& name,
-                       const std::string& unit,
-                       const std::string& comment="",
-                       bool addHeaderKeys=true)
+        bool AddColumn(uint32_t cnt, char typechar, const std::string& name, const std::string& unit,
+                       const std::string& comment="", bool addHeaderKeys=true)
         {
             return AddColumn(FITS::kFactRaw, cnt, typechar, name, unit, comment, addHeaderKeys);