11 files changed, 82 insertions, 115 deletions
diff --git a/gr-zeromq/examples/zeromq_pubsub.grc b/gr-zeromq/examples/zeromq_pubsub.grc
index 89e98024c6..ffa349ebe9 100644
--- a/gr-zeromq/examples/zeromq_pubsub.grc
+++ b/gr-zeromq/examples/zeromq_pubsub.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Tue May 13 12:47:08 2014</timestamp>
+  <timestamp>Tue May 13 16:24:39 2014</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -280,53 +280,6 @@
     </param>
   </block>
   <block>
-    <key>zeromq_sub_source</key>
-    <param>
-      <key>id</key>
-      <value>zeromq_sub_source_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>address</key>
-      <value>tcp://127.0.0.1:5555</value>
-    </param>
-    <param>
-      <key>timeout</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(146, 415)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>zeromq_pub_sink</key>
     <param>
       <key>id</key>
@@ -353,16 +306,12 @@
       <value>100</value>
     </param>
     <param>
-      <key>blocking</key>
-      <value>True</value>
-    </param>
-    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(753, 111)</value>
+      <value>(801, 142)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -448,6 +397,53 @@
       <value>0</value>
     </param>
   </block>
+  <block>
+    <key>zeromq_sub_source</key>
+    <param>
+      <key>id</key>
+      <value>zeromq_sub_source_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>address</key>
+      <value>tcp://127.0.0.1:5555</value>
+    </param>
+    <param>
+      <key>timeout</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(263, 406)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
   <connection>
     <source_block_id>analog_sig_source_x_0</source_block_id>
     <sink_block_id>blocks_add_xx_0</sink_block_id>
diff --git a/gr-zeromq/examples/zeromq_pushpull.grc b/gr-zeromq/examples/zeromq_pushpull.grc
index 7b3146c7f0..d608fcb89d 100644
--- a/gr-zeromq/examples/zeromq_pushpull.grc
+++ b/gr-zeromq/examples/zeromq_pushpull.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Fri May  9 15:00:28 2014</timestamp>
+  <timestamp>Tue May 13 15:19:02 2014</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -359,10 +359,10 @@
     </param>
   </block>
   <block>
-    <key>zeromq_pull_source</key>
+    <key>zeromq_push_sink</key>
     <param>
       <key>id</key>
-      <value>zeromq_pull_source_0</value>
+      <value>zeromq_push_sink_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -378,27 +378,23 @@
     </param>
     <param>
       <key>address</key>
-      <value>tcp://localhost:5555</value>
+      <value>tcp://127.0.0.1:5555</value>
     </param>
     <param>
       <key>timeout</key>
       <value>100</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>blocking</key>
+      <value>False</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(137, 307)</value>
+      <value>(751, 96)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -406,10 +402,10 @@
     </param>
   </block>
   <block>
-    <key>zeromq_push_sink</key>
+    <key>zeromq_pull_source</key>
     <param>
       <key>id</key>
-      <value>zeromq_push_sink_0</value>
+      <value>zeromq_pull_source_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -432,16 +428,20 @@
       <value>100</value>
     </param>
     <param>
-      <key>blocking</key>
-      <value>False</value>
-    </param>
-    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(751, 96)</value>
+      <value>(137, 307)</value>
     </param>
     <param>
       <key>_rotation</key>
diff --git a/gr-zeromq/grc/zeromq_pub_sink.xml b/gr-zeromq/grc/zeromq_pub_sink.xml
index 7f0a88691e..3c52eabfa7 100644
--- a/gr-zeromq/grc/zeromq_pub_sink.xml
+++ b/gr-zeromq/grc/zeromq_pub_sink.xml
@@ -4,7 +4,7 @@
   <key>zeromq_pub_sink</key>
   <category>ZeroMQ Interfaces</category>
   <import>from gnuradio import zeromq</import>
