1 files changed, 20 insertions, 38 deletions
diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc
index 162324e590..f00e9a04bf 100644
--- a/gnuradio-runtime/lib/buffer.cc
+++ b/gnuradio-runtime/lib/buffer.cc
@@ -23,7 +23,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-
+#include <algorithm>
 #include <gnuradio/buffer.h>
 #include <gnuradio/math.h>
 #include "vmcircbuf.h"
@@ -225,16 +225,16 @@ namespace gr {
   buffer::add_item_tag(const tag_t &tag)
   {
     gr::thread::scoped_lock guard(*mutex());
-    d_item_tags.push_back(tag);
+    d_item_tags.insert(std::pair<uint64_t,tag_t>(tag.offset,tag));
   }
 
   void
   buffer::remove_item_tag(const tag_t &tag, long id)
   {
     gr::thread::scoped_lock guard(*mutex());
-    for(std::deque<tag_t>::iterator it = d_item_tags.begin(); it != d_item_tags.end(); ++it) {
-      if(*it == tag) {
-	(*it).marked_deleted.push_back(id);
+    for(std::multimap<uint64_t,tag_t>::iterator it = d_item_tags.lower_bound(tag.offset); it != d_item_tags.upper_bound(tag.offset); ++it) {
+      if((*it).second == tag) {
+        (*it).second.marked_deleted.push_back(id);
       }
     }
   }
@@ -250,25 +250,9 @@ namespace gr {
        If this function is used elsewhere, remember to lock the
        buffer's mutex al la the scoped_lock line below.
     */
-    //gr::thread::scoped_lock guard(*mutex());
-    std::deque<tag_t>::iterator itr = d_item_tags.begin();
-
-    uint64_t item_time;
-
-    // Since tags are not guarenteed to be in any particular order, we
-    // need to erase here instead of pop_front. An erase in the middle
-    // invalidates all iterators; so this resets the iterator to find
-    // more. Mostly, we wil be erasing from the front and
-    // therefore lose little time this way.
-    while(itr != d_item_tags.end()) {
-      item_time = (*itr).offset;
-      if(item_time+d_max_reader_delay + bufsize() < max_time) {
-        d_item_tags.erase(itr);
-        itr = d_item_tags.begin();
-      }
-      else
-        itr++;
-    }
+    std::multimap<uint64_t, tag_t>::iterator end_itr = d_item_tags.lower_bound(max_time);
+    std::multimap<uint64_t, tag_t>::iterator begin_itr = d_item_tags.begin();
+    d_item_tags.erase(begin_itr, end_itr);
   }
 
   long
@@ -333,30 +317,28 @@ namespace gr {
   buffer_reader::get_tags_in_range(std::vector<tag_t> &v,
                                    uint64_t abs_start,
                                    uint64_t abs_end,
-				   long id)
+                                   long id)
   {
     gr::thread::scoped_lock guard(*mutex());
 
     v.resize(0);
-    std::deque<tag_t>::iterator itr = d_buffer->get_tags_begin();
+    std::multimap<uint64_t,tag_t>::iterator itr = d_buffer->get_tags_lower_bound(abs_start);
+    std::multimap<uint64_t,tag_t>::iterator itr_end   = d_buffer->get_tags_upper_bound(abs_end);
 
     uint64_t item_time;
-    while(itr != d_buffer->get_tags_end()) {
-      item_time = (*itr).offset + d_attr_delay;
-
+    while(itr != itr_end) {
+      item_time = (*itr).second.offset + d_attr_delay;
       if((item_time >= abs_start) && (item_time < abs_end)) {
-	std::vector<long>::iterator id_itr;
-	id_itr = std::find(itr->marked_deleted.begin(), itr->marked_deleted.end(), id);
-
+        std::vector<long>::iterator id_itr;
+        id_itr = std::find(itr->second.marked_deleted.begin(), itr->second.marked_deleted.end(), id);
         // If id is not in the vector of marked blocks
-	if(id_itr == itr->marked_deleted.end()) {
-          tag_t t = *itr;
+        if(id_itr == itr->second.marked_deleted.end()) {
+          tag_t t = (*itr).second;
           t.offset += d_attr_delay;
-	  v.push_back(t);
-	  v.back().marked_deleted.clear();
-	}
+          v.push_back(t);
+          v.back().marked_deleted.clear();
+        }
       }
-
       itr++;
     }
   }