diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-09-02 22:44:17 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-09-02 22:44:17 +0000 |
| commit | 5afa815c1e09aa17273534e14fca477d5956dfa0 (patch) | |
| tree | 9cddcb77b24029a36760c82c2d3557f5d7e525f2 | |
| parent | 89ab9e8abdbb69cda475459129338473da3f75c3 (diff) | |
| download | ATCD-5afa815c1e09aa17273534e14fca477d5956dfa0.tar.gz | |
ChangeLogTag:Thu Sep 2 17:42:22 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 6 | ||||
| -rw-r--r-- | ace/Malloc_T.cpp | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 51e44cf1065..e5331b62134 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,9 @@ +Thu Sep 2 17:42:22 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/Malloc_T.cpp: + Eliminated UMR problem with the position independent malloc + support. Thanks to Doug for figuring this stuff out. + Thu Sep 2 12:21:41 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * tests/Log_Msg_Test.cpp (test_log_msg_features): Changed the diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index 2589f67a3db..c9b00c66ca4 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -168,20 +168,21 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::open (void) // Initialize the freelist pointer to point to the dummy // <ACE_Malloc_Header>. new ((void *) &this->cb_ptr_->freep_) ACE_MALLOC_HEADER_PTR (&this->cb_ptr_->base_); + new ((void *) &this->cb_ptr_->freep_->next_block_) ACE_MALLOC_HEADER_PTR (this->cb_ptr_->freep_.addr ()); new ((void *) &this->cb_ptr_->name_head_) ACE_NAME_NODE_PTR; + this->cb_ptr_->freep_->size_ = 0; #else // Initialize the freelist pointer to point to the dummy // <ACE_Malloc_Header>. this->cb_ptr_->freep_ = &this->cb_ptr_->base_; // initialize the name list to 0 + this->cb_ptr_->freep_->size_ = 0; + // Initialize the dummy <ACE_Malloc_Header> to point to itself. + this->cb_ptr_->freep_->next_block_ = this->cb_ptr_->freep_; #endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ this->cb_ptr_->name_head_ = (ACE_Name_Node *) 0; - // Initialize the dummy <ACE_Malloc_Header> to point to itself. - this->cb_ptr_->freep_->size_ = 0; - this->cb_ptr_->freep_->next_block_ = this->cb_ptr_->freep_; - if (rounded_bytes > (sizeof *this->cb_ptr_ + sizeof (ACE_Malloc_Header))) { // If we've got any extra space at the end of the control |