zeromq: remove nopoll req/rep blocks

author: Johnathan Corgan <johnathan@corganlabs.com> 2014-05-06 13:21:16 -0700
committer: Johnathan Corgan <johnathan@corganlabs.com> 2014-05-06 13:21:16 -0700
commit: f7966b9cacfd88650dac4b7d9000c82675f46936 (patch)
tree: 62c3777c21ace6fb8379c8d028e3ec6ec1f17136
parent: 35aaec4d0d4b6f995911fd6d38697bc239cd68cf (diff)
14 files changed, 14 insertions, 484 deletions
diff --git a/gr-zeromq/examples/client.py b/gr-zeromq/examples/client.py
index a5c1996047..bd040b1ee8 100755
--- a/gr-zeromq/examples/client.py
+++ b/gr-zeromq/examples/client.py
@@ -1,25 +1,25 @@
 #!/usr/bin/env python
-# 
+#
 # Copyright 2013 Institute for Theoretical Information Technology,
 #                RWTH Aachen University
-# 
+#
 # Authors: Johannes Schmitz <schmitz@ti.rwth-aachen.de>
-# 
+#
 # This 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.
-# 
+#
 # This software 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 this software; see the file COPYING.  If not, write to
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
-# 
+#
 
 
 ###############################################################################
@@ -43,7 +43,7 @@ import time
 ###############################################################################
 class top_block(gr.top_block):
     def __init__(self, options):
-        gr.top_block.__init__(self)  
+        gr.top_block.__init__(self)
 
         self.options = options
 
@@ -53,7 +53,6 @@ class top_block(gr.top_block):
         source_adr = "tcp://"+self.options.servername+":5555"
 
         # blocks
-        #self.zmq_source = zeromq.source_reqrep_nopoll(gr.sizeof_float,source_adr)
         self.zmq_source = zeromq.req_source(gr.sizeof_float, 1, source_adr)
         #self.zmq_source = zeromq.pull_source(gr.sizeof_float, 1, source_adr)
         #self.zmq_probe = zeromq.push_sink(gr.sizeof_float,probe_adr)
diff --git a/gr-zeromq/examples/server.py b/gr-zeromq/examples/server.py
index 49640f8fd6..ee7d9fcf69 100755
--- a/gr-zeromq/examples/server.py
+++ b/gr-zeromq/examples/server.py
@@ -1,25 +1,25 @@
 #!/usr/bin/env python
-# 
+#
 # Copyright 2013 Institute for Theoretical Information Technology,
 #                RWTH Aachen University
-# 
+#
 # Authors: Johannes Schmitz <schmitz@ti.rwth-aachen.de>
-# 
+#
 # This 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.
-# 
+#
 # This software 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 this software; see the file COPYING.  If not, write to
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
-# 
+#
 
 ###############################################################################
 # Imports
@@ -42,7 +42,7 @@ import time
 ###############################################################################
 class top_block(gr.top_block):
     def __init__(self, options):
-        gr.top_block.__init__(self)  
+        gr.top_block.__init__(self)
 
         self.options = options
 
@@ -58,7 +58,6 @@ class top_block(gr.top_block):
         self.gr_sig_source = analog.sig_source_f(samp_rate, analog.GR_SIN_WAVE , 1000, 1, 0)
         self.throttle = blocks.throttle(gr.sizeof_float, samp_rate)
         self.mult = blocks.multiply_const_ff(1)
-        #self.zmq_sink = zeromq.rep_sink_nopoll(gr.sizeof_float, sink_adr)
         self.zmq_sink = zeromq.rep_sink(gr.sizeof_float, 1, sink_adr)
         #self.zmq_sink = zeromq.push_sink(gr.sizeof_float, 1, sink_adr)
         #self.zmq_probe = zeromq.push_sink(gr.sizeof_float, probe_adr)
diff --git a/gr-zeromq/grc/CMakeLists.txt b/gr-zeromq/grc/CMakeLists.txt
index 94c207d589..ad65f81d8e 100644
--- a/gr-zeromq/grc/CMakeLists.txt
+++ b/gr-zeromq/grc/CMakeLists.txt
@@ -27,6 +27,4 @@ install(FILES
     DESTINATION share/gnuradio/grc/blocks
 )
 
