Merge branch 'embb455_dataflow_source_semantics' into development

dataflow_cpp/include/embb/dataflow/internal/source_executor.h

@@ -53,7 +53,9 @@ class SourceExecutor< Outputs<Slices, O1> > {
     Outputs<Slices, O1> & outputs) {
     Outputs<Slices, O1> & outputs) {
     O1 o1;
     O1 o1;
     bool result = function_(o1);
     bool result = function_(o1);
+    if (result) {
       outputs.template Get<0>().Send(Signal<O1>(clock, o1));
       outputs.template Get<0>().Send(Signal<O1>(clock, o1));
+    }
     return result;
     return result;
   }
   }
 
 
@@ -78,8 +80,10 @@ class SourceExecutor< Outputs<Slices, O1, O2> > {
     O1 o1;
     O1 o1;
     O2 o2;
     O2 o2;
     bool result = function_(o1, o2);
     bool result = function_(o1, o2);
+    if (result) {
       outputs.template Get<0>().Send(Signal<O1>(clock, o1));
       outputs.template Get<0>().Send(Signal<O1>(clock, o1));
       outputs.template Get<1>().Send(Signal<O2>(clock, o2));
       outputs.template Get<1>().Send(Signal<O2>(clock, o2));
+    }
     return result;
     return result;
   }
   }
 
 
@@ -106,9 +110,11 @@ class SourceExecutor< Outputs<Slices, O1, O2, O3> > {
     O2 o2;
     O2 o2;
     O3 o3;
     O3 o3;
     bool result = function_(o1, o2, o3);
     bool result = function_(o1, o2, o3);
+    if (result) {
       outputs.template Get<0>().Send(Signal<O1>(clock, o1));
       outputs.template Get<0>().Send(Signal<O1>(clock, o1));
       outputs.template Get<1>().Send(Signal<O2>(clock, o2));
       outputs.template Get<1>().Send(Signal<O2>(clock, o2));
       outputs.template Get<2>().Send(Signal<O3>(clock, o3));
       outputs.template Get<2>().Send(Signal<O3>(clock, o3));
+    }
     return result;
     return result;
   }
   }
 
 
@@ -137,10 +143,12 @@ class SourceExecutor< Outputs<Slices, O1, O2, O3, O4> > {
     O3 o3;
     O3 o3;
     O4 o4;
     O4 o4;
     bool result = function_(o1, o2, o3, o4);
     bool result = function_(o1, o2, o3, o4);
+    if (result) {
       outputs.template Get<0>().Send(Signal<O1>(clock, o1));
       outputs.template Get<0>().Send(Signal<O1>(clock, o1));
       outputs.template Get<1>().Send(Signal<O2>(clock, o2));
       outputs.template Get<1>().Send(Signal<O2>(clock, o2));
       outputs.template Get<2>().Send(Signal<O3>(clock, o3));
       outputs.template Get<2>().Send(Signal<O3>(clock, o3));
       outputs.template Get<3>().Send(Signal<O4>(clock, o4));
       outputs.template Get<3>().Send(Signal<O4>(clock, o4));
+    }
     return result;
     return result;
   }
   }
 
 
@@ -172,11 +180,13 @@ class SourceExecutor< Outputs<Slices, O1, O2, O3, O4, O5> > {
     O4 o4;
     O4 o4;
     O5 o5;
     O5 o5;
     bool result = function_(o1, o2, o3, o4, o5);
     bool result = function_(o1, o2, o3, o4, o5);
+    if (result) {
       outputs.template Get<0>().Send(Signal<O1>(clock, o1));
       outputs.template Get<0>().Send(Signal<O1>(clock, o1));
       outputs.template Get<1>().Send(Signal<O2>(clock, o2));
       outputs.template Get<1>().Send(Signal<O2>(clock, o2));
       outputs.template Get<2>().Send(Signal<O3>(clock, o3));
       outputs.template Get<2>().Send(Signal<O3>(clock, o3));
       outputs.template Get<3>().Send(Signal<O4>(clock, o4));
       outputs.template Get<3>().Send(Signal<O4>(clock, o4));
       outputs.template Get<4>().Send(Signal<O5>(clock, o5));
       outputs.template Get<4>().Send(Signal<O5>(clock, o5));
+    }
     return result;
     return result;
   }
   }
 
 

dataflow_cpp/test/dataflow_cpp_test_simple.cc

@@ -56,12 +56,19 @@ embb::base::Atomic<int> source_counter;
 int source_array[TEST_COUNT];
 int source_array[TEST_COUNT];
 
 
 bool sourceFunc(int & out) {
 bool sourceFunc(int & out) {
+  if (source_counter < TEST_COUNT)
+  {
     out = source_counter;
     out = source_counter;
 
 
     source_array[source_counter] = out;
     source_array[source_counter] = out;
     source_counter++;
     source_counter++;
 
 
-  return source_counter < TEST_COUNT;
+    return true;
+  }
+  else
+  {
+    return false;
+  }
 }
 }
 
 
 embb::base::Atomic<int> pred_counter;
 embb::base::Atomic<int> pred_counter;

doc/examples/dataflow/dataflow_producer-snippet.h

@@ -3,10 +3,14 @@ class Producer {
  public:
  public:
   explicit Producer(int seed) : seed_(seed), count_(4) {}
   explicit Producer(int seed) : seed_(seed), count_(4) {}
   bool Run(T& x) {
   bool Run(T& x) {
+    if (count_ >= 0) {
       // produce a new value x
       // produce a new value x
       x = SimpleRand(seed_);
       x = SimpleRand(seed_);
       count_--;
       count_--;
-    return count_ >= 0;
+      return true;
+    } else {
+      return false;
+    }
   }
   }
 
 
  private:
  private:

doc/examples/dataflow/dataflow_source_function-snippet.h

 bool SourceFunction(std::string & str) {
 bool SourceFunction(std::string & str) {
+  if (!file.eof()) {
     std::getline(file, str);
     std::getline(file, str);
-  return !file.eof();
+    return true;
+  } else {
+    return false;
+  }
 }
 }