diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2003-07-18 22:48:26 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2003-07-18 22:48:26 +0000 |
| commit | 5f46bb2218bacdd42c729f26ff689185731c455f (patch) | |
| tree | a8435e6ff6015f924e734e4610bfb15340e995ac | |
| parent | a3517fe0314c72abb1ed7e21ffe7a1345a601075 (diff) | |
| download | ATCD-5f46bb2218bacdd42c729f26ff689185731c455f.tar.gz | |
Two changes: one experimental for changing the allocator, another to fix
compilation problems in single-threaded platforms.
| -rw-r--r-- | TAO/ChangeLog | 19 | ||||
| -rw-r--r-- | TAO/tao/default_resource.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/Bug_1551_Regression/Reply_Handler.h | 2 |
3 files changed, 24 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f255febe52d..a8d94eb6f36 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,22 @@ +Fri Jul 18 17:26:32 2003 Chris Cleeland <cleeland_c@ociweb.com> + + * tao/default_resource.cpp: As an experiment, change the typedef + for LOCKED_ALLOCATOR from an ACE_Malloc<>-based allocator to use + the ACE_New_Allocator, thus delegating all issues with regard to + dynamic allocations to the underlying heap allocator. In simple + tests on Redhat 8.0/gcc 3.2-based systems, this resulted in + smaller dynamic memory footprints. If the change doesn't + exhibit the same behavior on other platforms, I'll back this + out. + +Fri Jul 18 17:22:49 2003 Chris Cleeland <cleeland_c@ociweb.com> + + * tests/Bug_1551_Regression/Reply_Handler.h (Reply_Handler): + + Use TAO_SYNCH_MUTEX preprocessor macro rather than + ACE_Thread_Mutex directly so that things build properly on + single-threaded builds like Debian_SingleThreaded. + Fri Jul 18 15:58:20 2003 George Edwards <g.edwards@vanderbilt.edu> * tao/tao.mpc: diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 8c759dac768..ceedcbead61 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -785,8 +785,12 @@ TAO_Default_Resource_Factory::reclaim_reactor (ACE_Reactor *reactor) typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC; typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR; +#if TAO_USE_LOCAL_MEMORY_POOL typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC; typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR; +#else +typedef ACE_New_Allocator LOCKED_ALLOCATOR; +#endif ACE_Allocator * TAO_Default_Resource_Factory::input_cdr_dblock_allocator (void) diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h index 9f0701f5bd7..b8915df21c7 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h @@ -29,7 +29,7 @@ private: void check_counter(ACE_ENV_SINGLE_ARG_DECL); private: - ACE_Atomic_Op<ACE_Thread_Mutex::ACE_Thread_Mutex,long> counter_; + ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> counter_; Test::Hello_var hello_; CORBA::ORB_var orb_; }; |