-#    zeromq_sink_reqrep_nopoll.xml
-#    zeromq_source_reqrep_nopoll.xml
 
diff --git a/gr-zeromq/grc/zeromq_sink_reqrep_nopoll.xml b/gr-zeromq/grc/zeromq_sink_reqrep_nopoll.xml
deleted file mode 100644
index a09c82ae53..0000000000
--- a/gr-zeromq/grc/zeromq_sink_reqrep_nopoll.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<block>
-  <name>sink_reqrep_nopoll</name>
-  <key>zeromq_sink_reqrep_nopoll</key>
-  <category>zeromq</category>
-  <import>import zeromq</import>
-  <make>zeromq.sink_reqrep_nopoll($itemsize, $*address)</make>
-  <!-- Make one 'param' node for every Parameter you want settable from the GUI.
-       Sub-nodes:
-       * name
-       * key (makes the value accessible as $keyname, e.g. in the make node)
-       * type -->
-  <param>
-    <name>...</name>
-    <key>...</key>
-    <type>...</type>
-  </param>
-
-  <!-- Make one 'sink' node per input. Sub-nodes:
-       * name (an identifier for the GUI)
-       * type
-       * vlen
-       * optional (set to 1 for optional inputs) -->
-  <sink>
-    <name>in</name>
-    <type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type>
-  </sink>
-
-  <!-- Make one 'source' node per output. Sub-nodes:
-       * name (an identifier for the GUI)
-       * type
-       * vlen
-       * optional (set to 1 for optional inputs) -->
-  <source>
-    <name>out</name>
-    <type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type>
-  </source>
-</block>
diff --git a/gr-zeromq/grc/zeromq_source_reqrep_nopoll.xml b/gr-zeromq/grc/zeromq_source_reqrep_nopoll.xml
deleted file mode 100644
index 88567a219c..0000000000
--- a/gr-zeromq/grc/zeromq_source_reqrep_nopoll.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<block>
-  <name>source_reqrep_nopoll</name>
-  <key>zeromq_source_reqrep_nopoll</key>
-  <category>zeromq</category>
-  <import>import zeromq</import>
-  <make>zeromq.source_reqrep_nopoll($itemsize, $*address)</make>
-  <!-- Make one 'param' node for every Parameter you want settable from the GUI.
-       Sub-nodes:
-       * name
-       * key (makes the value accessible as $keyname, e.g. in the make node)
-       * type -->
-  <param>
-    <name>...</name>
-    <key>...</key>
-    <type>...</type>
-  </param>
-
-  <!-- Make one 'sink' node per input. Sub-nodes:
-       * name (an identifier for the GUI)
-       * type
-       * vlen
-       * optional (set to 1 for optional inputs) -->
-  <sink>
-    <name>in</name>
-    <type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type>
-  </sink>
-
-  <!-- Make one 'source' node per output. Sub-nodes:
-       * name (an identifier for the GUI)
-       * type
-       * vlen
-       * optional (set to 1 for optional inputs) -->
-  <source>
-    <name>out</name>
-    <type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type>
-  </source>
-</block>
diff --git a/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt b/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt
index 7a5b229419..87e79e021b 100644
--- a/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt
+++ b/gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt
@@ -31,5 +31,3 @@ install(FILES
   DESTINATION ${GR_INCLUDE_DIR}/gnuradio/zeromq
   COMPONENT "zeromq_devel"
 )
