summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryfzhang <yfzhang@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-05-14 17:09:27 +0000
committeryfzhang <yfzhang@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-05-14 17:09:27 +0000
commit4e19b1fdf08bf58b5310ca9191775feb538fe9b4 (patch)
treef4991eac3620b5b9f6d8876d365f908d80c06fee
parentfaa55f159cdaba712a4c34b548f748c89eff49ef (diff)
downloadATCD-4e19b1fdf08bf58b5310ca9191775feb538fe9b4.tar.gz
*** empty log message ***
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/chain_example/threeway_client_and_server.cpp6
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/chain_example/threeway_server.cpp6
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_server.cpp5
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_server2.cpp6
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client.cpp1
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client_and_server.cpp7
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client_and_server2.cpp8
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_server.cpp9
8 files changed, 25 insertions, 23 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/chain_example/threeway_client_and_server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/chain_example/threeway_client_and_server.cpp
index a0905731893..2f57fe85ed4 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/chain_example/threeway_client_and_server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/chain_example/threeway_client_and_server.cpp
@@ -224,13 +224,13 @@ main (int argc, char *argv[])
CPULoad::calibrate(5);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
ACE_Time_Value start_time=ACE_OS::gettimeofday();
ACE_OS::printf ( ACE_TEXT ("The Start time: %u (sec), %u (usec)\n"), start_time.sec(), start_time.usec());
DSTRM_EVENT(MAIN_GROUP_FAM, START,0,sizeof(Object_ID), (char*)&oid);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
Worker worker (orb.in ());
if (worker.activate (flags,
nthreads,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/chain_example/threeway_server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/chain_example/threeway_server.cpp
index c857aefb26b..7b573ffa855 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/chain_example/threeway_server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/chain_example/threeway_server.cpp
@@ -203,13 +203,13 @@ main (int argc, char *argv[])
CPULoad::calibrate(5);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
ACE_Time_Value start_time=ACE_OS::gettimeofday();
ACE_OS::printf ( ACE_TEXT ("The Start time: %u (sec), %u (usec)\n"), start_time.sec(), start_time.usec());
DSTRM_EVENT(MAIN_GROUP_FAM, START,0,sizeof(Object_ID), (char*)&oid);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
Worker worker (orb.in ());
if (worker.activate (flags,
nthreads,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_server.cpp
index b07afb3583e..ae068c2d73a 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_server.cpp
@@ -210,13 +210,12 @@ main (int argc, char *argv[])
CPULoad::calibrate(5);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
ACE_Time_Value start_time=ACE_OS::gettimeofday();
ACE_OS::printf ( ACE_TEXT ("The Start time: %u (sec), %u (usec)\n"), start_time.sec(), start_time.usec());
DSTRM_EVENT(MAIN_GROUP_FAM, START,0,sizeof(Object_ID), (char*)&oid);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
ACE_DEBUG((LM_DEBUG,"before activate thread\n"));
Worker worker (orb.in ());
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_server2.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_server2.cpp
index 2c3f8d560d3..c4ce6f60cb6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_server2.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_server2.cpp
@@ -210,14 +210,14 @@ main (int argc, char *argv[])
ACE_OS::printf ( ACE_TEXT ("The Server has generated %s\n"),ior_output_file);
CPULoad::calibrate(5);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
//print out the start time of the program.
ACE_Time_Value start_time=ACE_OS::gettimeofday();
ACE_OS::printf ( ACE_TEXT ("The Start time: %u (sec), %u (usec)\n"), start_time.sec(), start_time.usec());
DSTRM_EVENT(MAIN_GROUP_FAM, START,0,sizeof(Object_ID), (char*)&oid);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
ACE_DEBUG((LM_DEBUG,"before activate thread\n"));
Worker worker (orb.in ());
if (worker.activate (flags,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client.cpp
index a561be1134e..8523dfe1578 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client.cpp
@@ -202,6 +202,7 @@ main (int argc, char *argv[])
non_dsui_timer.calibrate ();
non_dsui_timer.start();
+ ACE_LOG_MSG->priority_mask (LM_ERROR | LM_CRITICAL | LM_ALERT | LM_EMERGENCY, ACE_Log_Msg::PROCESS);
EDF_Scheduler* scheduler=0;
RTScheduling::Current_var current;
int prio;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client_and_server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client_and_server.cpp
index 969c9af1c57..80414efe2b9 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client_and_server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client_and_server.cpp
@@ -90,6 +90,7 @@ main (int argc, char *argv[])
{
ds_control ds_cntrl ("DT_FT_Middle", "ft_enable.dsui");
+ ACE_LOG_MSG->priority_mask (LM_ERROR | LM_CRITICAL | LM_ALERT | LM_EMERGENCY, ACE_Log_Msg::PROCESS);
EDF_Scheduler* scheduler = 0;
RTScheduling::Current_var current;
long flags;
@@ -225,14 +226,14 @@ main (int argc, char *argv[])
CPULoad::calibrate(5);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
//print out the start time of the program.
ACE_Time_Value start_time=ACE_OS::gettimeofday();
ACE_OS::printf ( ACE_TEXT ("The Start time: %u (sec), %u (usec)\n"), start_time.sec(), start_time.usec());
DSTRM_EVENT(MAIN_GROUP_FAM, START,0,sizeof(Object_ID), (char*)&oid);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
Worker worker (orb.in ());
if (worker.activate (flags,
nthreads,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client_and_server2.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client_and_server2.cpp
index 4fe5f3df62d..89eebc1bb94 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client_and_server2.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_client_and_server2.cpp
@@ -90,6 +90,7 @@ main (int argc, char *argv[])
{
ds_control ds_cntrl ("DT_FT_Middle2", "ft_enable.dsui");
+ ACE_LOG_MSG->priority_mask (LM_ERROR | LM_CRITICAL | LM_ALERT | LM_EMERGENCY, ACE_Log_Msg::PROCESS);
EDF_Scheduler* scheduler = 0;
RTScheduling::Current_var current;
long flags;
@@ -224,14 +225,13 @@ main (int argc, char *argv[])
CPULoad::calibrate(10);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
-//print out the start time of the program.
ACE_Time_Value start_time=ACE_OS::gettimeofday();
ACE_OS::printf ( ACE_TEXT ("The Start time: %u (sec), %u (usec)\n"), start_time.sec(), start_time.usec());
DSTRM_EVENT(MAIN_GROUP_FAM, START,0,sizeof(Object_ID), (char*)&oid);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
Worker worker (orb.in ());
if (worker.activate (flags,
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_server.cpp
index afcda25623d..c7981ea7821 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fault_tolerance/threeway_server.cpp
@@ -95,6 +95,7 @@ main (int argc, char *argv[])
{
ds_control ds_cntrl ("DT_FT_Server", "ft_enable.dsui");
+ ACE_LOG_MSG->priority_mask (LM_ERROR | LM_CRITICAL | LM_ALERT | LM_EMERGENCY, ACE_Log_Msg::PROCESS);
ACE_DEBUG((LM_DEBUG,"I AM BEGINNING\n"));
EDF_Scheduler* scheduler = 0;
RTScheduling::Current_var current;
@@ -229,15 +230,15 @@ main (int argc, char *argv[])
CPULoad::calibrate(5);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- ACE_DEBUG((LM_DEBUG,"before activate thread\n"));
//print out the start time of the program.
ACE_Time_Value start_time=ACE_OS::gettimeofday();
ACE_OS::printf ( ACE_TEXT ("The Start time: %u (sec), %u (usec)\n"), start_time.sec(), start_time.usec());
DSTRM_EVENT(MAIN_GROUP_FAM, START,0,sizeof(Object_ID), (char*)&oid);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ ACE_DEBUG((LM_DEBUG,"before activate thread\n"));
Worker worker (orb.in ());
if (worker.activate (flags,