Merge branch 'master' of git://github.com/gnuradio/gnuradio into grmodtool

5 files changed, 127 insertions, 0 deletions

diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
index 0459097b0..37790b7cf 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/blocks/CMakeLists.txt
@@ -89,6 +89,7 @@ add_custom_target(blocks_generated_includes DEPENDS
 install(FILES
     ${generated_includes}
     api.h
+    count_bits.h
     add_ff.h
     char_to_float.h
     char_to_short.h
diff --git a/gr-blocks/include/blocks/count_bits.h b/gr-blocks/include/blocks/count_bits.h
new file mode 100644
index 000000000..ceb882f67
--- /dev/null
+++ b/gr-blocks/include/blocks/count_bits.h
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GR_COUNT_BITS_H_
+#define _GR_COUNT_BITS_H_
+
+#include <blocks/api.h>
+
+namespace gr {
+  namespace blocks {
+
+    //! return number of set bits in the low  8 bits of x
+    BLOCKS_API unsigned int count_bits8(unsigned int x);	
+
+    //! return number of set bits in the low 16 bits of x
+    BLOCKS_API unsigned int count_bits16(unsigned int x);
+
+    //! return number of set bits in the low 32 bits of x
+    BLOCKS_API unsigned int count_bits32(unsigned int x);
+
+    //! return number of set bits in a 64-bit word
+    BLOCKS_API unsigned int count_bits64(unsigned long long int x);
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* _GR_COUNT_BITS_H_ */
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 30eab7b75..560a55d57 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -126,6 +126,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 ########################################################################
 list(APPEND gr_blocks_sources
     ${generated_sources}
+    count_bits.cc
     add_ff_impl.cc
     char_to_float_impl.cc
     char_to_short_impl.cc
diff --git a/gr-blocks/lib/count_bits.cc b/gr-blocks/lib/count_bits.cc
new file mode 100644
index 000000000..167396b57
--- /dev/null
+++ b/gr-blocks/lib/count_bits.cc
@@ -0,0 +1,78 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <blocks/count_bits.h>
+
+/*
+ * these are slow and obvious.  If you need something faster, fix these
+ *
+ * Can probably replace with VOLK's popcount
+ */
+
+namespace gr {
+  namespace blocks {
+
+    unsigned int
+    count_bits8(unsigned int x)
+    {
+      int count = 0;
+
+      for(int i = 0; i < 8; i++) {
+        if(x & (1 << i))
+          count++;
+      }
+
+      return count;
+    }
+
+    unsigned int
+    count_bits16(unsigned int x)
+    {
+      int count = 0;
+
+      for(int i = 0; i < 16; i++) {
+        if(x & (1 << i))
+          count++;
+      }
+
+      return count;
+    }
+
+    unsigned int
+    count_bits32(unsigned int x)
+    {
+      unsigned res = (x & 0x55555555) + ((x >> 1) & 0x55555555);
+      res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
+      res = (res & 0x0F0F0F0F) + ((res >> 4) & 0x0F0F0F0F);
+      res = (res & 0x00FF00FF) + ((res >> 8) & 0x00FF00FF);
+      return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF);
+    }
+
+    unsigned int
+    count_bits64(unsigned long long x)
+    {
+      return count_bits32((x >> 32) & 0xffffffff) + \
+        count_bits32(x & 0xffffffff);
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/file_source_impl.cc b/gr-blocks/lib/file_source_impl.cc
index a8db31be7..dcbd04210 100644
--- a/gr-blocks/lib/file_source_impl.cc
+++ b/gr-blocks/lib/file_source_impl.cc
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include <gruel/thread.h>
 #include "file_source_impl.h"
 #include <gr_io_signature.h>
 #include <cstdio>