*** empty log message ***

14 files changed, 33 insertions, 33 deletions

diff --git a/examples/Threads/auto_event.cpp b/examples/Threads/auto_event.cpp
index 77f3cf82ace..77842017675 100644
--- a/examples/Threads/auto_event.cpp
+++ b/examples/Threads/auto_event.cpp
@@ -30,7 +30,7 @@ reader (void *arg)
   // Shared data via a reference.
   int& data = *(int *) arg;
 
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   
   // Wait for writer to complete.
 
@@ -54,7 +54,7 @@ writer (void *arg)
 {
   int& data = *(int *) arg;
 
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   
   // Calculate (work).
   ACE_DEBUG ((LM_DEBUG, "(%t) writer: working for %d secs\n", work_time));
@@ -85,7 +85,7 @@ main (int argc, char **argv)
   work_time = argc == 2 ? atoi (argv[1]) : 5;
 
   // threads manager
-  ACE_Thread_Manager& tm = *ACE_Service_Config::thr_mgr ();
+  ACE_Thread_Manager& tm = *ACE_Thread_Manager::instance ();
 
   // Create reader thread.
   if (tm.spawn (reader, (void *) &data) == -1)
diff --git a/examples/Threads/barrier1.cpp b/examples/Threads/barrier1.cpp
index 94f39962b55..3800e7cc84d 100644
--- a/examples/Threads/barrier1.cpp
+++ b/examples/Threads/barrier1.cpp
@@ -33,7 +33,7 @@ static void *
 tester (Tester_Args *args)
 {
   // Keeps track of thread exit.
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+	ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
 
   for (int iterations = 1; 
        iterations <= args->n_iterations_;
@@ -63,13 +63,13 @@ main (int argc, char *argv[])
   
   Tester_Args args (tester_barrier, n_iterations);
 
-  if (ACE_Service_Config::thr_mgr ()->spawn_n 
+  if (ACE_Thread_Manager::instance ()->spawn_n 
       (int(n_threads), ACE_THR_FUNC (tester), 
        (void *) &args, THR_NEW_LWP | THR_DETACHED) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1);
 
   // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
+  ACE_Thread_Manager::instance ()->wait ();
 
   ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
   return 0;
diff --git a/examples/Threads/barrier2.cpp b/examples/Threads/barrier2.cpp
index 1fe7b2175ac..d917b44d401 100644
--- a/examples/Threads/barrier2.cpp
+++ b/examples/Threads/barrier2.cpp
@@ -245,14 +245,14 @@ main (int argc, char *argv[])
 
   
   Worker_Task<BARRIER_TYPE> *worker_task = 
-    new Worker_Task<BARRIER_TYPE> (ACE_Service_Config::thr_mgr (), 
+	  new Worker_Task<BARRIER_TYPE> (ACE_Thread_Manager::instance (), 
 				   /*n_threads*/ 0,0); 
   
   worker_task->Producer ();
 
   // Wait for all the threads to reach their exit point.
   ACE_DEBUG ((LM_DEBUG,"(%t) waiting with thread manager ...\n"));
-  ACE_Service_Config::thr_mgr ()->wait ();
+  ACE_Thread_Manager::instance ()->wait ();
   ACE_DEBUG ((LM_DEBUG,"(%t) delete worker task ...\n"));
 
   delete worker_task;
diff --git a/examples/Threads/cancel.cpp b/examples/Threads/cancel.cpp
index a9d12bea579..919922a8208 100644
--- a/examples/Threads/cancel.cpp
+++ b/examples/Threads/cancel.cpp
@@ -14,7 +14,7 @@ worker (int iterations)
   for (int i = 0; i < iterations; i++)
     {
       if ((i % 10) == 0 
-	  && (ACE_Service_Config::thr_mgr ()->testcancel (ACE_Thread::self ()) != 0))
+		  && (ACE_Thread_Manager::instance ()->testcancel (ACE_Thread::self ()) != 0))
 	{
 	  ACE_DEBUG ((LM_DEBUG, "(%t) has been cancelled before iteration!\n", i));
 	  break;
@@ -37,7 +37,7 @@ main (int argc, char *argv[])
   int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS;
   int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
 
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
+  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
 
   int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker),
 				 (void *) n_iterations,
diff --git a/examples/Threads/manual_event.cpp b/examples/Threads/manual_event.cpp
index 65e08920d05..886207e71fe 100644
--- a/examples/Threads/manual_event.cpp
+++ b/examples/Threads/manual_event.cpp
@@ -56,7 +56,7 @@ Pseudo_Barrier::wait (void)
 static void *
 worker (void *arg)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+	ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   Pseudo_Barrier &barrier = *(Pseudo_Barrier *) arg;
   
   // work
@@ -81,7 +81,7 @@ main (int argc, char **argv)
 {
   int n_threads = argc == 2 ? atoi (argv[1]) : 5;
 
-  ACE_Thread_Manager &tm = *ACE_Service_Config::thr_mgr ();
+  ACE_Thread_Manager &tm = *ACE_Thread_Manager::instance ();
   
   // synch object shared by all threads
   Pseudo_Barrier barrier (n_threads);
diff --git a/examples/Threads/process_manager.cpp b/examples/Threads/process_manager.cpp
index 9715daa6cb3..ea8d06bb5a8 100644
--- a/examples/Threads/process_manager.cpp
+++ b/examples/Threads/process_manager.cpp
@@ -14,7 +14,7 @@ static ACE_Process_Manager proc_mgr;
 void *
 sig_handler (void *)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+	ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
 
   ACE_Sig_Set sigset;
 
@@ -137,7 +137,7 @@ main (int argc, char *argv[])
 
   if (ACE_OS::thr_sigsetmask (SIG_BLOCK, sigset, 0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "thr_sigsetmask"), 1);
-  else if (ACE_Service_Config::thr_mgr ()->spawn (sig_handler, 0, THR_DETACHED) == -1)
+  else if (ACE_Thread_Manager::instance ()->spawn (sig_handler, 0, THR_DETACHED) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn"), 1);
 
   if (child)
@@ -165,7 +165,7 @@ main (int argc, char *argv[])
       // Perform a barrier wait until all the processes and threads
       // have shut down.
       proc_mgr.wait ();
-      ACE_Service_Config::thr_mgr ()->wait ();
+	  ACE_Thread_Manager::instance ()->wait ();
     }
 
   return 0;
diff --git a/examples/Threads/recursive_mutex.cpp b/examples/Threads/recursive_mutex.cpp
index 1cc2892b2a8..7525d2bc120 100644
--- a/examples/Threads/recursive_mutex.cpp
+++ b/examples/Threads/recursive_mutex.cpp
@@ -74,7 +74,7 @@ recursive_worker (size_t nesting_level,
 static void *
 worker (void *arg)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+	ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
 
   ACE_Recursive_Thread_Mutex *rm = (ACE_Recursive_Thread_Mutex *) arg;
 
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
   parse_args (argc, argv);
   ACE_Recursive_Thread_Mutex rm;
 
-  ACE_Service_Config::thr_mgr ()->spawn_n (n_threads, 
+  ACE_Thread_Manager::instance ()->spawn_n (n_threads, 
 					   ACE_THR_FUNC (worker), 
 					   (void *) &rm);
 
-  ACE_Service_Config::thr_mgr ()->wait ();
+  ACE_Thread_Manager::instance ()->wait ();
   return 0;
 }
 #else
diff --git a/examples/Threads/task_four.cpp b/examples/Threads/task_four.cpp
index 9627606ae8d..3710ff1a827 100644
--- a/examples/Threads/task_four.cpp
+++ b/examples/Threads/task_four.cpp
@@ -146,7 +146,7 @@ Invoker_Task::svc (void)
   // Note that the ACE_Task::svc_run () method automatically adds us to
   // the Thread_Manager when the thread begins.
 
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
+	ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
   Worker_Task **worker_task;
    
   ACE_NEW_RETURN (worker_task, Worker_Task *[n_tasks_], -1);
diff --git a/examples/Threads/task_one.cpp b/examples/Threads/task_one.cpp
index 7acf8de3789..80c96c67303 100644
--- a/examples/Threads/task_one.cpp
+++ b/examples/Threads/task_one.cpp
@@ -79,12 +79,12 @@ main (int argc, char *argv[])
   int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
   int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
 
-  Barrier_Task barrier_task (ACE_Service_Config::thr_mgr (), 
+  Barrier_Task barrier_task (ACE_Thread_Manager::instance (), 
 			     n_threads, 
 			     n_iterations);
 
   // Wait for all the threads to reach their exit point.
-  ACE_Service_Config::thr_mgr ()->wait ();
+  ACE_Thread_Manager::instance ()->wait ();
 
   ACE_DEBUG ((LM_DEBUG, "(%t) done\n"));
   return 0;
diff --git a/examples/Threads/task_three.cpp b/examples/Threads/task_three.cpp
index bdfae9b0e0b..45ac8106784 100644
--- a/examples/Threads/task_three.cpp
+++ b/examples/Threads/task_three.cpp
@@ -177,7 +177,7 @@ main (int argc, char **)
   ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
   ACE_UNUSED_ARG (sa);
 
-  ACE_Reactor *reactor1 = ACE_Service_Config::reactor ();
+  ACE_Reactor *reactor1 = ACE_Reactor::instance();
   ACE_Reactor *reactor2 = new ACE_Reactor ();
 
   Test_Task t1[TASK_COUNT];
diff --git a/examples/Threads/task_two.cpp b/examples/Threads/task_two.cpp
index 9ac9386a171..133d3a69852 100644
--- a/examples/Threads/task_two.cpp
+++ b/examples/Threads/task_two.cpp
@@ -121,7 +121,7 @@ main (int argc, char *argv[])
 		  i, (int) max_count, (int) wait_count));
 
       // Wait for all the tasks to exit.
-      ACE_Service_Config::thr_mgr ()->wait ();
+	  ACE_Thread_Manager::instance ()->wait ();
 
       // Delete the existing tasks.
       for (int k = 0; k < n_threads; k++)
diff --git a/examples/Threads/thread_manager.cpp b/examples/Threads/thread_manager.cpp
index 48cd2bb8b04..790b591e650 100644
--- a/examples/Threads/thread_manager.cpp
+++ b/examples/Threads/thread_manager.cpp
@@ -19,7 +19,7 @@ handler (int signum)
 static void *
 worker (int iterations)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+	ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
 
   for (int i = 0; i < iterations; i++)
     {
@@ -29,7 +29,7 @@ worker (int iterations)
 		      "(%t) checking cancellation before iteration %d!\n", 
 		      i));
 	
-	  if (ACE_Service_Config::thr_mgr ()->testcancel (ACE_Thread::self ()) != 0)
+	  if (ACE_Thread_Manager::instance ()->testcancel (ACE_Thread::self ()) != 0)
 	    {
 	      ACE_DEBUG ((LM_DEBUG, 
 			  "(%t) has been cancelled before iteration %d!\n", 
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
   int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : DEFAULT_THREADS;
   int n_iterations = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_ITERATIONS;
 
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
+  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
 
   int grp_id = thr_mgr->spawn_n (n_threads, ACE_THR_FUNC (worker),
 				 (void *) n_iterations,
diff --git a/examples/Threads/thread_pool.cpp b/examples/Threads/thread_pool.cpp
index 2cf3a8c61a6..ec103b1bdd3 100644
--- a/examples/Threads/thread_pool.cpp
+++ b/examples/Threads/thread_pool.cpp
@@ -186,7 +186,7 @@ main (int argc, char *argv[])
 	      argc, n_threads));
 
   // Create the worker tasks.
-  Thread_Pool thread_pool (ACE_Service_Config::thr_mgr (), 
+  Thread_Pool thread_pool (ACE_Thread_Manager::instance (), 
 			   n_threads);
 
   // Create work for the worker tasks to process in their own threads.
@@ -195,7 +195,7 @@ main (int argc, char *argv[])
   // Wait for all the threads to reach their exit point.
 
   ACE_DEBUG ((LM_DEBUG, "(%t) waiting with thread manager...\n"));
-  ACE_Service_Config::thr_mgr ()->wait ();
+  ACE_Thread_Manager::instance ()->wait ();
 
   ACE_DEBUG ((LM_DEBUG, "(%t) destroying worker tasks and exiting...\n"));
   return 0;
diff --git a/examples/Threads/thread_specific.cpp b/examples/Threads/thread_specific.cpp
index fae28199cec..b1c3bc0e895 100644
--- a/examples/Threads/thread_specific.cpp
+++ b/examples/Threads/thread_specific.cpp
@@ -79,7 +79,7 @@ cleanup (void *ptr)
 static void *
 worker (void *c)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+	ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   int count = int (c);
 
   ACE_thread_key_t key = ACE_OS::NULL_key;
@@ -170,7 +170,7 @@ extern "C" void
 handler (int signum)
 {
   ACE_DEBUG ((LM_DEBUG, "signal = %S\n", signum));
-  ACE_Service_Config::thr_mgr ()->exit (0);
+  ACE_Thread_Manager::instance ()->exit (0);
 }
 
 int 
@@ -178,7 +178,7 @@ main (int argc, char *argv[])
 {
   // The Service_Config must be the first object defined in main...
   ACE_Service_Config daemon (argv[0]);
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   int threads = argc > 1 ? ACE_OS::atoi (argv[1]) : 4;
   int count = argc > 2 ? ACE_OS::atoi (argv[2]) : 10000;
 
@@ -187,13 +187,13 @@ main (int argc, char *argv[])
   ACE_UNUSED_ARG (sa);
 
 #if defined (ACE_HAS_THREADS)
-  if (ACE_Service_Config::thr_mgr ()->spawn_n (threads, 
+  if (ACE_Thread_Manager::instance ()->spawn_n (threads, 
 					       ACE_THR_FUNC (&worker), 
 					       (void *) count,
 					       THR_BOUND | THR_DETACHED) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Thread_Manager::spawn_n"), -1);
 
-  ACE_Service_Config::thr_mgr ()->wait ();
+  ACE_Thread_Manager::instance ()->wait ();
 #else
   worker ((void *) count);
 #endif /* ACE_HAS_THREADS */