ChangeLogTag: Sun Aug 24 13:09:50 2003 Venkita Subramonian <venkita@cs.wustl.edu>

2 files changed, 44 insertions, 20 deletions

diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index 5bdb77c54a9..21fb433db6c 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -73,7 +73,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 20 Hz low criticality supplier
                   { "low_20_S",             // entry point
@@ -89,7 +90,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 10 Hz high criticality supplier
                   { "high_10_S",            // entry point
@@ -105,7 +107,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 10 Hz low criticality supplier
                   { "low_10_S",         // entry point
@@ -121,7 +124,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 5 Hz high criticality supplier
                   { "high_05_S",         // entry point
@@ -137,7 +141,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 5 Hz low criticality supplier
                   { "low_05_S",         // entry point
@@ -153,7 +158,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler:: RT_INFO_ENABLED
                   },
                   // 1 Hz high criticality supplier (declares a rate but no threads)
                   { "high_01_S",            // entry point
@@ -169,7 +175,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 1 Hz low criticality supplier (remote dependant: scheduler should warn)
                   { "low_01_S",             // entry point
@@ -185,7 +192,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 20 Hz high criticality consumer
                   { "high_20_C",        // entry point
@@ -201,7 +209,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 20 Hz low criticality consumer
                   { "low_20_C",        // entry point
@@ -217,7 +226,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 10 Hz high criticality consumer
                   { "high_10_C",        // entry point
@@ -233,7 +243,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 10 Hz low criticality consumer
                   { "low_10_C",        // entry point
@@ -249,7 +260,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 5 Hz high criticality consumer
                   { "high_05_C",        // entry point
@@ -265,7 +277,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 5 Hz low criticality consumer
                   { "low_05_C",        // entry point
@@ -281,7 +294,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 1 Hz high criticality consumer
                   { "high_01_C",        // entry point
@@ -297,7 +311,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   },
                   // 1 Hz low criticality consumer
                   { "low_01_C",        // entry point
@@ -313,7 +328,8 @@ main (int argc, char *argv[])
                         0,                  // OS priority
                         0,                  // Preemption subpriority
                         0,                  // Preemption priority
-                        RtecScheduler::OPERATION           // info type
+                        RtecScheduler::OPERATION,           // info type
+                        RtecScheduler::RT_INFO_ENABLED
                   }
   };
 
@@ -403,6 +419,7 @@ main (int argc, char *argv[])
         }
 
       RtecScheduler::RT_Info_Set_var infos;
+      RtecScheduler::Dependency_Set_var deps;
       RtecScheduler::Config_Info_Set_var configs;
       RtecScheduler::Scheduling_Anomaly_Set_var anomalies;
 
@@ -418,6 +435,7 @@ main (int argc, char *argv[])
       // not define instances of _out types.
 
       RtecScheduler::RT_Info_Set_out infos_out (infos);
+      RtecScheduler::Dependency_Set_out deps_out (deps);
       RtecScheduler::Config_Info_Set_out configs_out (configs);
       RtecScheduler::Scheduling_Anomaly_Set_out anomalies_out (anomalies);
       ACE_Scheduler_Factory::server ()->compute_scheduling
@@ -425,7 +443,7 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos_out, configs_out, anomalies_out
+         infos_out, deps_out, configs_out, anomalies_out
          ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
@@ -433,13 +451,14 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), configs.out (), anomalies.out ()
+         infos.out (), deps.out (), configs.out (), anomalies.out ()
          ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #endif /* ! __SUNPRO_CC */
 
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
+                                            deps.in (),
                                             configs.in (),
                                             anomalies.in (),
                                             "Sched_Conf_Runtime.h",
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index 690890674b2..fe655323b89 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -354,6 +354,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       RtecScheduler::RT_Info_Set_var infos;
+      RtecScheduler::Dependency_Set_var deps;
       RtecScheduler::Config_Info_Set_var configs;
       RtecScheduler::Scheduling_Anomaly_Set_var anomalies;
 
@@ -369,6 +370,7 @@ main (int argc, char *argv[])
       // not define instances of _out types.
 
       RtecScheduler::RT_Info_Set_out infos_out (infos);
+      RtecScheduler::Dependency_Set_out deps_out (deps);
       RtecScheduler::Config_Info_Set_out configs_out (configs);
       RtecScheduler::Scheduling_Anomaly_Set_out anomalies_out (anomalies);
       ACE_Scheduler_Factory::server ()->compute_scheduling
@@ -376,19 +378,22 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos_out, configs_out, anomalies_out ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
+         infos_out, deps_out,
+         configs_out, anomalies_out ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), configs.out (), anomalies.out () ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
+         infos.out (), deps.out (),
+         configs.out (), anomalies.out () ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #endif /* ! __SUNPRO_CC */
 
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
+                                            deps.in (),
                                             configs.in (),
                                             anomalies.in (),
                                             "Sched_Conf_Anomalies_Runtime.h",