Fixed segfault while running

5 files changed, 7 insertions, 16 deletions

diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Kokyu_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Kokyu_EC.cpp
index 5f9511ab0b9..f58e87e4f97 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Kokyu_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Kokyu_EC.cpp
@@ -960,10 +960,13 @@ Gateway_Initializer::handle_timeout (const ACE_Time_Value &,
         ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                         ACE_SCOPE_THREAD);
 
-      scheduler->recompute_scheduling (min_os_priority,
-                                       max_os_priority,
-                                       anomalies.out()
-                                       ACE_ENV_ARG_PARAMETER);
+      scheduler->compute_scheduling (min_os_priority,
+                                     max_os_priority,
+                                     infos.out (),
+                                     dependencies.out (),
+                                     configs.out (),
+                                     anomalies.out ()
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       std::stringstream sched_out;
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node1_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node1_EC.cpp
index 60d6849556a..2303c5caca9 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node1_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node1_EC.cpp
@@ -220,14 +220,11 @@ main (int argc, char* argv[])
                      Gateway_Initializer(),-1);
       ginit->init(orb,poa,&supplier_ec,ior_output_filename,ior_input_files);
       ACE_Time_Value gateway_delay(5,000000);
-      /*
       long timer_id = rt.reactor()->schedule_timer(ginit,0,gateway_delay);
       if (timer_id < 0)
         {
           ACE_DEBUG((LM_DEBUG,"Node1_EC (%t) could not schedule Gateway_Initializer timer\n"));
         }
-      */
-      ginit->handle_timeout(gateway_delay,0); //TEST initializing orbs immediately!
 
 #ifdef ACE_HAS_DSUI
       //@BT
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node2_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node2_EC.cpp
index 5e3854be37f..7e5d2caf79c 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node2_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node2_EC.cpp
@@ -256,14 +256,11 @@ main (int argc, char* argv[])
                      Gateway_Initializer(),-1);
       ginit->init(orb,poa,&supplier_ec,ior_output_filename,ior_input_files);
       ACE_Time_Value gateway_delay(5,00000);
-      /*
       long timer_id = rt.reactor()->schedule_timer(ginit,0,gateway_delay);
       if (timer_id < 0)
         {
           ACE_DEBUG((LM_DEBUG,"Node2_EC (%t) could not schedule Gateway_Initializer timer\n"));
         }
-      */
-      ginit->handle_timeout(gateway_delay,0); //TEST initializing orbs immediately!
 
 #ifdef ACE_HAS_DSUI
       //@BT
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node3_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node3_EC.cpp
index 59ef5e8426f..89ea200372f 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node3_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node3_EC.cpp
@@ -244,14 +244,11 @@ main (int argc, char* argv[])
                      Gateway_Initializer(),-1);
       ginit->init(orb,poa,&supplier_ec,ior_output_filename,ior_input_files);
       ACE_Time_Value gateway_delay(5,00000);
-      /*
       long timer_id = rt.reactor()->schedule_timer(ginit,0,gateway_delay);
       if (timer_id < 0)
         {
           ACE_DEBUG((LM_DEBUG,"Node3_EC (%t) could not schedule Gateway_Initializer timer\n"));
         }
-      */
-      ginit->handle_timeout(gateway_delay,0); //TEST initializing orbs immediately!
 
 #ifdef ACE_HAS_DSUI
       //@BT
diff --git a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node4_EC.cpp b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node4_EC.cpp
index 288b5ae2657..fb32f546166 100644
--- a/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node4_EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Federated_Kokyu/rand_work_test/Node4_EC.cpp
@@ -282,14 +282,11 @@ main (int argc, char* argv[])
                      Gateway_Initializer(),-1);
       ginit->init(orb,poa,&supplier_ec,ior_output_filename,ior_input_files);
       ACE_Time_Value gateway_delay(5,00000);
-      /*
       long timer_id = rt.reactor()->schedule_timer(ginit,0,gateway_delay);
       if (timer_id < 0)
         {
           ACE_DEBUG((LM_DEBUG,"Node4_EC (%t) could not schedule Gateway_Initializer timer\n"));
         }
-      */
-      ginit->handle_timeout(gateway_delay,0); //TEST initializing orbs immediately!
 
 #ifdef ACE_HAS_DSUI
       //@BT