Changeset 17228 for trunk/Mars

Timestamp:

10/16/13 20:51:19 (11 years ago)

Author:

tbretz

Message:

Adapted to changes in Queue; Compression queues do not need sorting... first-in-first-out is always correct

File:

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

trunk/Mars/mcore/zofits.h

@@ -25 +25 @@
 class zofits : public ofits
 {
-    public:
+        template<class S>
+        struct QueueMin : std::list<S>
+        {
+            typename std::list<S>::iterator begin()
+            {
+                return min_element(std::list<S>::begin(), std::list<S>::end());
+            }
+        };
 
         struct WriteTarget
@@ -33 +40 @@
                 return tile_num < other.tile_num;
             }
+
             uint32_t tile_num;
             uint32_t size;
@@ -40 +48 @@
         struct CompressionTarget
         {
+            /*
             bool operator < (const CompressionTarget& other)
             {
                 return target < other.target;
-            }
+            }*/
+
             shared_ptr<MemoryChunk> src;
             shared_ptr<MemoryChunk> transposed_src;
@@ -50 +60 @@
         };
 
-
+public:
         //constructors
         zofits(uint32_t numTiles=1000,
@@ -56 +66 @@
                uint64_t maxUsableMem=0) : ofits(),
                                           fMemPool(0, maxUsableMem),
-                                          fWriteToDiskQueue(bind(&zofits::WriteBufferToDisk, this, placeholders::_1), true, false)
+                                          fWriteToDiskQueue(bind(&zofits::WriteBufferToDisk, this, placeholders::_1), false)
         {
             InitMemberVariables(numTiles, rowPerTile, maxUsableMem);
@@ -67 +77 @@
                uint64_t maxUsableMem=0) : ofits(fname),
                                           fMemPool(0, maxUsableMem),
-                                          fWriteToDiskQueue(bind(&zofits::WriteBufferToDisk, this, placeholders::_1), true, false)
+                                          fWriteToDiskQueue(bind(&zofits::WriteBufferToDisk, this, placeholders::_1), false)
         {
             InitMemberVariables(numTiles, rowPerTile, maxUsableMem);
@@ -578 +588 @@
 
             //cannot be const, as resize does not want it that way
-            Queue<CompressionTarget> queue(bind(&zofits::CompressBuffer, this, placeholders::_1), false, false);
+            Queue<CompressionTarget> queue(bind(&zofits::CompressBuffer, this, placeholders::_1), false);
 
             //shrink
@@ -875 +885 @@
 
         //thread related stuff
-        vector<Queue<CompressionTarget>> fCompressionQueues;
-        Queue<WriteTarget>               fWriteToDiskQueue;
+        vector<Queue<CompressionTarget>>          fCompressionQueues;
+        Queue<WriteTarget, QueueMin<WriteTarget>> fWriteToDiskQueue;
 
         //thread related stuff