diff options
| -rw-r--r-- | ace/Based_Pointer_Repository.cpp | 105 | ||||
| -rw-r--r-- | ace/Based_Pointer_Repository.h | 76 | ||||
| -rw-r--r-- | ace/Based_Pointer_Repository_T.cpp | 53 | ||||
| -rw-r--r-- | ace/Based_Pointer_Repository_T.h | 75 | ||||
| -rw-r--r-- | ace/Makefile | 137 | ||||
| -rw-r--r-- | ace/Memory_Pool.h | 8 |
6 files changed, 423 insertions, 31 deletions
diff --git a/ace/Based_Pointer_Repository.cpp b/ace/Based_Pointer_Repository.cpp new file mode 100644 index 00000000000..df01a70afe6 --- /dev/null +++ b/ace/Based_Pointer_Repository.cpp @@ -0,0 +1,105 @@ +// $Id$ + +#include "ace/Based_Pointer_Repository.h" + +ACE_Based_Pointer_Repository::ACE_Based_Pointer_Repository (void) +{ +} + +ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository (void) +{ +} + +// Search for appropriate base address in repository + +int +ACE_Based_Pointer_Repository::find (void *addr, + void *&base_addr) +{ + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, -1); + MAP_ITERATOR iter = addr_map_; + + for (MAP_ENTRY *ce = 0; + iter.next (ce) != 0; + iter.advance ()) + // Check to see if <addr> is within any of the regions. + if (addr >= ce->ext_id_ + && addr < ((char *) ce->ext_id_ + *(ce->int_id_))) + { + // Assign the base address. + base_addr = ce->ext_id_; + return 1; + } + + // Assume base address 0 (e.g. if new'ed). + base_addr = 0; + return 0; +} + +// Bind a new entry to the repository or update the size of an +// existing entry. + +int +ACE_Based_Pointer_Repository::bind (void *addr, size_t size) +{ + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, -1); + + size_t *sizep; + + if (addr_map_.find (addr, sizep) != -1) + { + // Store new size. + *sizep = size; + return 0; + } + else + { + ACE_NEW_RETURN (sizep, + size_t, + -1); + *sizep = size; + return addr_map_.bind (addr, sizep); + } +} + +// Unbind a base from the repository. + +int +ACE_Based_Pointer_Repository::unbind (void *addr) +{ + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, -1); + MAP_ITERATOR iter = addr_map_; + + // Search for service handlers that requested notification. + + for (MAP_ENTRY *ce = 0; + iter.next (ce) != 0; + iter.advance ()) + { + // Check to see if <addr> is within any of the regions. + if (addr >= ce->ext_id_ + && addr < ((char *) ce->ext_id_ + * (ce->int_id_))) + delete ce->int_id_; + + // Unbind base address. + return addr_map_.unbind (ce->ext_id_); + } + + return 0; +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class ACE_Singleton <ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Entry<void *, size_t *>; +template class ACE_Map_Manager<void *, size_t *, ACE_Null_Mutex>; +template class ACE_Map_Iterator<void *, size_t *, ACE_Null_Mutex>; +template class ACE_Map_Reverse_Iterator<void *, size_t *, ACE_Null_Mutex>; +template class ACE_Map_Iterator_Base<void *, size_t *, ACE_Null_Mutex>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate ACE_Singleton <ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Entry<void *, size_t *> +#pragma instantiate ACE_Map_Manager<void *, size_t *, ACE_Null_Mutex> +#pragma instantiate ACE_Map_Iterator<void *, size_t *, ACE_Null_Mutex> +#pragma instantiate ACE_Map_Reverse_Iterator<void *, size_t *, ACE_Null_Mutex> +#pragma instantiate ACE_Map_Iterator_Base<void *, size_t *, ACE_Null_Mutex> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h new file mode 100644 index 00000000000..206d845d0c8 --- /dev/null +++ b/ace/Based_Pointer_Repository.h @@ -0,0 +1,76 @@ +/* -*- C++ -*- */ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// ace +// +// = FILENAME +// Based_Pointer_Repository.h +// +// = AUTHOR +// Dietrich Quehl <Dietrich.Quehl@med.siemens.de> and +// Douglas C. Schmidt <schmidt@.cs.wustl.edu> +// +// ============================================================================ + +#if !defined (ACE_BASED_POINTER_REPOSITORY_H) +#define ACE_BASED_POINTER_REPOSITORY_H + +#include "ace/Singleton.h" +#include "ace/Map_Manager.h" + +class ACE_Export ACE_Based_Pointer_Repository +{ + // = TITLE + // Maps pointers to the base address of the region to which each + // pointer belongs. + // + // = DESCRIPTION + // Every memory pool in ACE binds it's mapping base address and + // the mapped size to this repository every time it maps/remaps a + // new chunk of memory successfully. +public: + // = Use <ACE_Null_Mutex> to allow locking while iterating. + typedef ACE_Map_Manager <void *, size_t *, ACE_Null_Mutex> + MAP_MANAGER; + typedef ACE_Map_Iterator < void *, size_t *, ACE_Null_Mutex> + MAP_ITERATOR; + typedef ACE_Map_Entry <void *, size_t *> + MAP_ENTRY; + + // = Initialization and termination methods. + ACE_Based_Pointer_Repository (void); + ~ACE_Based_Pointer_Repository (void); + + // = Search structure methods. + int find (void *addr, + void *&base_addr); + // Return the appropriate <base_addr> region that contains <addr>. + // Returns 1 on success and 0 if the <addr> isn't contained in any + // <base_addr> region. + + int bind (void *addr, + size_t size); + // Bind a new entry to the repository or update the size of an + // existing entry. Returns 0 on success and -1 on failure. + + int unbind (void *addr); + // Unbind from the repository the <base_addr> that <addr> is + // contained within. + +private: + MAP_MANAGER addr_map_; + // Keeps track of the mapping between addresses and their associated + // values. + + ACE_SYNCH_MUTEX lock_; + // Synchronize concurrent access to the map. +}; + +// Provide a Singleton access point to the based pointer repository. +typedef ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> + ACE_BASED_POINTER_REPOSITORY; + +#endif /* ACE_BASED_POINTER_REPOSITORY_H */ diff --git a/ace/Based_Pointer_Repository_T.cpp b/ace/Based_Pointer_Repository_T.cpp new file mode 100644 index 00000000000..ebf9cac28ba --- /dev/null +++ b/ace/Based_Pointer_Repository_T.cpp @@ -0,0 +1,53 @@ +// $Id$ + +#if !defined (ACE_BASED_POINTER_REPOSITORY_T_CPP) +#define ACE_BASED_POINTER_REPOSITORY_T_CPP + +#include "ace/Based_Pointer_Repository.h" +#include "ace/Based_Pointer_Repository_T.h" + +template <class CONCRETE> +ACE_Based_Pointer<CONCRETE>::ACE_BasedPointer (void) + : target_ (0), + base_offset_ (0) +{ + // Find the base address associated with our <this> pointer. + void *base_addr = + ACE_BASED_POINTER_REPOSITORY::instance ()->find (this); + + ACE_ASSERT (base_addr != 0); + this->base_offset_ = (char *) this - (char *) base_addr; +} + +template <class CONCRETE> CONCRETE * +ACE_Based_Pointer<CONCRETE>::operator->(void) +{ + char *base_addr = (char *) this - this->base_offset_; + + return (CONCRETE *)(base_addr + (long) this->target_); +} + +template <class CONCRETE> CONCRETE * +ACE_Based_Pointer<CONCRETE>::operator =(CONCRETE *from) +{ + char *base_addr = (char *) this - this->base_offset_; + this->target_ = (CONCRETE *)((char *) from - (char *) base_addr); + return from; +} + +template <class CONCRETE> CONCRETE +ACE_Based_Pointer<CONCRETE>::operator *(void) +{ + char *base_addr = (char *) this - this->base_offset_; + return *(CONCRETE *)(base_addr + (long) this->target_); +} + +template <class CONCRETE> CONCRETE +ACE_Based_Pointer<CONCRETE>::operator [] (int index) +{ + char *base_addr = (char *) this - this->base_offset_; + return *((CONCRETE *)(base_addr + (long) this->target_) + index); +} + +#endif/* ACE_BASED_POINTER_REPOSITORY_T_CPP */ + diff --git a/ace/Based_Pointer_Repository_T.h b/ace/Based_Pointer_Repository_T.h new file mode 100644 index 00000000000..ef8a5dd4ae1 --- /dev/null +++ b/ace/Based_Pointer_Repository_T.h @@ -0,0 +1,75 @@ +/* -*- C++ -*- */ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// ace +// +// = FILENAME +// Based_Pointer_Repository_T.h +// +// = AUTHOR +// Dietrich Quehl <Dietrich.Quehl@med.siemens.de> and +// Douglas C. Schmidt <schmidt@.cs.wustl.edu> +// +// ============================================================================ + +#if !defined (ACE_BASED_POINTER_REPOSITORY_T_H) +#define ACE_BASED_POINTER_REPOSITORY_T_H + +#if defined (_MSC_VER) +// Suppress warning e.g. "return type for +// 'ACE_Based_Pointer<long>::operator ->' is 'long *' (i.e., not a UDT +// or reference to a UDT. Will produce errors if applied using infix +// notation)" +#pragma warning(disable: 4284) +#endif /* _MSC_VER */ + +template <class CONCRETE> +class ACE_Based_Pointer +{ + // = TITLE + // A proxy that keeps track of the relative offset of a "pointer" + // from its base address. + // + // = DESCRIPTION + // This class makes it possible to transparently use "pointers" + // in shared memory without having to ensure that the base + // addresses of all the pointers are mapped into separate + // processes at the same absolute memory base address. +public: + // = Initialization method. + ACE_Based_Pointer (void); + // This constructor initializes the <base_offset_> by computing the + // difference between <this> and the base address of the region that + // <this> is contained within. + + CONCRETE *operator->(void); + // The C++ "delegation operator". + + CONCRETE *operator =(CONCRETE *from); + // Pseudo-assignment operator. + + CONCRETE operator *(void); + // Dereference operator. + + CONCRETE operator [](int index); + // Subscript operator. + +private: + CONCRETE *target_; + + long base_offset_; + // Keep track of our offset from the base pointer. +}; + +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#include "ace/Based_Pointer_Repository_T.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ + +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) +#pragma implementation ("Based_Pointer_Repository_T.cpp") +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + +#endif /* ACE_BASED_POINTER_REPOSITORY_T_H */ diff --git a/ace/Makefile b/ace/Makefile index 21fe5fc9cf2..c3fe48d1779 100644 --- a/ace/Makefile +++ b/ace/Makefile @@ -148,6 +148,7 @@ STREAMS_FILES = \ Message_Queue \ Task MEMORY_FILES = \ + Based_Pointer_Repository \ Malloc \ Mem_Map \ Memory_Pool \ @@ -179,6 +180,7 @@ TEMPLATE_FILES = \ Active_Map_Manager_T \ Asynch_Acceptor \ Auto_Ptr \ + Based_Pointer_Repository_T \ Connector \ Containers_T \ Cache_Map_Manager_T \ @@ -496,8 +498,7 @@ endif # GHS $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Template_Instantiations.cpp -.obj/OS.o .obj/OS.so .shobj/OS.o .shobj/OS.so: OS.cpp \ - $(ACE_ROOT)/ace/OS.h \ +.obj/OS.o .obj/OS.so .shobj/OS.o .shobj/OS.so: OS.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -528,8 +529,7 @@ endif # GHS $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Sched_Params.i -.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.cpp \ - $(ACE_ROOT)/ace/ACE.h \ +.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.cpp $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ @@ -1816,21 +1816,20 @@ endif # GHS $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/SPIPE_Connector.h \ + $(ACE_ROOT)/ace/SPIPE_Stream.h \ + $(ACE_ROOT)/ace/SPIPE.h \ $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i + $(ACE_ROOT)/ace/SPIPE_Addr.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/SPIPE_Addr.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/SPIPE.i \ + $(ACE_ROOT)/ace/SPIPE_Stream.i \ + $(ACE_ROOT)/ace/SPIPE_Connector.i .obj/Log_Record.o .obj/Log_Record.so .shobj/Log_Record.o .shobj/Log_Record.so: Log_Record.cpp \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -4013,8 +4012,7 @@ endif # GHS $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/ATM_Addr.i -.obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp \ - $(ACE_ROOT)/ace/DEV.h \ +.obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp $(ACE_ROOT)/ace/DEV.h \ $(ACE_ROOT)/ace/IO_SAP.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -4677,8 +4675,7 @@ endif # GHS $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/SV_Shared_Memory.i -.obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp \ - $(ACE_ROOT)/ace/TLI.h \ +.obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp $(ACE_ROOT)/ace/TLI.h \ $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -4695,7 +4692,8 @@ endif # GHS $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i .obj/TLI_Acceptor.o .obj/TLI_Acceptor.so .shobj/TLI_Acceptor.o .shobj/TLI_Acceptor.so: TLI_Acceptor.cpp \ $(ACE_ROOT)/ace/TLI_Acceptor.h \ $(ACE_ROOT)/ace/TLI.h \ @@ -4716,10 +4714,13 @@ endif # GHS $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/TLI_Stream.h \ $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ + $(ACE_ROOT)/ace/TLI_Acceptor.i .obj/TLI_Connector.o .obj/TLI_Connector.so .shobj/TLI_Connector.o .shobj/TLI_Connector.so: TLI_Connector.cpp \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -4743,8 +4744,11 @@ endif # GHS $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ + $(ACE_ROOT)/ace/TLI_Connector.i .obj/TLI_Stream.o .obj/TLI_Stream.so .shobj/TLI_Stream.o .shobj/TLI_Stream.so: TLI_Stream.cpp \ $(ACE_ROOT)/ace/TLI_Stream.h \ $(ACE_ROOT)/ace/TLI.h \ @@ -4765,8 +4769,10 @@ endif # GHS $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i .obj/TTY_IO.o .obj/TTY_IO.so .shobj/TTY_IO.o .shobj/TTY_IO.so: TTY_IO.cpp \ $(ACE_ROOT)/ace/TTY_IO.h \ $(ACE_ROOT)/ace/OS.h \ @@ -5223,8 +5229,7 @@ endif # GHS $(ACE_ROOT)/ace/SPIPE.i \ $(ACE_ROOT)/ace/UPIPE_Addr.h \ $(ACE_ROOT)/ace/UPIPE_Stream.i -.obj/DLL.o .obj/DLL.so .shobj/DLL.o .shobj/DLL.so: DLL.cpp \ - $(ACE_ROOT)/ace/DLL.h \ +.obj/DLL.o .obj/DLL.so .shobj/DLL.o .shobj/DLL.so: DLL.cpp $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/streams.h \ @@ -6420,6 +6425,84 @@ endif # GHS $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp +.obj/Based_Pointer_Repository.o .obj/Based_Pointer_Repository.so .shobj/Based_Pointer_Repository.o .shobj/Based_Pointer_Repository.so: Based_Pointer_Repository.cpp \ + $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h .obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp \ $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/ACE.h \ diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h index 5be4903deb5..0d14b34c2f1 100644 --- a/ace/Memory_Pool.h +++ b/ace/Memory_Pool.h @@ -34,7 +34,7 @@ class ACE_Export ACE_Sbrk_Memory_Pool_Options { // = TITLE - // Helper class for constructor options. + // Helper class for Sbrk Memory Pool constructor options. // // = DESCRIPTION // This should be a nested class, but that breaks too many @@ -104,7 +104,7 @@ protected: class ACE_Export ACE_Shared_Memory_Pool_Options { // = TITLE - // Helper class for constructor options. + // Helper class for Shared Memory Pool constructor options. // // = DESCRIPTION // This should be a nested class, but that breaks too many @@ -244,7 +244,7 @@ protected: class ACE_Export ACE_Local_Memory_Pool_Options { // = TITLE - // Helper class for constructor options. + // Helper class for Local Memory Pool constructor options. // // = DESCRIPTION // This should be a nested class, but that breaks too many @@ -316,7 +316,7 @@ protected: class ACE_Export ACE_MMAP_Memory_Pool_Options { // = TITLE - // Helper class for constructor options. + // Helper class for MMAP Memory Pool constructor options. // // = DESCRIPTION // This should be a nested class, but that breaks too many |