diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| m--------- | PMC | 0 | ||||
| m--------- | gnuradio | 0 | ||||
| -rw-r--r-- | include/gras/block.hpp | 4 | ||||
| -rw-r--r-- | include/gras/gras.hpp | 8 | ||||
| -rw-r--r-- | include/gras/tags.hpp | 5 | ||||
| -rw-r--r-- | lib/block.cpp | 4 | ||||
| -rw-r--r-- | lib/gras_impl/block_actor.hpp | 4 | ||||
| -rw-r--r-- | lib/tags.cpp | 2 |
9 files changed, 17 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 76c77c2..2adbf91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) add_definitions(-fvisibility-inlines-hidden) endif() -add_definitions(-DGRAS_DLL=1) #this project builds a dll - ######################################################################## # Component names for install rules ######################################################################## diff --git a/PMC b/PMC -Subproject 9b1a940929eb73e226d4c3725ee4e95c86e41e8 +Subproject e852910380fc76eddf360782edd4de6d1c3feb0 diff --git a/gnuradio b/gnuradio -Subproject d1b3266170e47b6624f8aeb94e48f4be512b608 +Subproject 89a594a8e3948407e6dbd2f566398681c59a99b diff --git a/include/gras/block.hpp b/include/gras/block.hpp index 25d2993..30d7ce4 100644 --- a/include/gras/block.hpp +++ b/include/gras/block.hpp @@ -182,9 +182,9 @@ struct GRAS_API Block : Element * Deal with tag handling and tag configuration ******************************************************************/ - uint64_t nitems_read(const size_t which_input); + item_index_t nitems_read(const size_t which_input); - uint64_t nitems_written(const size_t which_output); + item_index_t nitems_written(const size_t which_output); //! Send a tag to the downstream on the given output port void post_output_tag(const size_t which_output, const Tag &tag); diff --git a/include/gras/gras.hpp b/include/gras/gras.hpp index bbeffba..ebf1d75 100644 --- a/include/gras/gras.hpp +++ b/include/gras/gras.hpp @@ -37,6 +37,8 @@ #endif #endif +#define GRAS_DLL //always build a dll + // Now we use the generic helper definitions above to define GRAS_API and GRAS_LOCAL. // GRAS_API is used for the public API symbols. It either DLL imports or DLL exports (or does nothing for static build) // GRAS_LOCAL is used for non-api symbols. @@ -66,4 +68,10 @@ #define GRAS_FORCE_INLINE inline #endif +namespace gras +{ + //! Typedef for absolute item indexes + typedef unsigned long long item_index_t; +} + #endif /*INCLUDED_GRAS_GRAS_HPP*/ diff --git a/include/gras/tags.hpp b/include/gras/tags.hpp index 9faa667..169957c 100644 --- a/include/gras/tags.hpp +++ b/include/gras/tags.hpp @@ -20,7 +20,6 @@ #include <gras/gras.hpp> #include <boost/operators.hpp> #include <PMC/PMC.hpp> -#include <boost/cstdint.hpp> namespace gras { @@ -31,10 +30,10 @@ struct GRAS_API Tag : boost::less_than_comparable<Tag> Tag(void); //! Make a tag from parameters to initialize the members - Tag(const uint64_t &offset, const PMCC &key, const PMCC &value, const PMCC &srcid = PMCC()); + Tag(const item_index_t &offset, const PMCC &key, const PMCC &value, const PMCC &srcid = PMCC()); //! the absolute item count associated with this tag - boost::uint64_t offset; + item_index_t offset; //! A symbolic name identifying the type of tag PMCC key; diff --git a/lib/block.cpp b/lib/block.cpp index 578b03e..6879700 100644 --- a/lib/block.cpp +++ b/lib/block.cpp @@ -111,12 +111,12 @@ void Block::produce(const size_t which_output, const size_t how_many_items) (*this)->block->produce(which_output, how_many_items); } -uint64_t Block::nitems_read(const size_t which_input) +item_index_t Block::nitems_read(const size_t which_input) { return (*this)->block->items_consumed[which_input]; } -uint64_t Block::nitems_written(const size_t which_output) +item_index_t Block::nitems_written(const size_t which_output) { return (*this)->block->items_produced[which_output]; } diff --git a/lib/gras_impl/block_actor.hpp b/lib/gras_impl/block_actor.hpp index 93e3a2f..8b1b967 100644 --- a/lib/gras_impl/block_actor.hpp +++ b/lib/gras_impl/block_actor.hpp @@ -126,8 +126,8 @@ struct BlockActor : Apology::Worker std::vector<OutputPortConfig> output_configs; //keeps track of production - std::vector<uint64_t> items_consumed; - std::vector<uint64_t> items_produced; + std::vector<item_index_t> items_consumed; + std::vector<item_index_t> items_produced; //work buffers for the new work interface Block::InputItems input_items; diff --git a/lib/tags.cpp b/lib/tags.cpp index a837c24..23e11b9 100644 --- a/lib/tags.cpp +++ b/lib/tags.cpp @@ -24,7 +24,7 @@ Tag::Tag(void): //NOP } -Tag::Tag(const uint64_t &offset, const PMCC &key, const PMCC &value, const PMCC &srcid): +Tag::Tag(const item_index_t &offset, const PMCC &key, const PMCC &value, const PMCC &srcid): offset(offset), key(key), value(value), srcid(srcid) { //NOP |