*** empty log message ***

3 files changed, 14 insertions, 18 deletions

diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_client.cpp
index ad3e9d8365d..3537aa6f47d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fan_example/threeway_client.cpp
@@ -251,12 +251,6 @@ main (int argc, char *argv[])
   CPULoad::calibrate(5);
   Object_ID oid = ACE_OBJECT_COUNTER->increment();
 
-//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);
-
-
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
@@ -399,6 +393,10 @@ main (int argc, char *argv[])
               "(%t|%T) cannot activate worker thread.\n"));
               }
       */
+  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);
+
       Worker worker2 (orb.in (),
                       server.in (),
                       server2.in (),
@@ -435,6 +433,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "(%t): wait for worker threads done in main thread\n"));
 
+      DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 0, sizeof(Object_ID), (char*)&oid);
       if (do_shutdown)
         {
           if (enable_dynamic_scheduling)
@@ -483,7 +482,6 @@ main (int argc, char *argv[])
       scheduler->shutdown ();
 
       /* MEASURE: Scheduler stop time */
-      DSTRM_EVENT (MAIN_GROUP_FAM, SCHEDULER_SHUTDOWN, 0, sizeof(Object_ID), (char*)&oid); 
       ACE_DEBUG ((LM_DEBUG, "scheduler shutdown done\n"));
     }
   ACE_CATCHANY
@@ -495,7 +493,6 @@ main (int argc, char *argv[])
   ACE_ENDTRY;
 
   /* MEASURE: Program stop time */
-  DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 0, sizeof(Object_ID), (char*)&oid); 
 
   non_dsui_timer.stop();
   ACE_hrtime_t dsui_ovhd_time;
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 98e59fc78fe..b07afb3583e 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,13 @@ main (int argc, char *argv[])
 
   CPULoad::calibrate(5);
 
-//print out the start time of the program.
+      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 ());
@@ -241,6 +241,8 @@ main (int argc, char *argv[])
 
       worker.wait ();
 
+      DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 0, sizeof(Object_ID), (char*)&oid);
+
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "shutting down scheduler\n"));
@@ -255,7 +257,6 @@ main (int argc, char *argv[])
   ACE_ENDTRY;
 
   /* MEASURE: Program stop time */
-  DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 0, sizeof(Object_ID), (char*)&oid);
 
   ACE_DEBUG ((LM_DEBUG, "Exiting main...\n"));
   return 0;
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 22e99754511..2c3f8d560d3 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,
@@ -240,6 +240,7 @@ main (int argc, char *argv[])
         }
 
       worker.wait ();
+  DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 0, sizeof(Object_ID), (char*)&oid);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
@@ -254,9 +255,6 @@ main (int argc, char *argv[])
     }
   ACE_ENDTRY;
 
-  /* MEASURE: Program stop time */
-  DSTRM_EVENT(MAIN_GROUP_FAM, STOP, 0, sizeof(Object_ID), (char*)&oid);
-
   ACE_DEBUG ((LM_DEBUG, "Exiting main...\n"));
   return 0;
 }