bugfix: BufferingAgent

pelican · May 5, 2015 · 64f4041 · 64f4041
1 parent 5370e55
commit 64f4041
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/lib/BufferingAgent.h b/src/lib/BufferingAgent.h
@@ -39,7 +39,7 @@ class BufferingAgent : public QThread
         unsinged int _max_queue_length;
         bool _halt;
         pelican::AbstractDataClient& _client;
-        std::deque<DataBlobHash&> _queue; // objects ready for serving
+        std::deque<DataBlobHash*> _queue; // objects ready for serving
         QList<DataBlobHash> _buffer_objects;
         LockingContainer<DataBlobHash> _buffer;
 };

diff --git a/src/lib/src/BufferingAgent.cpp b/src/lib/src/BufferingAgent.cpp
@@ -20,7 +20,8 @@ BufferingAgent::BufferingAgent(AbstractDataClient& client)
 
 BufferingAgent::~BufferingAgent()
 {
-    _halt = false;
+    _halt = true;
+    if(_!queue.empty()) _buffer.unlock(_queue.front()); // ensure to remove any block 
 }
 
 void BufferingAgent::run() {
@@ -30,7 +31,7 @@ void BufferingAgent::run() {
         DataBlobHash& hash = *(_buffer->next()); // blocks until ready
         if(_halt) return;
         _client.getData(hash);
-        _queue.push_back(hash);
+        _queue.push_back(&hash);
     }
 }
 
@@ -39,8 +40,8 @@ void BufferingAgent::getData(DataBlobHash& hash) {
     do{}
     while(_queue.empty());
 
-    hash.swap(_queue.front()); // TODO verify this is doing what we think its doing
-    _buffer.unlock(&(_queue.front()));
+    hash.swap(*_queue.front()); // TODO verify this is doing what we think its doing
+    _buffer.unlock(_queue.front());
     _queue.pop_front();
 }