uhd: change bounded_buffer implementation and code using it

The bounded buffer now uses the detail idiom to hide implementation to inline better.
The whole sptr/make idiom was removed from bounded buffer to just construct directly.
The code using bounded buffer was changed for the new api:
replaces access operators and calls to the factory function.

3 files changed, 17 insertions, 18 deletions

diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
index 246df93eb..e1b671811 100644
--- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp
+++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
@@ -39,7 +39,7 @@ public:
     soft_time_ctrl_impl(const cb_fcn_type &stream_on_off):
         _nsamps_remaining(0),
         _stream_mode(stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS),
-        _cmd_queue(bounded_buffer<boost::any>::make(2)),
+        _cmd_queue(2),
         _stream_on_off(stream_on_off)
     {
         //synchronously spawn a new thread
@@ -112,7 +112,7 @@ public:
     }
 
     void issue_stream_cmd(const stream_cmd_t &cmd){
-        _cmd_queue->push_with_wait(cmd);
+        _cmd_queue.push_with_wait(cmd);
     }
 
     void stream_on_off(bool enb){
@@ -180,7 +180,7 @@ public:
         try{
             boost::any cmd;
             while (true){
-                _cmd_queue->pop_with_wait(cmd);
+                _cmd_queue.pop_with_wait(cmd);
                 recv_cmd_handle_cmd(boost::any_cast<stream_cmd_t>(cmd));
             }
         } catch(const boost::thread_interrupted &){}
@@ -191,7 +191,7 @@ private:
     size_t _nsamps_remaining;
     stream_cmd_t::stream_mode_t _stream_mode;
     time_spec_t _time_offset;
-    bounded_buffer<boost::any>::sptr _cmd_queue;
+    bounded_buffer<boost::any> _cmd_queue;
     const cb_fcn_type _stream_on_off;
     boost::thread_group _thread_group;
 };
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index 4d8074e70..36012bcfb 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -114,7 +114,7 @@ struct usrp2_impl::io_impl{
         xports(xports),
         packet_handler_recv_state(xports.size()),
         packet_handler_send_state(xports.size()),
-        async_msg_fifo(bounded_buffer<async_metadata_t>::make(100/*messages deep*/))
+        async_msg_fifo(100/*messages deep*/)
     {
         for (size_t i = 0; i < xports.size(); i++){
             fc_mons.push_back(flow_control_monitor::sptr(
@@ -177,7 +177,7 @@ struct usrp2_impl::io_impl{
     void recv_pirate_loop(zero_copy_if::sptr, usrp2_mboard_impl::sptr, size_t);
     boost::thread_group recv_pirate_crew;
     bool recv_pirate_crew_raiding;
-    bounded_buffer<async_metadata_t>::sptr async_msg_fifo;
+    bounded_buffer<async_metadata_t> async_msg_fifo;
     boost::mutex spawn_mutex;
 };
 
@@ -230,7 +230,7 @@ void usrp2_impl::io_impl::recv_pirate_loop(
                 //print the famous U, and push the metadata into the message queue
                 if (metadata.event_code & underflow_flags) std::cerr << "U" << std::flush;
                 //else std::cout << "metadata.event_code " << metadata.event_code << std::endl;
-                async_msg_fifo->push_with_pop_on_full(metadata);
+                async_msg_fifo.push_with_pop_on_full(metadata);
             }
             else{
                 //TODO unknown received packet, may want to print error...
@@ -276,7 +276,7 @@ bool usrp2_impl::recv_async_msg(
     async_metadata_t &async_metadata, double timeout
 ){
     boost::this_thread::disable_interruption di; //disable because the wait can throw
-    return _io_impl->async_msg_fifo->pop_with_timed_wait(async_metadata, timeout);
+    return _io_impl->async_msg_fifo.pop_with_timed_wait(async_metadata, timeout);
 }
 
 /***********************************************************************
diff --git a/host/lib/usrp/usrp_e100/io_impl.cpp b/host/lib/usrp/usrp_e100/io_impl.cpp
index 2388482c7..c8b9e03d9 100644
--- a/host/lib/usrp/usrp_e100/io_impl.cpp
+++ b/host/lib/usrp/usrp_e100/io_impl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010-2011 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -54,8 +54,8 @@ struct usrp_e100_impl::io_impl{
     bool continuous_streaming;
     io_impl(usrp_e100_iface::sptr iface):
         data_xport(usrp_e100_make_mmap_zero_copy(iface)),
-        recv_pirate_booty(recv_booty_type::make(data_xport->get_num_recv_frames())),
-        async_msg_fifo(bounded_buffer<async_metadata_t>::make(100/*messages deep*/))
+        recv_pirate_booty(data_xport->get_num_recv_frames()),
+        async_msg_fifo(100/*messages deep*/)
     {
         /* NOP */
     }
@@ -69,14 +69,13 @@ struct usrp_e100_impl::io_impl{
     bool get_recv_buffs(vrt_packet_handler::managed_recv_buffs_t &buffs, double timeout){
         UHD_ASSERT_THROW(buffs.size() == 1);
         boost::this_thread::disable_interruption di; //disable because the wait can throw
-        return recv_pirate_booty->pop_with_timed_wait(buffs.front(), timeout);
+        return recv_pirate_booty.pop_with_timed_wait(buffs.front(), timeout);
     }
 
     //a pirate's life is the life for me!
     void recv_pirate_loop(usrp_e100_clock_ctrl::sptr);
-    typedef bounded_buffer<managed_recv_buffer::sptr> recv_booty_type;
-    recv_booty_type::sptr recv_pirate_booty;
-    bounded_buffer<async_metadata_t>::sptr async_msg_fifo;
+    bounded_buffer<managed_recv_buffer::sptr> recv_pirate_booty;
+    bounded_buffer<async_metadata_t> async_msg_fifo;
     boost::thread_group recv_pirate_crew;
     bool recv_pirate_crew_raiding;
 };
@@ -124,12 +123,12 @@ void usrp_e100_impl::io_impl::recv_pirate_loop(usrp_e100_clock_ctrl::sptr clock_
 
                 //print the famous U, and push the metadata into the message queue
                 if (metadata.event_code & underflow_flags) std::cerr << "U" << std::flush;
-                async_msg_fifo->push_with_pop_on_full(metadata);
+                async_msg_fifo.push_with_pop_on_full(metadata);
                 continue;
             }
 
             //same number of frames as the data transport -> always immediate
-            recv_pirate_booty->push_with_wait(buff);
+            recv_pirate_booty.push_with_wait(buff);
 
         }catch(const std::exception &e){
             std::cerr << "Error (usrp-e recv pirate loop): " << e.what() << std::endl;
@@ -266,5 +265,5 @@ bool usrp_e100_impl::recv_async_msg(
     async_metadata_t &async_metadata, double timeout
 ){
     boost::this_thread::disable_interruption di; //disable because the wait can throw
-    return _io_impl->async_msg_fifo->pop_with_timed_wait(async_metadata, timeout);
+    return _io_impl->async_msg_fifo.pop_with_timed_wait(async_metadata, timeout);
 }