-# sink_reqrep_nopoll.h
-# source_reqrep_nopoll.h
diff --git a/gr-zeromq/include/gnuradio/zeromq/sink_reqrep_nopoll.h b/gr-zeromq/include/gnuradio/zeromq/sink_reqrep_nopoll.h
deleted file mode 100644
index afb2085019..0000000000
--- a/gr-zeromq/include/gnuradio/zeromq/sink_reqrep_nopoll.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
- * This 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.
- *
- * This software 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 this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_ZEROMQ_SINK_REQREP_NOPOLL_H
-#define INCLUDED_ZEROMQ_SINK_REQREP_NOPOLL_H
-
-#include <gnuradio/zeromq/api.h>
-#include <gnuradio/sync_block.h>
-
-namespace gr {
-  namespace zeromq {
-
-    /*!
-     * \brief <+description of block+>
-     * \ingroup zeromq
-     *
-     */
-    class ZEROMQ_API sink_reqrep_nopoll : virtual public gr::sync_block
-    {
-    public:
-      typedef boost::shared_ptr<sink_reqrep_nopoll> sptr;
-
-      /*!
-       * \brief Return a shared_ptr to a new instance of zeromq::sink_reqrep_nopoll.
-       *
-       * To avoid accidental use of raw pointers, zeromq::sink_reqrep_nopoll's
-       * constructor is in a private implementation
-       * class. zeromq::sink_reqrep_nopoll::make is the public interface for
-       * creating new instances.
-       */
-      static sptr make(size_t itemsize, char *address);
-    };
-
-  } // namespace zeromq
-} // namespace gr
-
-#endif /* INCLUDED_ZEROMQ_SINK_REQREP_NOPOLL_H */
diff --git a/gr-zeromq/include/gnuradio/zeromq/source_reqrep_nopoll.h b/gr-zeromq/include/gnuradio/zeromq/source_reqrep_nopoll.h
deleted file mode 100644
index 124a49d95e..0000000000
--- a/gr-zeromq/include/gnuradio/zeromq/source_reqrep_nopoll.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
- * This 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.
- *
- * This software 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 this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_ZEROMQ_SOURCE_REQREP_NOPOLL_H
-#define INCLUDED_ZEROMQ_SOURCE_REQREP_NOPOLL_H
-
-#include <gnuradio/zeromq/api.h>
-#include <gnuradio/sync_block.h>
-
-namespace gr {
-  namespace zeromq {
-
-    /*!
-     * \brief <+description of block+>
-     * \ingroup zeromq
-     *
-     */
-    class ZEROMQ_API source_reqrep_nopoll : virtual public gr::sync_block
-    {
-    public:
-      typedef boost::shared_ptr<source_reqrep_nopoll> sptr;
-
-      /*!
-       * \brief Return a shared_ptr to a new instance of zeromq::source_reqrep_nopoll.
-       *
-       * To avoid accidental use of raw pointers, zeromq::source_reqrep_nopoll's
-       * constructor is in a private implementation
-       * class. zeromq::source_reqrep_nopoll::make is the public interface for
-       * creating new instances.
-       */
-      static sptr make(size_t itemsize, char *address);
-    };
-
-  } // namespace zeromq
-} // namespace gr
-
-#endif /* INCLUDED_ZEROMQ_SOURCE_REQREP_NOPOLL_H */
diff --git a/gr-zeromq/lib/CMakeLists.txt b/gr-zeromq/lib/CMakeLists.txt
index 95ecc70845..57a4c62230 100644
--- a/gr-zeromq/lib/CMakeLists.txt
+++ b/gr-zeromq/lib/CMakeLists.txt
@@ -43,8 +43,6 @@ list(APPEND zeromq_sources
   push_sink_impl.cc
   rep_sink_impl.cc
   req_source_impl.cc
-  sink_reqrep_nopoll_impl.cc
-  source_reqrep_nopoll_impl.cc
 )
 
 #Add Windows DLL resource file if using MSVC