-  <make>zeromq.pub_sink($type.itemsize, $vlen, $address, $blocking)</make>
+  <make>zeromq.pub_sink($type.itemsize, $vlen, $address, $timeout)</make>
 
   <param>
     <name>IO Type</name>
@@ -53,17 +53,10 @@
   <param>
     <name>Timeout (msec)</name>
     <key>timeout</key>
-    <value>0.1</value>
+    <value>100</value>
     <type>float</type>
   </param>
 
-  <param>
-    <name>Blocking</name>
-    <key>blocking</key>
-    <value>True</value>
-    <type>bool</type>
-  </param>
-
   <sink>
     <name>in</name>
     <type>$type</type>
diff --git a/gr-zeromq/grc/zeromq_pull_source.xml b/gr-zeromq/grc/zeromq_pull_source.xml
index f00fb57ee1..d407e3d19e 100644
--- a/gr-zeromq/grc/zeromq_pull_source.xml
+++ b/gr-zeromq/grc/zeromq_pull_source.xml
@@ -53,7 +53,7 @@
   <param>
     <name>Timeout (msec)</name>
     <key>timeout</key>
-    <value>0.1</value>
+    <value>100</value>
     <type>float</type>
   </param>
 
diff --git a/gr-zeromq/grc/zeromq_push_sink.xml b/gr-zeromq/grc/zeromq_push_sink.xml
index df901c8fe2..5bd47024b0 100644
--- a/gr-zeromq/grc/zeromq_push_sink.xml
+++ b/gr-zeromq/grc/zeromq_push_sink.xml
@@ -4,7 +4,7 @@
   <key>zeromq_push_sink</key>
   <category>ZeroMQ Interfaces</category>
   <import>from gnuradio import zeromq</import>
-  <make>zeromq.push_sink($type.itemsize, $vlen, $address, $blocking)</make>
+  <make>zeromq.push_sink($type.itemsize, $vlen, $address, $timeout)</make>
 
   <param>
     <name>IO Type</name>
@@ -53,17 +53,10 @@
   <param>
     <name>Timeout (msec)</name>
     <key>timeout</key>
-    <value>0.1</value>
+    <value>100</value>
     <type>float</type>
   </param>
 
-  <param>
-    <name>Blocking</name>
-    <key>blocking</key>
-    <value>True</value>
-    <type>bool</type>
-  </param>
-
   <sink>
     <name>in</name>
     <type>$type</type>
diff --git a/gr-zeromq/grc/zeromq_rep_sink.xml b/gr-zeromq/grc/zeromq_rep_sink.xml
index 293305c74a..b7753f062f 100644
--- a/gr-zeromq/grc/zeromq_rep_sink.xml
+++ b/gr-zeromq/grc/zeromq_rep_sink.xml
@@ -4,7 +4,7 @@
   <key>zeromq_rep_sink</key>
   <category>ZeroMQ Interfaces</category>
   <import>from gnuradio import zeromq</import>
-  <make>zeromq.rep_sink($type.itemsize, $vlen, $address, $blocking)</make>
+  <make>zeromq.rep_sink($type.itemsize, $vlen, $address, $timeout)</make>
 
   <param>
     <name>IO Type</name>
@@ -53,17 +53,10 @@
   <param>
     <name>Timeout (msec)</name>
     <key>timeout</key>
-    <value>0.1</value>
+    <value>100</value>
     <type>float</type>
   </param>
 
-  <param>
-    <name>Blocking</name>
-    <key>blocking</key>
-    <value>True</value>
-    <type>bool</type>
-  </param>
-
   <sink>
     <name>in</name>
     <type>$type</type>
diff --git a/gr-zeromq/grc/zeromq_req_source.xml b/gr-zeromq/grc/zeromq_req_source.xml
index 6da400b2b7..ee2a70d342 100644
--- a/gr-zeromq/grc/zeromq_req_source.xml
+++ b/gr-zeromq/grc/zeromq_req_source.xml
@@ -4,7 +4,7 @@
   <key>zeromq_req_source</key>
   <category>ZeroMQ Interfaces</category>
   <import>from gnuradio import zeromq</import>
