fixed a bug

Author: OmerMajNition

examples/sdk-WorkersParams/main.cc

@@ -346,6 +346,11 @@ class Tasks : public Reactor {
             effects(&req).
             function(
                 [&](LogicalAction<int> &sch, MultiportOutput<int> &req) {
+                    if (req_itr == n_tasks) {
+                        std::cout   << "(" << get_elapsed_logical_time().count() << ", " << get_microstep() << ") physical_time:" << get_elapsed_physical_time().count()
+                                        << fqn() << " Tasks queue empty" << std::endl;
+                        return;
+                    }
                     auto index = *sch.get();
                     if (index < 0) {
                         for (int i = 0; i < n_pools; ++i) {
@@ -384,18 +389,20 @@ class Tasks : public Reactor {
                 [&](MultiportInput<int> &rsp, LogicalAction<int> &sch) {
                     for (int i = 0; i < n_pools; ++i) {
                         if (rsp[i].is_present()) {
+                            std::cout   << "(" << get_elapsed_logical_time().count() << ", " << get_microstep() << ") physical_time:" << get_elapsed_physical_time().count()
+                                        << "Received response of task:" << *rsp[i].get() << "\n";
                             ++rsp_itr;
-                            if (req_itr < n_tasks) {
-                                std::cout   << "(" << get_elapsed_logical_time().count() << ", " << get_microstep() << ") physical_time:" << get_elapsed_physical_time().count()
-                                            << fqn() << " Scheduling task_id:" << req_itr << " to pool:" << i << std::endl;
-                                sch.schedule (i, std::chrono::duration_cast<reactor::Duration>(std::chrono::nanoseconds(0)));
-                            }
+                            busy[i] = 0;
                         }
                     }
                     if (rsp_itr == n_tasks) {
                         std::cout   << "(" << get_elapsed_logical_time().count() << ", " << get_microstep() << ") physical_time:" << get_elapsed_physical_time().count()
                                     << "Terminating Run\n";
                         request_stop();
+                    } else {
+                        std::cout   << "(" << get_elapsed_logical_time().count() << ", " << get_microstep() << ") physical_time:" << get_elapsed_physical_time().count()
+                                    << fqn() << " Scheduling tasks\n";
+                        sch.schedule (-1, std::chrono::duration_cast<reactor::Duration>(std::chrono::nanoseconds(0)));
                     }
                 }
             );

examples/sdk-WorkersParams/src/Workers.lf

@@ -148,6 +148,11 @@ reactor Tasks (bank_index:size_t = 0, n_tasks:int = 10, n_pools:int = 1) {
     =}
 
     reaction (sch) -> sch, req {=
+        if (req_itr == n_tasks) {
+            std::cout   << "(" << get_elapsed_logical_time().count() << ", " << get_microstep() << ") physical_time:" << get_elapsed_physical_time().count()
+                            << fqn() << " Tasks queue empty" << std::endl;
+            return;
+        }
         auto index = *sch.get();
         if (index < 0) {
             for (int i = 0; i < n_pools; ++i) {
@@ -180,18 +185,20 @@ reactor Tasks (bank_index:size_t = 0, n_tasks:int = 10, n_pools:int = 1) {
     reaction (rsp) -> sch {=
         for (int i = 0; i < n_pools; ++i) {
             if (rsp[i].is_present()) {
+                std::cout   << "(" << get_elapsed_logical_time().count() << ", " << get_microstep() << ") physical_time:" << get_elapsed_physical_time().count()
+                            << "Received response of task:" << *rsp[i].get() << "\n";
                 ++rsp_itr;
-                if (req_itr < n_tasks) {
-                    std::cout   << "(" << get_elapsed_logical_time().count() << ", " << get_microstep() << ") physical_time:" << get_elapsed_physical_time().count()
-                                << fqn() << " Scheduling task_id:" << req_itr << " to pool:" << i << std::endl;
-                    sch.schedule (i, std::chrono::duration_cast<reactor::Duration>(std::chrono::nanoseconds(0)));
-                }
+                busy[i] = 0;
             }
         }
         if (rsp_itr == n_tasks) {
             std::cout   << "(" << get_elapsed_logical_time().count() << ", " << get_microstep() << ") physical_time:" << get_elapsed_physical_time().count()
                         << "Terminating Run\n";
             request_stop();
+        } else {
+            std::cout   << "(" << get_elapsed_logical_time().count() << ", " << get_microstep() << ") physical_time:" << get_elapsed_physical_time().count()
+                        << fqn() << " Scheduling tasks\n";
+            sch.schedule (-1, std::chrono::duration_cast<reactor::Duration>(std::chrono::nanoseconds(0)));
         }
     =}
 

include/reactor-sdk/SystemParameters.hh

@@ -89,7 +89,7 @@ public:
     template <typename... Args>
     void register_parameters(Args&... args) {
         register_parameters_(reactor->fqn(), reactor->homog_fqn(), args...);
-        print();
+        // print();
     }
 
     void populate_params(std::set<std::string> &types, std::map<std::string, std::string> &homog_map_entries, std::map<std::string, std::string> &hetero_map_entries) {