diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Kokyu/Dispatcher_Task.cpp | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 9d54b114d99..cc28e367770 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Oct 12 19:03:31 2003 Venkita Subramonian <venkita@cs.wustl.edu> + + * Kokyu/Dispatcher_Task.cpp: Changed the Null lock in the + allocator to Mutex lock. + Sun Oct 12 17:20:40 2003 Balachandran Natarajan <bala@cs.wustl.edu> * ace/Select_Reactor_Base.cpp: Fix for [BUG 1268]. Please refer to diff --git a/Kokyu/Dispatcher_Task.cpp b/Kokyu/Dispatcher_Task.cpp index 3b4b509c7a3..dc0810b76c3 100644 --- a/Kokyu/Dispatcher_Task.cpp +++ b/Kokyu/Dispatcher_Task.cpp @@ -19,7 +19,7 @@ namespace namespace Kokyu { -typedef ACE_Cached_Allocator<Dispatch_Queue_Item, ACE_SYNCH_NULL_MUTEX> +typedef ACE_Cached_Allocator<Dispatch_Queue_Item, ACE_SYNCH_MUTEX> Dispatch_Queue_Item_Allocator; int @@ -190,18 +190,17 @@ void Dispatch_Queue_Item::init_i (const QoSDescriptor& qos_info) template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >; template class ACE_Lock_Adapter<ACE_Thread_Mutex>; -template class ACE_Cached_Allocator<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_NULL_MUTEX>; +template class ACE_Cached_Allocator<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_MUTEX>; template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item> >; -template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item>, - ACE_SYNCH_NULL_MUTEX>; +template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item>, ACE_SYNCH_MUTEX>; template class ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> > #pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex> #pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item> > -#pragma instantiate ACE_Cached_Allocator<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_NULL_MUTEX> -#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_NULL_MUTEX> +#pragma instantiate ACE_Cached_Allocator<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_MUTEX> +#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item, ACE_SYNCH_MUTEX> #pragma instantiate ACE_Cached_Mem_Pool_Node<Kokyu::Dispatch_Queue_Item> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |