Merge branch 'master' into file_meta_data

Conflicts:
	gr-utils/src/python/CMakeLists.txt

17 files changed, 326 insertions, 6 deletions

diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 221070111..37a6321f5 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -38,6 +38,15 @@
 		<block>virtual_sink</block>
 		<block>gr_tag_debug</block>
 	</cat>
+    <cat>
+        <name>Message Tools</name>
+        <block>gr_message_debug</block>
+        <block>gr_message_strobe</block>
+        <block>gr_pdu_to_tagged_stream</block>
+        <block>gr_tagged_stream_to_pdu</block>
+        <block>gr_tuntap_pdu</block>
+        <block>gr_socket_pdu</block>
+    </cat>
 	<cat>
 		<name>Operators</name>
 		<block>gr_add_xx</block>
diff --git a/grc/blocks/gr_file_source.xml b/grc/blocks/gr_file_source.xml
index fcc7a7040..5f0e16b27 100644
--- a/grc/blocks/gr_file_source.xml
+++ b/grc/blocks/gr_file_source.xml
@@ -9,6 +9,7 @@
 	<key>gr_file_source</key>
 	<import>from gnuradio import gr</import>
 	<make>gr.file_source($type.size*$vlen, $file, $repeat)</make>
+	<callback>open($file, $repeat)</callback>
 	<param>
 		<name>File</name>
 		<key>file</key>
diff --git a/grc/blocks/gr_message_debug.xml b/grc/blocks/gr_message_debug.xml
new file mode 100644
index 000000000..4d73fbd9c
--- /dev/null
+++ b/grc/blocks/gr_message_debug.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Message Debug
+###################################################
+ -->
+<block>
+	<name>Message Debug</name>
+	<key>gr_message_debug</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.message_debug()</make>
+	<sink>
+		<name>print</name>
+		<type>message</type>
+		<optional>1</optional>
+	</sink>
+	<sink>
+		<name>store</name>
+		<type>message</type>
+		<optional>1</optional>
+	</sink>
+	<sink>
+		<name>print_pdu_verbose</name>
+		<type>message</type>
+        <optional>1</optional>
+	</sink>
+</block>
diff --git a/grc/blocks/gr_message_strobe.xml b/grc/blocks/gr_message_strobe.xml
new file mode 100644
index 000000000..60a7724df
--- /dev/null
+++ b/grc/blocks/gr_message_strobe.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Message Strobe 
+###################################################
+ -->
+<block>
+	<name>Message Strobe</name>
+	<key>gr_message_strobe</key>
+	<import>from gnuradio import gr</import>
+	<import>from gruel import pmt</import>
+	<make>gr.message_strobe($msg, $period)</make>
+	<param>
+		<name>Message PMT</name>
+		<key>msg</key>
+		<value>pmt.pmt_intern("TEST")</value>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Period (ms)</name>
+		<key>period</key>
+		<value>1000</value>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>set_msg</name>
+		<type>message</type>
+        <optional>1</optional>
+	</sink>
+	<source>
+		<name>strobe</name>
+		<type>message</type>
+        <optional>1</optional>
+	</source>
+</block>
diff --git a/grc/blocks/gr_pdu_to_tagged_stream.xml b/grc/blocks/gr_pdu_to_tagged_stream.xml
new file mode 100644
index 000000000..fc1c4d16a
--- /dev/null
+++ b/grc/blocks/gr_pdu_to_tagged_stream.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## PDU Message to Tagged Stream
+###################################################
+ -->
+<block>
+	<name>PDU to Tagged Stream</name>
+	<key>gr_pdu_to_tagged_stream</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.pdu_to_tagged_stream($type.tv)</make>
+    <param>
+        <name>Item Type</name>
+        <key>type</key>
+        <type>enum</type>
+        <option>
+            <name>Byte</name>
+            <key>byte</key>
+            <opt>tv:gr.BYTE</opt>
+        </option>
+        <option>
+            <name>Complex</name>
+            <key>complex</key>
+            <opt>tv:gr.COMPLEX</opt>
+        </option>
+        <option>
+            <name>Float</name>
+            <key>float</key>
+            <opt>tv:gr.FLOAT</opt>
+        </option>
+    </param>
+	<sink>
+		<name>pdus</name>
+		<type>message</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type</type>
+	</source>
+</block>
diff --git a/grc/blocks/gr_socket_pdu.xml b/grc/blocks/gr_socket_pdu.xml
new file mode 100644
index 000000000..a175c3699
--- /dev/null
+++ b/grc/blocks/gr_socket_pdu.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## Socket PDU Message source/sink
+###################################################
+ -->
+<block>
+	<name>Socket PDU</name>
+	<key>gr_socket_pdu</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.socket_pdu($type, $host, $port, $mtu)</make>
+    <param>
+        <name>Type</name>
+        <key>type</key>
+        <value>TCP_SERVER</value>
+        <type>enum</type>
+        <option>
+            <name>TCP Server</name>
+            <key>"TCP_SERVER"</key>
+        </option>
+        <option>
+            <name>TCP Client</name>
+            <key>"TCP_CLIENT"</key>
+        </option>
+        <option>
+            <name>UDP Server</name>
+            <key>"UDP_SERVER"</key>
+        </option>
+        <option>
+            <name>UDP Client</name>
+            <key>"UDP_CLIENT"</key>
+        </option>
+    </param>
+    <param>
+        <name>Host</name>
+        <key>host</key>
+        <value></value>
+        <type>string</type>
+    </param>
+    <param>
+        <name>Port</name>
+        <key>port</key>
+        <value>52001</value>
+        <type>string</type>
+    </param>
+    <param>
+        <name>MTU</name>
+        <key>mtu</key>
+        <value>10000</value>
+        <type>int</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/grc/blocks/gr_tagged_stream_to_pdu.xml b/grc/blocks/gr_tagged_stream_to_pdu.xml
new file mode 100644
index 000000000..e70a01608
--- /dev/null
+++ b/grc/blocks/gr_tagged_stream_to_pdu.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## Tagged Stream to PDU Message
+###################################################
+ -->
+<block>
+	<name>Tagged Stream to PDU</name>
+	<key>gr_tagged_stream_to_pdu</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.tagged_stream_to_pdu($type.tv)</make>
+    <param>
+        <name>Item Type</name>
+        <key>type</key>
+        <type>enum</type>
+        <option>
+            <name>Byte</name>
+            <key>byte</key>
+            <opt>tv:gr.BYTE</opt>
+        </option>
+        <option>
+            <name>Complex</name>
+            <key>complex</key>
+            <opt>tv:gr.COMPLEX</opt>
+        </option>
+        <option>
+            <name>Float</name>
+            <key>float</key>
+            <opt>tv:gr.FLOAT</opt>
+        </option>
+    </param>
+	<sink>
+		<name>in</name>
+		<type>$type</type>
+	</sink>
+	<source>
+		<name>pdus</name>
+		<type>message</type>
+	</source>
+</block>
diff --git a/grc/blocks/gr_tuntap_pdu.xml b/grc/blocks/gr_tuntap_pdu.xml
new file mode 100644
index 000000000..f169345af
--- /dev/null
+++ b/grc/blocks/gr_tuntap_pdu.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## Tuntap PDU Message source/sink
+###################################################
+ -->
+<block>
+	<name>TunTap PDU</name>
+	<key>gr_tuntap_pdu</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.tuntap_pdu($ifn, $mtu)</make>
+    <param>
+        <name>Interface Name</name>
+        <key>ifn</key>
+        <value>tun0</value>
+        <type>string</type>
+    </param>
+    <param>
+        <name>MTU</name>
+        <key>mtu</key>
+        <value>10000</value>
+        <type>int</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/grc/blocks/pad_sink.xml b/grc/blocks/pad_sink.xml
index f89eaa53c..f0e10a339 100644
--- a/grc/blocks/pad_sink.xml
+++ b/grc/blocks/pad_sink.xml
@@ -7,7 +7,9 @@
 <block>
 	<name>Pad Sink</name>
 	<key>pad_sink</key>
-	<make></make>
+    <make>#if str($type) == "message"
+None;self.message_port_register_hier_in($label)
+#end if</make>
 	<param>
 		<name>Label</name>
 		<key>label</key>
@@ -44,6 +46,11 @@
 			<opt>size:gr.sizeof_char</opt>
 		</option>
 		<option>
+			<name>Message</name>
+			<key>message</key>
+			<opt>size:0</opt>
+		</option>
+		<option>
 			<name>Wildcard</name>
 			<key></key>
 			<opt>size:0</opt>
diff --git a/grc/blocks/pad_source.xml b/grc/blocks/pad_source.xml
index cbf38eb39..a56a65dcc 100644
--- a/grc/blocks/pad_source.xml
+++ b/grc/blocks/pad_source.xml
@@ -7,7 +7,9 @@
 <block>
 	<name>Pad Source</name>
 	<key>pad_source</key>