diff --git a/gr-zeromq/lib/sink_reqrep_nopoll_impl.cc b/gr-zeromq/lib/sink_reqrep_nopoll_impl.cc
deleted file mode 100644
index 767893ddfe..0000000000
--- a/gr-zeromq/lib/sink_reqrep_nopoll_impl.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
- * This 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.
- *
- * This software 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 this software; 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 <gnuradio/io_signature.h>
-#include "sink_reqrep_nopoll_impl.h"
-
-namespace gr {
-  namespace zeromq {
-
-    sink_reqrep_nopoll::sptr
-    sink_reqrep_nopoll::make(size_t itemsize, char *address)
-    {
-      return gnuradio::get_initial_sptr
-        (new sink_reqrep_nopoll_impl(itemsize, address));
-    }
-
-    sink_reqrep_nopoll_impl::sink_reqrep_nopoll_impl(size_t itemsize, char *address)
-      : gr::sync_block("sink_reqrep_nopoll",
-		       gr::io_signature::make(1, 1, itemsize),
-		       gr::io_signature::make(0, 0, 0)),
-        d_itemsize(itemsize)
-    {
-      d_context = new zmq::context_t(1);
-      d_socket = new zmq::socket_t(*d_context, ZMQ_REP);
-      d_socket->bind (address);
-    }
-
-    sink_reqrep_nopoll_impl::~sink_reqrep_nopoll_impl()
-    {
-      delete d_socket;
-      delete d_context;
-    }
-
-    int
-    sink_reqrep_nopoll_impl::work(int noutput_items,
-				  gr_vector_const_void_star &input_items,
-				  gr_vector_void_star &output_items)
-    {
-      const char *in = (const char *) input_items[0];
-
-      zmq::message_t request;
-      d_socket->recv(&request);
-      int req_output_items = *(static_cast<int*>(request.data()));
-
-      // create message copy and send
-      if (noutput_items < req_output_items) {
-	zmq::message_t msg(d_itemsize*noutput_items);
-	memcpy((void *)msg.data(), in, d_itemsize*noutput_items);
-	d_socket->send(msg);
-
-	return noutput_items;
-      }
-      else {
-	zmq::message_t msg(d_itemsize*req_output_items);
-	memcpy((void *)msg.data(), in, d_itemsize*req_output_items);
-	d_socket->send(msg);
-
-	return req_output_items;
-      }
-    }
-
-  } /* namespace zeromq */
-} /* namespace gr */
diff --git a/gr-zeromq/lib/sink_reqrep_nopoll_impl.h b/gr-zeromq/lib/sink_reqrep_nopoll_impl.h
deleted file mode 100644
index 66ba934de0..0000000000
--- a/gr-zeromq/lib/sink_reqrep_nopoll_impl.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
- * This 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.
- *
- * This software 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 this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_ZMQBLOCKS_SINK_REQREP_NOPOLL_IMPL_H
-#define INCLUDED_ZMQBLOCKS_SINK_REQREP_NOPOLL_IMPL_H
-
-#include <gnuradio/zeromq/sink_reqrep_nopoll.h>
-#include <zmq.hpp>
-
-namespace gr {
-  namespace zeromq {
-
-    class sink_reqrep_nopoll_impl : public sink_reqrep_nopoll
-    {
-    private:
-      size_t          d_itemsize;
-      zmq::context_t  *d_context;
-      zmq::socket_t   *d_socket;
-
-    public:
-      sink_reqrep_nopoll_impl(size_t itemsize, char *address);
-      ~sink_reqrep_nopoll_impl();
-
-      int work(int noutput_items,
-	       gr_vector_const_void_star &input_items,
-	       gr_vector_void_star &output_items);
-    };
-
-  } // namespace zeromq
-} // namespace gr
-
-#endif /* INCLUDED_ZMQBLOCKS_SINK_REQREP_NOPOLL_IMPL_H */
diff --git a/gr-zeromq/lib/source_reqrep_nopoll_impl.cc b/gr-zeromq/lib/source_reqrep_nopoll_impl.cc
deleted file mode 100644
index 2af72a17fe..0000000000
--- a/gr-zeromq/lib/source_reqrep_nopoll_impl.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
- * This 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.
- *
- * This software 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 this software; 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 <gnuradio/io_signature.h>
-#include "source_reqrep_nopoll_impl.h"
-
-namespace gr {
-  namespace zeromq {
-
-    source_reqrep_nopoll::sptr
-    source_reqrep_nopoll::make(size_t itemsize, char *address)
-    {
-      return gnuradio::get_initial_sptr
-        (new source_reqrep_nopoll_impl(itemsize, address));
-    }
-
-    source_reqrep_nopoll_impl::source_reqrep_nopoll_impl(size_t itemsize, char *address)
-      : gr::sync_block("source_reqrep_nopoll",
-		       gr::io_signature::make(0, 0, 0),
-		       gr::io_signature::make(1, 1, itemsize)),
-        d_itemsize(itemsize)
-    {
-      d_context = new zmq::context_t(1);
-      d_socket = new zmq::socket_t(*d_context, ZMQ_REQ);
-      d_socket->connect (address);
-    }
-
-    source_reqrep_nopoll_impl::~source_reqrep_nopoll_impl()
-    {
-      delete d_socket;
-      delete d_context;
-    }
-
-    int
-    source_reqrep_nopoll_impl::work(int noutput_items,
-				    gr_vector_const_void_star &input_items,
-				    gr_vector_void_star &output_items)
-    {
-      char *out = (char*)output_items[0];
-
-      // Request data, FIXME non portable
-      zmq::message_t request(sizeof(int));
-      memcpy ((void *) request.data (), &noutput_items, sizeof(int));
-      d_socket->send(request);
-
-      // Receive data
-      zmq::message_t reply;
-      d_socket->recv(&reply);
-
-      // Copy to ouput buffer and return
-      memcpy(out, (void *)reply.data(), reply.size());
-
-      return reply.size()/d_itemsize;
-    }
-
-  } /* namespace zeromq */
-} /* namespace gr */
diff --git a/gr-zeromq/lib/source_reqrep_nopoll_impl.h b/gr-zeromq/lib/source_reqrep_nopoll_impl.h
deleted file mode 100644
index 744a01f781..0000000000
--- a/gr-zeromq/lib/source_reqrep_nopoll_impl.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
- * This 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.
- *
- * This software 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 this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_ZMQBLOCKS_SOURCE_REQREP_NOPOLL_IMPL_H
-#define INCLUDED_ZMQBLOCKS_SOURCE_REQREP_NOPOLL_IMPL_H
-
-#include <gnuradio/zeromq/source_reqrep_nopoll.h>
-#include <zmq.hpp>
-
-namespace gr {
-    namespace zeromq {
-
-        class source_reqrep_nopoll_impl : public source_reqrep_nopoll
-        {
-	private:
-	  size_t          d_itemsize;
-	  zmq::context_t  *d_context;
-	  zmq::socket_t   *d_socket;
-
-	public:
-	  source_reqrep_nopoll_impl(size_t itemsize, char *address);
-	  ~source_reqrep_nopoll_impl();
-
-	  int work(int noutput_items,
-		   gr_vector_const_void_star &input_items,
-		   gr_vector_void_star &output_items);
-        };
-
-    } // namespace zeromq
-} // namespace gr
-
-#endif /* INCLUDED_ZMQBLOCKS_SOURCE_REQREP_NOPOLL_IMPL_H */
diff --git a/gr-zeromq/swig/zeromq_swig.i b/gr-zeromq/swig/zeromq_swig.i
index 44dc0f5253..36f8b2e279 100644
--- a/gr-zeromq/swig/zeromq_swig.i
+++ b/gr-zeromq/swig/zeromq_swig.i
@@ -31,24 +31,18 @@
 #include "gnuradio/zeromq/pub_sink.h"
 #include "gnuradio/zeromq/push_sink.h"
 #include "gnuradio/zeromq/rep_sink.h"
