diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2019-08-07 21:45:12 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-08-09 23:04:28 +0200 |
| commit | f7bbf2c1d8d780294f3e016aff239ca35eb6516e (patch) | |
| tree | e09ab6112e02b2215b2d59ac24d3d6ea2edac745 /gr-blocks/lib/vector_insert_impl.cc | |
| parent | 78431dc6941e3acc67c858277dfe4a0ed583643c (diff) | |
Tree: clang-format without the include sorting
Diffstat (limited to 'gr-blocks/lib/vector_insert_impl.cc')
| -rw-r--r-- | gr-blocks/lib/vector_insert_impl.cc | 145 |
1 files changed, 76 insertions, 69 deletions
diff --git a/gr-blocks/lib/vector_insert_impl.cc b/gr-blocks/lib/vector_insert_impl.cc index a39b0779ac..8f13dfa421 100644 --- a/gr-blocks/lib/vector_insert_impl.cc +++ b/gr-blocks/lib/vector_insert_impl.cc @@ -33,93 +33,100 @@ #include <stdio.h> namespace gr { - namespace blocks { +namespace blocks { - template <class T> - typename vector_insert<T>::sptr - vector_insert<T>::make(const std::vector<T> &data, int periodicity, int offset) - { - return gnuradio::get_initial_sptr - (new vector_insert_impl<T> (data, periodicity, offset)); - } +template <class T> +typename vector_insert<T>::sptr +vector_insert<T>::make(const std::vector<T>& data, int periodicity, int offset) +{ + return gnuradio::get_initial_sptr( + new vector_insert_impl<T>(data, periodicity, offset)); +} - template <class T> - vector_insert_impl<T>::vector_insert_impl(const std::vector<T> &data, - int periodicity, int offset) +template <class T> +vector_insert_impl<T>::vector_insert_impl(const std::vector<T>& data, + int periodicity, + int offset) : block("vector_insert", - io_signature::make(1, 1, sizeof(T)), - io_signature::make(1, 1, sizeof(T))), + io_signature::make(1, 1, sizeof(T)), + io_signature::make(1, 1, sizeof(T))), d_data(data), d_offset(offset), d_periodicity(periodicity) - { - this->set_tag_propagation_policy(gr::block::TPP_DONT); // handle tags manually - // some sanity checks - assert(offset < periodicity); - assert(offset >= 0); - assert((size_t)periodicity > data.size()); - } +{ + this->set_tag_propagation_policy(gr::block::TPP_DONT); // handle tags manually + // some sanity checks + assert(offset < periodicity); + assert(offset >= 0); + assert((size_t)periodicity > data.size()); +} - template <class T> - vector_insert_impl<T>::~vector_insert_impl() - {} +template <class T> +vector_insert_impl<T>::~vector_insert_impl() +{ +} - template <class T> - int - vector_insert_impl<T> ::general_work(int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) - { - T *out = (T *)output_items[0]; - const T *in = (const T *)input_items[0]; +template <class T> +int vector_insert_impl<T>::general_work(int noutput_items, + gr_vector_int& ninput_items, + gr_vector_const_void_star& input_items, + gr_vector_void_star& output_items) +{ + T* out = (T*)output_items[0]; + const T* in = (const T*)input_items[0]; - int ii(0), oo(0); + int ii(0), oo(0); - while((oo < noutput_items) && (ii < ninput_items[0])) { - //printf("oo = %d, ii = %d, d_offset = %d, noutput_items = %d, ninput_items[0] = %d", oo, ii, d_offset, noutput_items, ninput_items[0]); - //printf(", d_periodicity = %d\n", d_periodicity); + while ((oo < noutput_items) && (ii < ninput_items[0])) { + // printf("oo = %d, ii = %d, d_offset = %d, noutput_items = %d, ninput_items[0] = + // %d", oo, ii, d_offset, noutput_items, ninput_items[0]); printf(", d_periodicity + // = %d\n", d_periodicity); - if(d_offset >= ((int)d_data.size())) { // if we are in the copy region - int max_copy = std::min(std::min(noutput_items - oo, ninput_items[0] - ii), - d_periodicity - d_offset); - std::vector<tag_t> tags; - this->get_tags_in_range(tags, 0, this->nitems_read(0) + ii, this->nitems_read(0) + max_copy + ii); - for(unsigned i = 0; i < tags.size(); i++) - { - //printf("copy tag from in@%d to out@%d\n", int(tags[i].offset), int(nitems_written(0) + oo + (tags[i].offset-nitems_read(0)-ii))); - this->add_item_tag(0, this->nitems_written(0) + oo + (tags[i].offset-this->nitems_read(0)-ii), tags[i].key, tags[i].value, tags[i].srcid); - } - //printf("copy %d from input\n", max_copy); - memcpy( &out[oo], &in[ii], sizeof(T)*max_copy ); - //printf(" * memcpy returned.\n"); - ii += max_copy; - oo += max_copy; - d_offset = (d_offset + max_copy)%d_periodicity; - } - else { // if we are in the insertion region - int max_copy = std::min(noutput_items - oo, ((int)d_data.size()) - d_offset); - //printf("copy %d from d_data[%d] to out[%d]\n", max_copy, d_offset, oo); - memcpy(&out[oo], &d_data[d_offset], sizeof(T)*max_copy); - //printf(" * memcpy returned.\n"); - oo += max_copy; - d_offset = (d_offset + max_copy)%d_periodicity; - //printf(" ## (inelse) oo = %d, d_offset = %d\n", oo, d_offset); + if (d_offset >= ((int)d_data.size())) { // if we are in the copy region + int max_copy = std::min(std::min(noutput_items - oo, ninput_items[0] - ii), + d_periodicity - d_offset); + std::vector<tag_t> tags; + this->get_tags_in_range( + tags, 0, this->nitems_read(0) + ii, this->nitems_read(0) + max_copy + ii); + for (unsigned i = 0; i < tags.size(); i++) { + // printf("copy tag from in@%d to out@%d\n", int(tags[i].offset), + // int(nitems_written(0) + oo + (tags[i].offset-nitems_read(0)-ii))); + this->add_item_tag(0, + this->nitems_written(0) + oo + + (tags[i].offset - this->nitems_read(0) - ii), + tags[i].key, + tags[i].value, + tags[i].srcid); + } + // printf("copy %d from input\n", max_copy); + memcpy(&out[oo], &in[ii], sizeof(T) * max_copy); + // printf(" * memcpy returned.\n"); + ii += max_copy; + oo += max_copy; + d_offset = (d_offset + max_copy) % d_periodicity; + } else { // if we are in the insertion region + int max_copy = std::min(noutput_items - oo, ((int)d_data.size()) - d_offset); + // printf("copy %d from d_data[%d] to out[%d]\n", max_copy, d_offset, oo); + memcpy(&out[oo], &d_data[d_offset], sizeof(T) * max_copy); + // printf(" * memcpy returned.\n"); + oo += max_copy; + d_offset = (d_offset + max_copy) % d_periodicity; + // printf(" ## (inelse) oo = %d, d_offset = %d\n", oo, d_offset); } - //printf(" # exit else, on to next loop.\n"); - } - //printf(" # got out of loop\n"); - - //printf("consume = %d, produce = %d\n", ii, oo); - this->consume_each(ii); - return oo; + // printf(" # exit else, on to next loop.\n"); } + // printf(" # got out of loop\n"); + + // printf("consume = %d, produce = %d\n", ii, oo); + this->consume_each(ii); + return oo; +} template class vector_insert<std::uint8_t>; template class vector_insert<std::int16_t>; template class vector_insert<std::int32_t>; template class vector_insert<float>; template class vector_insert<gr_complex>; - } /* namespace blocks */ +} /* namespace blocks */ } /* namespace gr */ |