Ticket #39681: patch-vector-map.diff

gr-blocks/include/gnuradio/blocks/vector_map.h

@@ -50 +50 @@
     public:
       // gr::blocks::vector_map::sptr
       typedef boost::shared_ptr<vector_map> sptr;
+      typedef unsigned int vmap_t;
 
       /*!
        * Build a vector map block.
@@ -60 +61 @@
        * \param mapping (vector of vectors of vectors of integers) how to
        *                map elements from input to output vectors
        */
-      static sptr make(size_t item_size, std::vector<size_t> in_vlens,
-                       std::vector< std::vector< std::vector<size_t> > > mapping);
+      static sptr make(size_t item_size, const std::vector<vmap_t>& in_vlens,
+                       const std::vector< std::vector< std::vector<vmap_t> > >& mapping);
 
-      virtual void set_mapping(std::vector< std::vector< std::vector<size_t> > > mapping) = 0;
+      virtual void set_mapping(const std::vector< std::vector< std::vector<vmap_t> > >& mapping) = 0;
     };
 
   } /* namespace blocks */

gr-blocks/lib/vector_map_impl.cc

@@ -31 +31 @@
 namespace gr {
   namespace blocks {
 
-    std::vector<int>
-    get_in_sizeofs(size_t item_size, std::vector<size_t> in_vlens)
+    static std::vector<int>
+    get_in_sizeofs(size_t item_size, const std::vector<vector_map::vmap_t> &in_vlens)
     {
       std::vector<int> in_sizeofs;
-      for(unsigned int i = 0; i < in_vlens.size(); i++) {
+      for(size_t i = 0; i < in_vlens.size(); i++) {
         in_sizeofs.push_back(in_vlens[i]*item_size);
       }
       return in_sizeofs;
     }
 
-    std::vector<int>
+    static std::vector<int>
     get_out_sizeofs(size_t item_size,
-                    std::vector< std::vector< std::vector<size_t> > > mapping)
+                    const std::vector< std::vector< std::vector<vector_map::vmap_t> > > &mapping)
     {
       std::vector<int> out_sizeofs;
-      for(unsigned int i = 0; i < mapping.size(); i++) {
+      for(size_t i = 0; i < mapping.size(); i++) {
         out_sizeofs.push_back(mapping[i].size()*item_size);
       }
       return out_sizeofs;
-    } 
+    }
 
     vector_map::sptr
-    vector_map::make(size_t item_size, std::vector<size_t> in_vlens,
-                     std::vector< std::vector< std::vector<size_t> > > mapping)
+    vector_map::make(size_t item_size, const std::vector<vector_map::vmap_t> &in_vlens,
+                     const std::vector< std::vector< std::vector<vector_map::vmap_t> > > &mapping)
     {
       return gnuradio::get_initial_sptr
         (new vector_map_impl(item_size, in_vlens, mapping));
     }
 
-    vector_map_impl::vector_map_impl(size_t item_size, std::vector<size_t> in_vlens,
-                                     std::vector< std::vector< std::vector<size_t> > > mapping)
+    vector_map_impl::vector_map_impl(size_t item_size, const std::vector<vector_map::vmap_t> &in_vlens,
+                                     const std::vector< std::vector< std::vector<vector_map::vmap_t> > > &mapping)
       : sync_block("vector_map",
                       io_signature::makev(in_vlens.size(), in_vlens.size(),
                                             get_in_sizeofs(item_size, in_vlens)),
@@ -77 +77 @@
     }
 
     void
-    vector_map_impl::set_mapping(std::vector< std::vector< std::vector<size_t> > > mapping)
+    vector_map_impl::set_mapping(const std::vector< std::vector< std::vector<vector_map::vmap_t> > > &mapping)
     {
       // Make sure the contents of the mapping vectors are possible.
-      for(unsigned int i=0; i<mapping.size(); i++) {
-        for(unsigned int j=0; j<mapping[i].size(); j++) {
+      for(size_t i=0; i<mapping.size(); i++) {
+        for(size_t j=0; j<mapping[i].size(); j++) {
           if(mapping[i][j].size() != 2) {
             throw std::runtime_error("Mapping must be of the form (out_mapping_stream1, out_mapping_stream2, ...), where out_mapping_stream1 is of the form (mapping_element1, mapping_element2, ...), where mapping_element1 is of the form (input_stream, input_element).  This error is raised because a mapping_element vector does not contain exactly 2 items.");
           }
-          unsigned int s = mapping[i][j][0];
-          unsigned int index = mapping[i][j][1];
+          vector_map::vmap_t s = mapping[i][j][0];
+          vector_map::vmap_t index = mapping[i][j][1];
           if(s >= d_in_vlens.size()) {
             throw std::runtime_error("Stream numbers in mapping must be less than the number of input streams.");
           }
@@ -107 +107 @@
       const char **inv = (const char**)&input_items[0];
       char **outv = (char**)&output_items[0];
 
-      for(unsigned int n = 0; n < (unsigned int)(noutput_items); n++) {
-        for(unsigned int i = 0; i < d_mapping.size(); i++) {
-          unsigned int out_vlen = d_mapping[i].size();
-          for(unsigned int j = 0; j < out_vlen; j++) {
-            unsigned int s = d_mapping[i][j][0];
-            unsigned int k = d_mapping[i][j][1];
+      for(size_t n = 0; n < (size_t)(noutput_items); n++) {
+        for(size_t i = 0; i < d_mapping.size(); i++) {
+          size_t out_vlen = d_mapping[i].size();
+          for(size_t j = 0; j < out_vlen; j++) {
+            vector_map::vmap_t s = d_mapping[i][j][0];
+            vector_map::vmap_t k = d_mapping[i][j][1];
             memcpy(outv[i] + out_vlen*d_item_size*n +
                    d_item_size*j, inv[s] + d_in_vlens[s]*d_item_size*n +
                    k*d_item_size, d_item_size);

gr-blocks/lib/vector_map_impl.h

@@ -33 +33 @@
     {
     private:
       size_t d_item_size;
-      std::vector<size_t> d_in_vlens;
-      std::vector< std::vector< std::vector<size_t> > > d_mapping;
+      std::vector<vmap_t> d_in_vlens;
+      std::vector< std::vector< std::vector<vmap_t> > > d_mapping;
       gr::thread::mutex d_mutex; // mutex to protect set/work access
 
     public:
-      vector_map_impl(size_t item_size, std::vector<size_t> in_vlens,
-                      std::vector< std::vector< std::vector<size_t> > > mapping);
+      vector_map_impl(size_t item_size, const std::vector<vmap_t> &in_vlens,
+                      const std::vector< std::vector< std::vector<vmap_t> > > &mapping);
       ~vector_map_impl();
 
-      void set_mapping(std::vector< std::vector< std::vector<size_t> > > mapping);
+      void set_mapping(const std::vector< std::vector< std::vector<vmap_t> > > &mapping);
 
       int work(int noutput_items,
                gr_vector_const_void_star &input_items,