diff options
Diffstat (limited to 'lib/gras_impl')
-rw-r--r-- | lib/gras_impl/bitset.hpp | 6 | ||||
-rw-r--r-- | lib/gras_impl/block_actor.hpp | 12 | ||||
-rw-r--r-- | lib/gras_impl/buffer_queue.hpp | 6 | ||||
-rw-r--r-- | lib/gras_impl/input_buffer_queues.hpp | 6 | ||||
-rw-r--r-- | lib/gras_impl/interruptible_thread.hpp | 6 | ||||
-rw-r--r-- | lib/gras_impl/messages.hpp | 54 | ||||
-rw-r--r-- | lib/gras_impl/output_buffer_queues.hpp | 4 | ||||
-rw-r--r-- | lib/gras_impl/token.hpp | 4 |
8 files changed, 49 insertions, 49 deletions
diff --git a/lib/gras_impl/bitset.hpp b/lib/gras_impl/bitset.hpp index 5ea2acb..7a2184f 100644 --- a/lib/gras_impl/bitset.hpp +++ b/lib/gras_impl/bitset.hpp @@ -17,10 +17,10 @@ #ifndef INCLUDED_LIBGRAS_IMPL_BITSET_HPP #define INCLUDED_LIBGRAS_IMPL_BITSET_HPP -#include <gnuradio/gras.hpp> +#include <gras/gras.hpp> #include <boost/dynamic_bitset.hpp> -namespace gnuradio +namespace gras { //! Its just dynamic bitset w/ the handle all() routine @@ -32,6 +32,6 @@ struct BitSet : boost::dynamic_bitset<> } }; -} //namespace gnuradio +} //namespace gras #endif /*INCLUDED_LIBGRAS_IMPL_BITSET_HPP*/ diff --git a/lib/gras_impl/block_actor.hpp b/lib/gras_impl/block_actor.hpp index d32c105..4ef71e8 100644 --- a/lib/gras_impl/block_actor.hpp +++ b/lib/gras_impl/block_actor.hpp @@ -19,10 +19,10 @@ #include <gras_impl/debug.hpp> #include <gras_impl/bitset.hpp> -#include <gnuradio/gras.hpp> -#include <gnuradio/block.hpp> -#include <gnuradio/top_block.hpp> -#include <gnuradio/thread_pool.hpp> +#include <gras/gras.hpp> +#include <gras/block.hpp> +#include <gras/top_block.hpp> +#include <gras/thread_pool.hpp> #include <Apology/Worker.hpp> #include <gras_impl/token.hpp> #include <gras_impl/messages.hpp> @@ -32,7 +32,7 @@ #include <vector> #include <set> -namespace gnuradio +namespace gras { static GRAS_FORCE_INLINE unsigned long myulround(const double x) @@ -201,6 +201,6 @@ struct BlockActor : Apology::Worker bool topology_init; }; -} //namespace gnuradio +} //namespace gras #endif /*INCLUDED_LIBGRAS_IMPL_BLOCK_ACTOR_HPP*/ diff --git a/lib/gras_impl/buffer_queue.hpp b/lib/gras_impl/buffer_queue.hpp index bde4986..5a9c28c 100644 --- a/lib/gras_impl/buffer_queue.hpp +++ b/lib/gras_impl/buffer_queue.hpp @@ -17,11 +17,11 @@ #ifndef INCLUDED_LIBGRAS_IMPL_BUFFER_QUEUE_HPP #define INCLUDED_LIBGRAS_IMPL_BUFFER_QUEUE_HPP -#include <gnuradio/sbuffer.hpp> +#include <gras/sbuffer.hpp> #include <boost/bind.hpp> #include <queue> -namespace gnuradio +namespace gras { struct BufferQueue : std::queue<SBuffer> @@ -54,6 +54,6 @@ struct BufferQueue : std::queue<SBuffer> SBufferToken _token; }; -} //namespace gnuradio +} //namespace gras #endif /*INCLUDED_LIBGRAS_IMPL_BUFFER_QUEUE_HPP*/ diff --git a/lib/gras_impl/input_buffer_queues.hpp b/lib/gras_impl/input_buffer_queues.hpp index d17c4f0..92bfb02 100644 --- a/lib/gras_impl/input_buffer_queues.hpp +++ b/lib/gras_impl/input_buffer_queues.hpp @@ -20,14 +20,14 @@ #include <gras_impl/debug.hpp> #include <gras_impl/bitset.hpp> #include <gras_impl/buffer_queue.hpp> -#include <gnuradio/sbuffer.hpp> +#include <gras/sbuffer.hpp> #include <vector> #include <queue> #include <deque> #include <cstring> //memcpy/memset #include <boost/circular_buffer.hpp> -namespace gnuradio +namespace gras { struct InputBufferQueues @@ -217,6 +217,6 @@ GRAS_FORCE_INLINE void InputBufferQueues::consume(const size_t i, const size_t b __update(i); } -} //namespace gnuradio +} //namespace gras #endif /*INCLUDED_LIBGRAS_IMPL_INPUT_BUFFERS_HPP*/ diff --git a/lib/gras_impl/interruptible_thread.hpp b/lib/gras_impl/interruptible_thread.hpp index 1cb9b64..5af9369 100644 --- a/lib/gras_impl/interruptible_thread.hpp +++ b/lib/gras_impl/interruptible_thread.hpp @@ -32,7 +32,7 @@ /*! * This is the only place you will find any threading stuff. - * The entire point here is that the source's in gnuradio + * The entire point here is that the source's in gras * are sometimed bad and block forever (the author is guilty too). * This thread pool creates an interruptible thread to perform work. * Everything is nice and synchronous with the block actor. @@ -40,7 +40,7 @@ * However, this will be interrupted and not block forever, * when the executor is told to stop/interrupt and wait/join. */ -namespace gnuradio +namespace gras { typedef boost::shared_ptr<boost::thread_group> SharedThreadGroup; @@ -138,6 +138,6 @@ namespace gnuradio boost::thread *_thread; }; -} //namespace gnuradio +} //namespace gras #endif /*INCLUDED_LIBGRAS_IMPL_INTERRUPTIBLE_THREAD_HPP*/ diff --git a/lib/gras_impl/messages.hpp b/lib/gras_impl/messages.hpp index 68c3392..d09a71c 100644 --- a/lib/gras_impl/messages.hpp +++ b/lib/gras_impl/messages.hpp @@ -17,12 +17,12 @@ #ifndef INCLUDED_LIBGRAS_IMPL_MESSAGES_HPP #define INCLUDED_LIBGRAS_IMPL_MESSAGES_HPP -#include <gnuradio/sbuffer.hpp> -#include <gnuradio/tags.hpp> -#include <gnuradio/sbuffer.hpp> +#include <gras/sbuffer.hpp> +#include <gras/tags.hpp> +#include <gras/sbuffer.hpp> #include <gras_impl/token.hpp> -namespace gnuradio +namespace gras { //---------------------------------------------------------------------- @@ -137,33 +137,33 @@ struct UpdateInputsMessage //empty }; -} //namespace gnuradio +} //namespace gras #include <Theron/Register.h> -#include <gnuradio/top_block.hpp> +#include <gras/top_block.hpp> #include <gras_impl/messages.hpp> #include <gras_impl/interruptible_thread.hpp> -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::TopAllocMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::TopActiveMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::TopInertMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::TopTokenMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::GlobalBlockConfig); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::SharedThreadGroup); - -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::InputTagMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::InputBufferMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::InputTokenMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::InputCheckMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::InputAllocMessage); - -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::OutputBufferMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::OutputTokenMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::OutputCheckMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::OutputHintMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::OutputAllocMessage); - -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::SelfKickMessage); -THERON_DECLARE_REGISTERED_MESSAGE(gnuradio::UpdateInputsMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::TopAllocMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::TopActiveMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::TopInertMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::TopTokenMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::GlobalBlockConfig); +THERON_DECLARE_REGISTERED_MESSAGE(gras::SharedThreadGroup); + +THERON_DECLARE_REGISTERED_MESSAGE(gras::InputTagMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::InputBufferMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::InputTokenMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::InputCheckMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::InputAllocMessage); + +THERON_DECLARE_REGISTERED_MESSAGE(gras::OutputBufferMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::OutputTokenMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::OutputCheckMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::OutputHintMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::OutputAllocMessage); + +THERON_DECLARE_REGISTERED_MESSAGE(gras::SelfKickMessage); +THERON_DECLARE_REGISTERED_MESSAGE(gras::UpdateInputsMessage); #endif /*INCLUDED_LIBGRAS_IMPL_MESSAGES_HPP*/ diff --git a/lib/gras_impl/output_buffer_queues.hpp b/lib/gras_impl/output_buffer_queues.hpp index 1f07af0..d876aa7 100644 --- a/lib/gras_impl/output_buffer_queues.hpp +++ b/lib/gras_impl/output_buffer_queues.hpp @@ -21,7 +21,7 @@ #include <vector> #include <boost/circular_buffer.hpp> -namespace gnuradio +namespace gras { template <typename T> @@ -100,6 +100,6 @@ struct OutputBufferQueues } }; -} //namespace gnuradio +} //namespace gras #endif /*INCLUDED_LIBGRAS_IMPL_OUTPUT_BUFFER_QUEUES_HPP*/ diff --git a/lib/gras_impl/token.hpp b/lib/gras_impl/token.hpp index db5f047..5cc634f 100644 --- a/lib/gras_impl/token.hpp +++ b/lib/gras_impl/token.hpp @@ -20,7 +20,7 @@ #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> -namespace gnuradio +namespace gras { typedef boost::weak_ptr<int> WeakToken; @@ -35,6 +35,6 @@ struct Token : boost::shared_ptr<int> } }; -} //namespace gnuradio +} //namespace gras #endif /*INCLUDED_LIBGRAS_IMPL_TOKEN_HPP*/ |