Changes in sources/src/schedulers.cc [27:17]

File:

• sources/src/schedulers.cc (modified) (9 diffs)

sources/src/schedulers.cc

@@ -35 +35 @@
  */
 
-#include "sc_module.h" // method_process_t
-#include "gen_code.h"  // gen_scheduling_code_for_dynamic_link & gen_scheduling_code_for_static_func
-#include "internal.h"  // dump_all_graph
-#include "graph_cass.h" // makegraph
-#include "process_dependency.h" // MakeProcessDependencyList
-#include "signal_dependency.h" // MakeSignalDependencyGraph
-#include "mouchard_scheduling.h" // MakeMouchardScheduling
-#include "graph_signals.h" // makegraph
-//#include "module_hierarchy2dot.h"
-
-#include <cassert>
-#include <iostream>
-#include <algorithm> //std::sort
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include<iostream>
+#include<algorithm> //std::sort
+#include"sc_module.h" // method_process_t
+#include"gen_code.h"  // gen_scheduling_code_for_dynamic_link & gen_scheduling_code_for_static_func
+#include"internal.h"  // dump_all_graph
+#include"graph_cass.h" // makegraph
+#include"process_dependency.h" // MakeProcessDependencyList
+#include"signal_dependency.h" // MakeSignalDependencyGraph
+#include"mouchard_scheduling.h" // MakeMouchardScheduling
+#include"graph_signals.h" // makegraph
+//#include"module_hierarchy2dot.h"
+#include"assert.h"
 
 using namespace std;
@@ -100 +95 @@
                          const method_process_t *a2)
 {
-  assert(a1 != NULL);
-  assert(a2 != NULL);
+  ASSERT(a1 != NULL);
+  ASSERT(a2 != NULL);
   sc_module *m1 = a1->module;
   sc_module *m2 = a2->module;
@@ -119 +114 @@
     addr1.func = a1->func;
     addr2.func = a2->func;
-    assert(addr1.addr_ll != addr2.addr_ll);
+    ASSERT(addr1.addr_ll != addr2.addr_ll);
     if ( sizeof(SC_ENTRY_FUNC) == 4 ) {
         return (addr1.addr_l < addr2.addr_l);
@@ -135 +130 @@
                     const method_process_t *a2)
 {
-  assert(a1 != NULL);
-  assert(a2 != NULL);
+  ASSERT(a1 != NULL);
+  ASSERT(a2 != NULL);
   return (a1->module < a2->module);
 }
@@ -145 +140 @@
                  const method_process_t *a2)
 {
-    assert(a1 != NULL);
-    assert(a2 != NULL);
+    ASSERT(a1 != NULL);
+    ASSERT(a2 != NULL);
     union {
         SC_ENTRY_FUNC func;
@@ -242 +237 @@
 {
   SignalDependencyGraph *sig_graph = MakeAcyclicSignalDependencyGraph ();
-  assert(sig_graph != NULL);
+  ASSERT(sig_graph != NULL);
   // Create the process evaluation list
   ProcessDependencyList* process_list = MakeMouchardScheduling (*sig_graph);
-  assert(process_list != NULL);
+  ASSERT(process_list != NULL);
 
   if (dump_all_graph)
@@ -289 +284 @@
     // Uses port dependancies like Dr. Mouchard.
     ProcessDependencyList* process_list = BuchmannScheduling ();
-        if (dynamic_link_of_scheduling_code)
-                base_name = gen_scheduling_code_for_dynamic_link (transition_func_list, moore_func_list,*process_list);
-        else
-                gen_scheduling_code_for_static_func (transition_func_list, moore_func_list, *process_list);
+    base_name = gen_scheduling_code_for_dynamic_link (transition_func_list, moore_func_list,*process_list);
+    gen_scheduling_code_for_static_func (transition_func_list, moore_func_list, *process_list);
     break;
   }
@@ -302 +295 @@
     // and does not use an event-driven scheduler.
     ProcessDependencyList* process_list = MouchardScheduling ();
-        if (dynamic_link_of_scheduling_code)
-                base_name = gen_scheduling_code_for_dynamic_link(transition_func_list, moore_func_list,*process_list);
-        else
-                gen_scheduling_code_for_static_func (transition_func_list, moore_func_list, *process_list);
+    base_name = gen_scheduling_code_for_dynamic_link(transition_func_list, moore_func_list,*process_list);
+    gen_scheduling_code_for_static_func (transition_func_list, moore_func_list, *process_list);
     break;
   }
@@ -316 +307 @@
       graph2dot("module_graph", *g);
     strong_component_list_t *strong_list = strong_component (g);
-        if (dynamic_link_of_scheduling_code)
-                base_name = gen_scheduling_code_for_dynamic_link(transition_func_list, moore_func_list,*strong_list);
-        else
-                gen_scheduling_code_for_quasistatic_func (transition_func_list, moore_func_list, *strong_list);
+    base_name = gen_scheduling_code_for_dynamic_link(transition_func_list, moore_func_list,*strong_list);
+    gen_scheduling_code_for_quasistatic_func (transition_func_list, moore_func_list, *strong_list);
     break;
   }