-  <make>zeromq.req_source($type.itemsize, $vlen, $address)</make>
+  <make>zeromq.req_source($type.itemsize, $vlen, $address, $timeout)</make>
 
   <param>
     <name>IO Type</name>
@@ -53,17 +53,10 @@
   <param>
     <name>Timeout (msec)</name>
     <key>timeout</key>
-    <value>0.1</value>
+    <value>100</value>
     <type>float</type>
   </param>
 
-  <param>
-    <name>Blocking</name>
-    <key>blocking</key>
-    <value>True</value>
-    <type>bool</type>
-  </param>
-
   <source>
     <name>out</name>
     <type>$type</type>
diff --git a/gr-zeromq/grc/zeromq_sub_source.xml b/gr-zeromq/grc/zeromq_sub_source.xml
index 307c981d44..91d107df24 100644
--- a/gr-zeromq/grc/zeromq_sub_source.xml
+++ b/gr-zeromq/grc/zeromq_sub_source.xml
@@ -53,7 +53,7 @@
   <param>
     <name>Timeout (msec)</name>
     <key>timeout</key>
-    <value>0.1</value>
+    <value>100</value>
     <type>float</type>
   </param>
 
diff --git a/gr-zeromq/include/gnuradio/zeromq/pub_sink.h b/gr-zeromq/include/gnuradio/zeromq/pub_sink.h
index 31a53648fa..a60fb15c88 100644
--- a/gr-zeromq/include/gnuradio/zeromq/pub_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/pub_sink.h
@@ -51,7 +51,7 @@ namespace gr {
        * \param itemsize Size of a stream item in bytes
        * \param vlen Vector length of the input items. Note that one vector is one item.
        * \param address  ZMQ socket address specifier
-       * \param blocking Indicate whether blocking sends should be used, default true.
+       * \param timeout  Receive timeout in seconds, default is 100ms, 1us increments
        */
       static sptr make(size_t itemsize, size_t vlen, char *address, int timeout=100);
     };
diff --git a/gr-zeromq/include/gnuradio/zeromq/push_sink.h b/gr-zeromq/include/gnuradio/zeromq/push_sink.h
index 541993d080..b54a1e40d8 100644
--- a/gr-zeromq/include/gnuradio/zeromq/push_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/push_sink.h
@@ -52,7 +52,7 @@ namespace gr {
        * \param itemsize Size of a stream item in bytes
        * \param vlen Vector length of the input items. Note that one vector is one item.
        * \param address  ZMQ socket address specifier
-       * \param blocking Indicate whether blocking sends should be used, default true.
+       * \param timeout  Receive timeout in seconds, default is 100ms, 1us increments
        *
        */
       static sptr make(size_t itemsize, size_t vlen, char *address, int timeout=100);
diff --git a/gr-zeromq/include/gnuradio/zeromq/rep_sink.h b/gr-zeromq/include/gnuradio/zeromq/rep_sink.h
index ab92c4d168..1da325257f 100644
--- a/gr-zeromq/include/gnuradio/zeromq/rep_sink.h
+++ b/gr-zeromq/include/gnuradio/zeromq/rep_sink.h
@@ -50,8 +50,7 @@ namespace gr {
        * \param itemsize Size of a stream item in bytes
        * \param vlen Vector length of the input items. Note that one vector is one item.
        * \param address  ZMQ socket address specifier
-       * \param timeout  Timeout for request poll, in seconds
-       * \param blocking Indicate whether blocking sends should be used, default true.
+       * \param timeout  Receive timeout in seconds, default is 100ms, 1us increments
        *
        */
       static sptr make(size_t itemsize, size_t vlen, char *address, int timeout=100);