-	<make></make>
+    <make>#if str($type) == "message"
+None;self.message_port_register_hier_out($label)
+#end if</make>
 	<param>
 		<name>Label</name>
 		<key>label</key>
@@ -44,6 +46,11 @@
 			<opt>size:gr.sizeof_char</opt>
 		</option>
 		<option>
+			<name>Message</name>
+			<key>message</key>
+			<opt>size:0</opt>
+		</option>
+		<option>
 			<name>Wildcard</name>
 			<key></key>
 			<opt>size:0</opt>
diff --git a/grc/python/Connection.py b/grc/python/Connection.py
index 218baf074..341dd2d82 100644
--- a/grc/python/Connection.py
+++ b/grc/python/Connection.py
@@ -31,6 +31,9 @@ class Connection(_Connection, _GUIConnection):
 	def is_msg(self):
 		return self.get_source().get_type() == self.get_sink().get_type() == 'msg'
 
+	def is_message(self):
+		return self.get_source().get_type() == self.get_sink().get_type() == 'message'
+
 	def validate(self):
 		"""
 		Validate the connections.
diff --git a/grc/python/Constants.py b/grc/python/Constants.py
index 1a65caf1c..b8dc9a96a 100644
--- a/grc/python/Constants.py
+++ b/grc/python/Constants.py
@@ -58,6 +58,7 @@ CORE_TYPES = ( #name, key, sizeof, color
 	('Integer 16', 's16', 2, '#FFFF66'),
 	('Integer 8', 's8', 1, '#FF66FF'),
 	('Message Queue', 'msg', 0, '#777777'),
+	('Async Message', 'message', 0, '#C0C0C0'),
 	('Wildcard', '', 0, '#FFFFFF'),
 )
 
diff --git a/grc/python/FlowGraph.py b/grc/python/FlowGraph.py
index efe362760..376c2e337 100644
--- a/grc/python/FlowGraph.py
+++ b/grc/python/FlowGraph.py
@@ -58,6 +58,8 @@ class FlowGraph(_FlowGraph, _GUIFlowGraph):
 			'in': self.get_pad_sources(),
 			'out': self.get_pad_sinks(),
 		}[direction]
+        # we only want stream ports
+		sorted_pads = filter(lambda b: b.get_param('type').get_evaluated() != 'message', sorted_pads);
 		#load io signature
 		return [{
 			'label': str(pad.get_param('label').get_evaluated()),
@@ -83,6 +85,14 @@ class FlowGraph(_FlowGraph, _GUIFlowGraph):
 		pads = filter(lambda b: b.get_key() == 'pad_sink', self.get_enabled_blocks())
 		return sorted(pads, lambda x, y: cmp(x.get_id(), y.get_id()))
 
+	def get_msg_pad_sources(self):
+		ps = self.get_pad_sources();
+		return filter(lambda b: b.get_param('type').get_evaluated() == 'message', ps);
+
+	def get_msg_pad_sinks(self):
+		ps = self.get_pad_sinks();
+		return filter(lambda b: b.get_param('type').get_evaluated() == 'message', ps);
+
 	def get_imports(self):
 		"""
 		Get a set of all import statments in this flow graph namespace.
diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index 2a6fe51d5..616ea00fc 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -116,8 +116,9 @@ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''')
 		#list of regular blocks (all blocks minus the special ones)
 		blocks = filter(lambda b: b not in (imports + parameters), blocks)
 		#list of connections where each endpoint is enabled
-		connections = filter(lambda c: not c.is_msg(), self._flow_graph.get_enabled_connections())
+		connections = filter(lambda c: not (c.is_msg() or c.is_message()), self._flow_graph.get_enabled_connections())
 		messages = filter(lambda c: c.is_msg(), self._flow_graph.get_enabled_connections())
+		messages2 = filter(lambda c: c.is_message(), self._flow_graph.get_enabled_connections())
 		#list of variable names
 		var_ids = [var.get_id() for var in parameters + variables]
 		#prepend self.
@@ -142,6 +143,7 @@ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''')
 			'blocks': blocks,
 			'connections': connections,
 			'messages': messages,
+			'messages2': messages2,
 			'generate_options': self._generate_options,
 			'var_id2cbs': var_id2cbs,
 		}
