diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-03-19 04:27:23 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-03-19 04:27:23 +0000 |
| commit | 070ff4ea6789e9a0256c47f4a2430352b4732181 (patch) | |
| tree | 6ec859bf8eb4550d001d22c99565de0ab5f8643a /TAO | |
| parent | 707ddfbff68692eaa9924b34a1831889db9063e8 (diff) | |
| download | ATCD-070ff4ea6789e9a0256c47f4a2430352b4732181.tar.gz | |
ChangeLogTag:Thu Mar 18 22:52:49 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 16 | ||||
| -rw-r--r-- | TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/LoadBalancer/Signal_Handler.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/RT_Task.h | 3 | ||||
| -rw-r--r-- | TAO/tao/Thread_Per_Connection_Handler.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Thread_Per_Connection_Handler.h | 3 |
7 files changed, 25 insertions, 20 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d5489cb65ad..94b69882a83 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,19 @@ +Thu Mar 18 22:52:49 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Thread_Per_Connection_Handler.cpp: + * tao/Thread_Per_Connection_Handler.h: + + Reverted the change "Fri Mar 5 23:31:34 2004 Balachandran + Natarajan <bala@dre.vanderbilt.edu>". + + * orbsvcs/LoadBalancer/Signal_Handler.cpp: + * orbsvcs/LoadBalancer/Signal_Handler.h: + * orbsvcs/orbsvcs/Event/RT_Task.cpp: + * orbsvcs/orbsvcs/Event/RT_Task.h: + + Reverted the change "Wed Mar 10 19:41:01 2004 Balachandran + Natarajan <bala@dre.vanderbilt.edu>" + Thu Mar 18 12:57:35 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * toa/FloatSeqS.h: diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp index b342941e29c..e6c646c9833 100644 --- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp @@ -58,8 +58,7 @@ TAO_LB_Signal_Handler::activate (long flags, ACE_hthread_t thread_handles[], void *stack[], size_t stack_size[], - ACE_thread_t thread_ids[], - bool inherit_priority) + ACE_thread_t thread_ids[]) { // sigwait() is not implemented on MS Windows. Handle signals // asynchronously through the ORB's reactor in that case instead. @@ -75,8 +74,7 @@ TAO_LB_Signal_Handler::activate (long flags, thread_handles, stack, stack_size, - thread_ids, - inherit_priority); + thread_ids); #else ACE_UNUSED_ARG (flags); ACE_UNUSED_ARG (n_threads); @@ -88,7 +86,6 @@ TAO_LB_Signal_Handler::activate (long flags, ACE_UNUSED_ARG (stack); ACE_UNUSED_ARG (stack_size); ACE_UNUSED_ARG (thread_ids); - ACE_UNUSED_ARG (inherit_priority); return this->orb_->orb_core ()->reactor ()->register_handler (this->sigset_, diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h index 72cacbc25ee..8d7e65db10a 100644 --- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h +++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h @@ -67,9 +67,7 @@ public: ACE_hthread_t thread_handles[] = 0, void *stack[] = 0, size_t stack_size[] = 0, - ACE_thread_t thread_ids[] = 0, - bool inherit_priority = false); - + ACE_thread_t thread_ids[] = 0); /// Called when object is signaled by OS (either via UNIX signals or /// when a Win32 object becomes signaled). diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp index 585597df0ba..cc9677c430c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp @@ -517,11 +517,9 @@ ACE_RT_Thread_Manager::spawn_i (ACE_THR_FUNC func, int grp_id, void *stack, size_t stack_size, - ACE_Task_Base *task, - bool inherit_priority) + ACE_Task_Base *task) { flags |= flags_; return ACE_Thread_Manager::spawn_i (func, args, flags, t_id, t_handle, - priority, grp_id, stack, stack_size, task, - inherit_priority); + priority, grp_id, stack, stack_size, task); } diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h index 3a13604ba6b..9cbf1d10a7e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h @@ -57,8 +57,7 @@ protected: int grp_id = -1, void *stack = 0, size_t stack_size = 0, - ACE_Task_Base *task = 0, - bool inherit_priority = false); + ACE_Task_Base *task = 0); int flags_; }; diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp index 318adc8e39a..9983d440884 100644 --- a/TAO/tao/Thread_Per_Connection_Handler.cpp +++ b/TAO/tao/Thread_Per_Connection_Handler.cpp @@ -35,8 +35,7 @@ TAO_Thread_Per_Connection_Handler::activate (long flags, ACE_hthread_t thread_handles[], void *stack[], size_t stack_size[], - ACE_thread_t thread_names[], - bool) + ACE_thread_t thread_names[]) { if (TAO_debug_level) { @@ -56,8 +55,7 @@ TAO_Thread_Per_Connection_Handler::activate (long flags, thread_handles, stack, stack_size, - thread_names, - true); + thread_names); } int diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h index 9e994daf65f..f33905d4bec 100644 --- a/TAO/tao/Thread_Per_Connection_Handler.h +++ b/TAO/tao/Thread_Per_Connection_Handler.h @@ -61,8 +61,7 @@ public: ACE_hthread_t thread_handles[] = 0, void *stack[] = 0, size_t stack_size[] = 0, - ACE_thread_t thread_names[] = 0, - bool inherit_priority = false); + ACE_thread_t thread_names[] = 0); /// Template hook method that the thread uses... /** |