From f9c0d4c2e39aa28cc501ceb6479afc32f7849b11 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 9 Sep 2013 00:01:07 -0700
Subject: gras: work on global config that works on hier

---
 lib/block_config.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'lib/block_config.cpp')

diff --git a/lib/block_config.cpp b/lib/block_config.cpp
index 165ab47..e34aa0c 100644
--- a/lib/block_config.cpp
+++ b/lib/block_config.cpp
@@ -11,6 +11,27 @@ GlobalBlockConfig::GlobalBlockConfig(void)
     interruptible_work = false;
 }
 
+void GlobalBlockConfig::merge(const GlobalBlockConfig &config)
+{
+    //overwrite with global config only if maxium_items is not set (zero)
+    if (this->maximum_output_items == 0)
+    {
+        this->maximum_output_items = config.maximum_output_items;
+    }
+
+    //overwrite with global node affinity setting for buffers if not set
+    if (this->buffer_affinity == -1)
+    {
+        this->buffer_affinity = config.buffer_affinity;
+    }
+
+    //overwrite with global interruptable setting for work if not set
+    if (this->interruptible_work == false)
+    {
+        this->interruptible_work = config.interruptible_work;
+    }
+}
+
 InputPortConfig::InputPortConfig(void)
 {
     item_size = 1;
-- 
cgit