blocks: added gr::blocks::random_pdu

author: Johnathan Corgan <johnathan@corganlabs.com> 2013-02-28 14:31:39 -0800
committer: Johnathan Corgan <johnathan@corganlabs.com> 2013-02-28 14:31:39 -0800
commit: 1d093decc5bf37b8d173ce7769a14af6765f45a6 (patch)
tree: d0d45936b81a8a429746cff573aa7c9c5f9d179f
parent: 4a99e708ad0dd54bae4a4275ae2c06e44decbebf (diff)
10 files changed, 228 insertions, 4 deletions
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml
index c5c964c25e..5d20aaf827 100644
--- a/gr-blocks/grc/blocks_block_tree.xml
+++ b/gr-blocks/grc/blocks_block_tree.xml
@@ -33,6 +33,7 @@
 		<block>blocks_file_source</block>
 		<block>blocks_file_meta_source</block>
 		<block>blocks_pdu_to_tagged_stream</block>
+		<block>blocks_random_pdu</block>
 	</cat>
 	<cat>
 	        <name>Sinks (New)</name>
diff --git a/gr-blocks/grc/blocks_random_pdu.xml b/gr-blocks/grc/blocks_random_pdu.xml
new file mode 100644
index 0000000000..640e14de8a
--- /dev/null
+++ b/gr-blocks/grc/blocks_random_pdu.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## Random PDU
+###################################################
+ -->
+<block>
+	<name>Random PDU Generator</name>
+	<key>blocks_random_pdu</key>
+	<import>from gnuradio import blocks</import>
+	<import>from gruel import pmt</import>
+	<make>blocks.random_pdu($minsize, $maxsize)</make>
+	<param>
+		<name>Min Bytes</name>
+		<key>minsize</key>
+		<value>50</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Max Bytes</name>
+		<key>maxsize</key>
+		<value>2000</value>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>generate</name>
+		<type>message</type>
+        <optional>1</optional>
+	</sink>
+	<source>
+		<name>pdus</name>
+		<type>message</type>
+        <optional>1</optional>
+	</source>
+</block>
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
index 31f8efb83b..fdf3b08766 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/blocks/CMakeLists.txt
@@ -130,6 +130,7 @@ install(FILES
     pdu.h
     pdu_to_tagged_stream.h
     peak_detector2_fb.h
+    random_pdu.h
     regenerate_bb.h
     repeat.h
     rms_cf.h
diff --git a/gr-blocks/include/blocks/random_pdu.h b/gr-blocks/include/blocks/random_pdu.h
new file mode 100644
index 0000000000..5a13f5eca6
--- /dev/null
+++ b/gr-blocks/include/blocks/random_pdu.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 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 INCLUDED_BLOCKS_RANDOM_PDU_H
+#define INCLUDED_BLOCKS_RANDOM_PDU_H
+
+#include <blocks/api.h>
+#include <gr_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Sends a random PDU at intervals
+     * \ingroup source_blk
+     */
+    class BLOCKS_API random_pdu : virtual public gr_block
+    {
+    public:
+      // gr::blocks::random_pdu::sptr
+      typedef boost::shared_ptr<random_pdu> sptr;
+
+      /*!
+       * \brief Construct a random PDU generator
+       */
+      static sptr make(int mintime, int maxtime);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_RANDOM_PDU_H */
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 4ebaf3dcb8..008f00f361 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -169,6 +169,7 @@ list(APPEND gr_blocks_sources
     pdu.cc
     pdu_to_tagged_stream_impl.cc
     peak_detector2_fb_impl.cc
+    random_pdu_impl.cc
     regenerate_bb_impl.cc
     repeat_impl.cc
     rms_cf_impl.cc
diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc
new file mode 100644
index 0000000000..0b194a0537
--- /dev/null
+++ b/gr-blocks/lib/random_pdu_impl.cc
@@ -0,0 +1,80 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "random_pdu_impl.h"
+#include <gr_io_signature.h>
+#include <blocks/pdu.h>
+
+namespace gr {
+  namespace blocks {
+
+    random_pdu::sptr
+    random_pdu::make(int min_items, int max_items)
+    {
+      return gnuradio::get_initial_sptr(new random_pdu_impl(min_items, max_items));
+    }
+
+    random_pdu_impl::random_pdu_impl(int min_items, int max_items)
+      :	gr_block("random_pdu",
+		 gr_make_io_signature (0, 0, 0),
+		 gr_make_io_signature (0, 0, 0)),
+	d_urange(min_items, max_items),
+	d_brange(0, 255),
+	d_rvar(d_rng, d_urange),
+	d_bvar(d_rng, d_brange)
+    {
+      message_port_register_out(PDU_PORT_ID);
+      message_port_register_in(pmt::mp("generate"));
+      set_msg_handler(pmt::mp("generate"), boost::bind(&random_pdu_impl::generate_pdu, this, _1));
+    }
+
+    bool
+    random_pdu_impl::start() 
+    {
+      output_random();
+      return true;
+    }
+
+    void
+    random_pdu_impl::output_random()
+    {
+      // pick a random vector length
+      int len = d_rvar();
+
+      // fill it with random bytes
+      std::vector<unsigned char> vec;
+      for (int i=0; i<len; i++)
+        vec.push_back((unsigned char) d_bvar());
+      
+      // send the vector
+      pmt::pmt_t vecpmt(pmt::make_blob(&vec[0], len));
+      pmt::pmt_t pdu(pmt::cons(pmt::PMT_NIL, vecpmt));
+
+      message_port_pub(PDU_PORT_ID, pdu);
+    }
+
+  } /* namespace blocks */
+}/* namespace gr */
diff --git a/gr-blocks/lib/random_pdu_impl.h b/gr-blocks/lib/random_pdu_impl.h
new file mode 100644
index 0000000000..3197f740a0
--- /dev/null
+++ b/gr-blocks/lib/random_pdu_impl.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 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 INCLUDED_BLOCKS_SOCKET_PDU_IMPL_H
+#define INCLUDED_BLOCKS_RANDOM_PDU_IMPL_H
+
+#include <blocks/random_pdu.h>
+#include <boost/random.hpp>
+#include <boost/generator_iterator.hpp>
+
+namespace gr {
+  namespace blocks {
+
+    class random_pdu_impl : public random_pdu
+    {
+    private:
+      boost::mt19937 d_rng;
+      boost::uniform_int<> d_urange;
+      boost::uniform_int<> d_brange;
+      boost::variate_generator< boost::mt19937, boost::uniform_int<> > d_rvar; // pdu length
+      boost::variate_generator< boost::mt19937, boost::uniform_int<> > d_bvar; // pdu contents
+      
+    public:
+      random_pdu_impl(int min_items, int max_items);
+
+      bool start();
+      void output_random();
+      void generate_pdu(pmt::pmt_t msg) { output_random(); }
+      void generate_pdu() { output_random(); }
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_RANDOM_PDU_IMPL_H */
diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc
index 20338f9968..4ff5ce6eb9 100644
--- a/gr-blocks/lib/socket_pdu_impl.cc
+++ b/gr-blocks/lib/socket_pdu_impl.cc
@@ -27,7 +27,7 @@
 #include "socket_pdu_impl.h"
 #include "tcp_connection.h"
 #include <gr_io_signature.h>
-#include <gr_pdu.h>
+#include <blocks/pdu.h>
 
 namespace gr {
   namespace blocks {
diff --git a/gr-blocks/lib/tcp_connection.cc b/gr-blocks/lib/tcp_connection.cc
index f7af371250..33bb6f10f1 100644
--- a/gr-blocks/lib/tcp_connection.cc
+++ b/gr-blocks/lib/tcp_connection.cc
@@ -26,9 +26,7 @@
 
 #include "tcp_connection.h"
 #include <gr_basic_block.h>
-#include <gr_pdu.h>
-//#include <boost/asio.hpp>
-//#include <boost/bind.hpp>
+#include <blocks/pdu.h>
 
 namespace gr {
   namespace blocks {
diff --git a/gr-blocks/swig/blocks_swig.i b/gr-blocks/swig/blocks_swig.i
index 6c6533ac26..38179a2d17 100644
--- a/gr-blocks/swig/blocks_swig.i
+++ b/gr-blocks/swig/blocks_swig.i
@@ -109,6 +109,7 @@
 #include "blocks/or_bb.h"
 #include "blocks/or_ss.h"
 #include "blocks/or_ii.h"
+#include "blocks/random_pdu.h"
 #include "blocks/regenerate_bb.h"
 #include "blocks/repeat.h"
 #include "blocks/rms_cf.h"
@@ -221,6 +222,7 @@
 %include "blocks/patterned_interleaver.h"
 %include "blocks/pdu_to_tagged_stream.h"
 %include "blocks/peak_detector2_fb.h"
+%include "blocks/random_pdu.h"
 %include "blocks/regenerate_bb.h"
 %include "blocks/repeat.h"
 %include "blocks/rms_cf.h"
@@ -332,6 +334,7 @@ GR_SWIG_BLOCK_MAGIC2(blocks, pdu_to_tagged_stream);
 GR_SWIG_BLOCK_MAGIC2(blocks, or_bb);
 GR_SWIG_BLOCK_MAGIC2(blocks, or_ss);
 GR_SWIG_BLOCK_MAGIC2(blocks, or_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, random_pdu);
 GR_SWIG_BLOCK_MAGIC2(blocks, regenerate_bb);
 GR_SWIG_BLOCK_MAGIC2(blocks, repeat);
 GR_SWIG_BLOCK_MAGIC2(blocks, rms_cf);
author	Johnathan Corgan <johnathan@corganlabs.com>	2013-02-28 14:31:39 -0800
committer	Johnathan Corgan <johnathan@corganlabs.com>	2013-02-28 14:31:39 -0800
commit	1d093decc5bf37b8d173ce7769a14af6765f45a6 (patch)
tree	d0d45936b81a8a429746cff573aa7c9c5f9d179f
parent	4a99e708ad0dd54bae4a4275ae2c06e44decbebf (diff)