diff --git a/grc/python/Port.py b/grc/python/Port.py
index 9f8b50d05..738a33ba7 100644
--- a/grc/python/Port.py
+++ b/grc/python/Port.py
@@ -116,7 +116,7 @@ class Port(_Port, _GUIPort):
 		_Port.validate(self)
 		if not self.get_enabled_connections() and not self.get_optional():
 			self.add_error_message('Port is not connected.')
-		if not self.is_source() and len(self.get_enabled_connections()) > 1:
+		if not self.is_source() and (not self.get_type() == "message") and len(self.get_enabled_connections()) > 1:
 			self.add_error_message('Port has too many connections.')
 		#message port logic
 		if self.get_type() == 'msg':
diff --git a/grc/python/convert_hier.py b/grc/python/convert_hier.py
index b609af24a..508ec63b2 100644
--- a/grc/python/convert_hier.py
+++ b/grc/python/convert_hier.py
@@ -25,6 +25,8 @@ def convert_hier(flow_graph, python_file):
 	#extract info from the flow graph
 	input_sigs = flow_graph.get_io_signaturev('in')
 	output_sigs = flow_graph.get_io_signaturev('out')
+	input_msgp = flow_graph.get_msg_pad_sources();
+	output_msgp = flow_graph.get_msg_pad_sinks();
 	parameters = flow_graph.get_parameters()
 	block_key = flow_graph.get_option('id')
 	block_name = flow_graph.get_option('title') or flow_graph.get_option('id').replace('_', ' ').title()
@@ -55,7 +57,7 @@ def convert_hier(flow_graph, python_file):
 		param_n['type'] = 'raw'
 		params_n.append(param_n)
 	block_n['param'] = params_n
-	#sink data
+	#sink data stream ports
 	block_n['sink'] = list()
 	for input_sig in input_sigs:
 		sink_n = odict()
@@ -64,7 +66,14 @@ def convert_hier(flow_graph, python_file):
 		sink_n['vlen'] = input_sig['vlen']
 		if input_sig['optional']: sink_n['optional'] = '1'
 		block_n['sink'].append(sink_n)
-	#source data
+	#sink data msg ports
+	for input_sig in input_msgp:
+		sink_n = odict()
+		sink_n['name'] = input_sig.get_param("label").get_value();
+		sink_n['type'] = "message"
+		sink_n['optional'] = input_sig.get_param("optional").get_value();
+		block_n['sink'].append(sink_n)
+	#source data stream ports
 	block_n['source'] = list()
 	for output_sig in output_sigs:
 		source_n = odict()
@@ -73,6 +82,13 @@ def convert_hier(flow_graph, python_file):
 		source_n['vlen'] = output_sig['vlen']
 		if output_sig['optional']: source_n['optional'] = '1'
 		block_n['source'].append(source_n)
+	#source data msg ports
+	for output_sig in output_msgp:
+		source_n = odict()
+		source_n['name'] = output_sig.get_param("label").get_value();
+		source_n['type'] = "message"
+		source_n['optional'] = output_sig.get_param("optional").get_value();
+		block_n['source'].append(source_n)
 	#doc data
 	block_n['doc'] = "%s\n%s\n%s"%(block_author, block_desc, python_file)
 	block_n['grc_source'] = "%s"%(flow_graph.grc_file_path)
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index 17feb01f6..163e7f76a 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -191,6 +191,32 @@ gr.io_signaturev($(len($io_sigs)), $(len($io_sigs)), [$(', '.join($size_strs))])
 #end for
 
 ########################################################
+##Create Asynch Message Connections
+########################################################
+#if $messages2
+		$DIVIDER
+		# Asynch Message Connections
+		$DIVIDER
+#end if
+#for $msg in $messages2
+		#set $sr = $msg.get_source()
+		#set $source = "self.%s"%($sr.get_parent().get_id())
+		#set $source_port = $sr.get_name();
+		#if $sr.get_parent().get_key() == "pad_source"
+			#set $source = "self"
+			#set $source_port = $sr.get_parent().get_param("label").get_value();
+		#end if
+		#set $sk = $msg.get_sink()
+		#set $sink = "self.%s"%($sk.get_parent().get_id())
+		#set $sink_port = $sk.get_name();
+		#if $sk.get_parent().get_key() == "pad_sink"
+			#set $sink = "self"
+			#set $sink_port = $sk.get_parent().get_param("label").get_value();
+		#end if
+		self.msg_connect($source, "$source_port", $sink, "$sink_port")
+#end for
+
+########################################################
 ##Create Callbacks
 ##	Write a set method for this variable that calls the callbacks
 ########################################################