[Commit-gnuradio] [gnuradio] 02/02: blocks: adding pdu_remove block

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 8c97b7c379952c010c84cf8ae8a97fbfaac83bfd
Author: Tim O'Shea <address@hidden>
Date:   Mon May 5 23:16:55 2014 -0400

    blocks: adding pdu_remove block
---
 gr-blocks/grc/blocks_pdu_remove.xml              | 29 +++++++++++
 gr-blocks/include/gnuradio/blocks/CMakeLists.txt |  1 +
 gr-blocks/include/gnuradio/blocks/pdu_remove.h   | 52 +++++++++++++++++++
 gr-blocks/lib/CMakeLists.txt                     |  1 +
 gr-blocks/lib/pdu_remove_impl.cc                 | 66 ++++++++++++++++++++++++
 gr-blocks/lib/pdu_remove_impl.h                  | 44 ++++++++++++++++
 gr-blocks/swig/blocks_swig4.i                    |  3 ++
 7 files changed, 196 insertions(+)

diff --git a/gr-blocks/grc/blocks_pdu_remove.xml 
b/gr-blocks/grc/blocks_pdu_remove.xml
new file mode 100644
index 0000000..ad99445
--- /dev/null
+++ b/gr-blocks/grc/blocks_pdu_remove.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## PDU Remove
+###################################################
+ -->
+<block>
+       <name>PDU Remove</name>
+       <key>blocks_pdu_remove</key>
+       <import>from gnuradio import blocks</import>
+       <import>import pmt</import>
+       <make>blocks.pdu_remove($k)</make>
+       <param>
+               <name>Key</name>
+               <key>k</key>
+               <value>pmt.intern("key")</value>
+               <type>raw</type>
+       </param>
+       <sink>
+               <name>pdus</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/gnuradio/blocks/CMakeLists.txt 
b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt
index 4b5c04a..6789ccc 100644
--- a/gr-blocks/include/gnuradio/blocks/CMakeLists.txt
+++ b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt
@@ -171,6 +171,7 @@ install(FILES
     pdu.h
     pdu_filter.h
     pdu_set.h
+    pdu_remove.h
     pdu_to_tagged_stream.h
     peak_detector2_fb.h
     random_pdu.h
diff --git a/gr-blocks/include/gnuradio/blocks/pdu_remove.h 
b/gr-blocks/include/gnuradio/blocks/pdu_remove.h
new file mode 100644
index 0000000..9b8a087
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/pdu_remove.h
@@ -0,0 +1,52 @@
+/* -*- 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_PDU_REMOVE_H
+#define INCLUDED_BLOCKS_PDU_REMOVE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief remove key k in pdu's meta field and pass on
+     * \ingroup message_tools_blk
+     * \ingroup debug_tools_blk
+     */
+    class BLOCKS_API pdu_remove : virtual public block
+    {
+    public:
+      // gr::blocks::pdu_remove::sptr
+      typedef boost::shared_ptr<pdu_remove> sptr;
+
+      /*!
+       * \brief Construct a PDU meta remove block
+       */
+      static sptr make(pmt::pmt_t k);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_PDU_REMOVE_H */
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index ae56b17..e7aee40 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -212,6 +212,7 @@ list(APPEND gr_blocks_sources
     tag_debug_impl.cc
     pdu_filter_impl.cc
     pdu_set_impl.cc
+    pdu_remove_impl.cc
     pdu_to_tagged_stream_impl.cc
     peak_detector2_fb_impl.cc
     random_pdu_impl.cc
diff --git a/gr-blocks/lib/pdu_remove_impl.cc b/gr-blocks/lib/pdu_remove_impl.cc
new file mode 100644
index 0000000..0a922a5
--- /dev/null
+++ b/gr-blocks/lib/pdu_remove_impl.cc
@@ -0,0 +1,66 @@
+/* -*- 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 "pdu_remove_impl.h"
+#include <gnuradio/io_signature.h>
+#include <gnuradio/blocks/pdu.h>
+
+namespace gr {
+  namespace blocks {
+
+    pdu_remove::sptr
+    pdu_remove::make(pmt::pmt_t k)
+    {
+      return gnuradio::get_initial_sptr(new pdu_remove_impl(k));
+    }
+
+    pdu_remove_impl::pdu_remove_impl(pmt::pmt_t k)
+      :        block("pdu_remove",
+                io_signature::make (0, 0, 0),
+                io_signature::make (0, 0, 0)),
+    d_k(k)
+    {
+      message_port_register_out(pmt::mp("pdus"));
+      message_port_register_in(pmt::mp("pdus"));
+      set_msg_handler(pmt::mp("pdus"), 
boost::bind(&pdu_remove_impl::handle_msg, this, _1));
+    }
+
+    void 
+    pdu_remove_impl::handle_msg(pmt::pmt_t pdu)
+    {
+      // add the field and publish
+      pmt::pmt_t meta = pmt::car(pdu);
+      if(pmt::is_null(meta)){
+        meta = pmt::make_dict();
+        } else if(!pmt::is_dict(meta)){
+        throw std::runtime_error("pdu_remove received non PDU input");
+        }
+      meta = pmt::dict_delete(meta, d_k);
+      message_port_pub(pmt::mp("pdus"), pmt::cons(meta, pmt::cdr(pdu)));
+    }
+      
+  } /* namespace blocks */
+}/* namespace gr */
diff --git a/gr-blocks/lib/pdu_remove_impl.h b/gr-blocks/lib/pdu_remove_impl.h
new file mode 100644
index 0000000..4492e4b
--- /dev/null
+++ b/gr-blocks/lib/pdu_remove_impl.h
@@ -0,0 +1,44 @@
+/* -*- 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_PDU_REMOVE_IMPL_H
+#define INCLUDED_BLOCKS_PDU_REMOVE_IMPL_H
+
+#include <gnuradio/blocks/pdu_remove.h>
+
+namespace gr {
+  namespace blocks {
+
+    class pdu_remove_impl : public pdu_remove
+    {
+    private:
+      pmt::pmt_t d_k;
+
+    public:
+      pdu_remove_impl(pmt::pmt_t k);
+      void handle_msg(pmt::pmt_t msg);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_PDU_REMOVE_IMPL_H */
diff --git a/gr-blocks/swig/blocks_swig4.i b/gr-blocks/swig/blocks_swig4.i
index 3648291..4c2c93e 100644
--- a/gr-blocks/swig/blocks_swig4.i
+++ b/gr-blocks/swig/blocks_swig4.i
@@ -42,6 +42,7 @@
 #include "gnuradio/blocks/packed_to_unpacked_ii.h"
 #include "gnuradio/blocks/pdu_filter.h"
 #include "gnuradio/blocks/pdu_set.h"
+#include "gnuradio/blocks/pdu_remove.h"
 #include "gnuradio/blocks/pdu_to_tagged_stream.h"
 #include "gnuradio/blocks/peak_detector_fb.h"
 #include "gnuradio/blocks/peak_detector_ib.h"
@@ -88,6 +89,7 @@
 %include "gnuradio/blocks/patterned_interleaver.h"
 %include "gnuradio/blocks/pdu_filter.h"
 %include "gnuradio/blocks/pdu_set.h"
+%include "gnuradio/blocks/pdu_remove.h"
 %include "gnuradio/blocks/pdu_to_tagged_stream.h"
 %include "gnuradio/blocks/peak_detector_fb.h"
 %include "gnuradio/blocks/peak_detector_ib.h"
@@ -112,6 +114,7 @@ GR_SWIG_BLOCK_MAGIC2(blocks, peak_detector2_fb);
 GR_SWIG_BLOCK_MAGIC2(blocks, plateau_detector_fb);
 GR_SWIG_BLOCK_MAGIC2(blocks, pdu_filter);
 GR_SWIG_BLOCK_MAGIC2(blocks, pdu_set);
+GR_SWIG_BLOCK_MAGIC2(blocks, pdu_remove);
 GR_SWIG_BLOCK_MAGIC2(blocks, pdu_to_tagged_stream);
 GR_SWIG_BLOCK_MAGIC2(blocks, probe_rate);
 GR_SWIG_BLOCK_MAGIC2(blocks, or_bb);