-#include "gnuradio/zeromq/sink_reqrep_nopoll.h"
 #include "gnuradio/zeromq/pull_source.h"
 #include "gnuradio/zeromq/req_source.h"
-#include "gnuradio/zeromq/source_reqrep_nopoll.h"
 %}
 
 %include "gnuradio/zeromq/pub_sink.h"
 %include "gnuradio/zeromq/push_sink.h"
 %include "gnuradio/zeromq/rep_sink.h"
-%include "gnuradio/zeromq/sink_reqrep_nopoll.h"
 %include "gnuradio/zeromq/pull_source.h"
 %include "gnuradio/zeromq/req_source.h"
-%include "gnuradio/zeromq/source_reqrep_nopoll.h"
 
 GR_SWIG_BLOCK_MAGIC2(zeromq, pub_sink);
 GR_SWIG_BLOCK_MAGIC2(zeromq, push_sink);
 GR_SWIG_BLOCK_MAGIC2(zeromq, rep_sink);
-GR_SWIG_BLOCK_MAGIC2(zeromq, sink_reqrep_nopoll);
 GR_SWIG_BLOCK_MAGIC2(zeromq, pull_source);
 GR_SWIG_BLOCK_MAGIC2(zeromq, req_source);
-GR_SWIG_BLOCK_MAGIC2(zeromq, source_reqrep_nopoll);
author	Johnathan Corgan <johnathan@corganlabs.com>	2014-05-06 13:21:16 -0700
committer	Johnathan Corgan <johnathan@corganlabs.com>	2014-05-06 13:21:16 -0700
commit	f7966b9cacfd88650dac4b7d9000c82675f46936 (patch)
tree	62c3777c21ace6fb8379c8d028e3ec6ec1f17136
parent	35aaec4d0d4b6f995911fd6d38697bc239cd68cf (diff)