From bcee01bf9bb04eeda82158e564949d79715bfca3 Mon Sep 17 00:00:00 2001
From: Marcus Müller <marcus@hostalia.de>
Date: Mon, 25 Aug 2014 23:14:39 +0200
Subject: grc: Generator warning for flowgraphs with a throttle and an external
source/sink
The Generator will now issue a warning that it is usually wrong to use
any hardware flow control and a throttle block at the same time.
---
grc/python/Generator.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'grc/python/Generator.py')
diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index eb24b75732..92f36cf30b 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -59,11 +59,17 @@ class Generator(object):
def write(self):
#do throttle warning
- throttled = any(map(lambda b: b.throttle(), self._flow_graph.get_enabled_blocks()))
- if not throttled and self._generate_options != 'hb':
+ throttling_blocks = filter(lambda b: b.throttle(), self._flow_graph.get_enabled_blocks())
+ if not throttling_blocks and self._generate_options != 'hb':
Messages.send_warning('''\
-This flow graph may not have flow control: no audio or usrp blocks found. \
+This flow graph may not have flow control: no audio or RF hardware blocks found. \
Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''')
+ if len(throttling_blocks) > 1:
+ keys = set(map(lambda b: b.get_key(), throttling_blocks))
+ if len(keys) > 1 and 'blocks_throttle' in keys:
+ Messages.send_warning('''\
+This flow graph contains a throttle block and another rate limiting block, e.g. a hardware source or sink. \
+This is usually undesired. Consider removing the throttle block.''')
#generate
open(self.get_file_path(), 'w').write(str(self))
if self._generate_options == 'hb':
--
cgit v1.2.3