[Commit-gnuradio] [gnuradio] 07/16: runtime: speed up all the things

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 72e3da15f40e9fff5297f5134676063397035423
Author: Tim O'Shea <address@hidden>
Date:   Fri Sep 19 12:48:50 2014 -0400

    runtime: speed up all the things
---
 gnuradio-runtime/include/gnuradio/buffer.h | 2 ++
 gnuradio-runtime/lib/buffer.cc             | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnuradio-runtime/include/gnuradio/buffer.h 
b/gnuradio-runtime/include/gnuradio/buffer.h
index 305e778..c0c9f3d 100644
--- a/gnuradio-runtime/include/gnuradio/buffer.h
+++ b/gnuradio-runtime/include/gnuradio/buffer.h
@@ -127,6 +127,8 @@ namespace gr {
 
     std::multimap<uint64_t,tag_t>::iterator get_tags_begin() { return 
d_item_tags.begin(); }
     std::multimap<uint64_t,tag_t>::iterator get_tags_end() { return 
d_item_tags.end(); }
+    std::multimap<uint64_t,tag_t>::iterator get_tags_lower_bound(uint64_t x) { 
return d_item_tags.lower_bound(x); }
+    std::multimap<uint64_t,tag_t>::iterator get_tags_upper_bound(uint64_t x) { 
return d_item_tags.upper_bound(x); }
 
     // 
-------------------------------------------------------------------------
 
diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc
index 5ab8694..f2168f4 100644
--- a/gnuradio-runtime/lib/buffer.cc
+++ b/gnuradio-runtime/lib/buffer.cc
@@ -232,8 +232,7 @@ namespace gr {
   buffer::remove_item_tag(const tag_t &tag, long id)
   {
     gr::thread::scoped_lock guard(*mutex());
-// TODO: we can probably do this more efficiently now ...
-    for(std::multimap<uint64_t,tag_t>::iterator it = d_item_tags.begin(); it 
!= d_item_tags.end(); ++it) {
+    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);
       }
@@ -326,10 +325,11 @@ namespace gr {
     gr::thread::scoped_lock guard(*mutex());
 
     v.resize(0);
-    std::multimap<uint64_t,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()) {
+    while(itr != itr_end) {
       item_time = (*itr).second.offset + d_attr_delay;
       //item_time = (*itr).offset + d_attr_delay;