This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
| Other format: | [Raw text] | |
On Fri, 2004-10-15 at 00:42, Paolo Carlini wrote:
> Dhruv Matani wrote:
>
> >I have attached a patch, which works with current(unpatched mainline).
> >The Makefiles are not changed in this patch.
> >
> >
> I think you attached the wrong patch, please double check. Mainline now
> includes your work 'til yesterday and is missing only the fixes for:
> 1- Alignment
> 2- pthread7-rope
> Therefore you must rediff the additional work.
Sure thing!
I have attached the diff against the now current mainline.
After the discussion yesterday, I realized that the only way to maintain
alignment without loss of generality in the algorithm itself would be at
the expense of a bit of space. You must have noticed that the number of
bitmaps is always a power of 2. Now this is an odd number only when it
is 1. i.e. If 2^N denotes the number of bitmaps, and N==0.
Thus if we start off with 2 bitmaps(even number), then there can be no
problem at all!
Please let me now if the alignment issues on IA64 still persist after
this patch.
>
> Paolo.
--
-Dhruv Matani.
http://www.geocities.com/dhruvbird/
The price of freedom is responsibility, but it's a bargain, because
freedom is priceless. ~ Hugh Downs
diff -Nrup -x '.cvs*' cvs_libstdc++-v3/config/linker-map.gnu modified_libv3/config/linker-map.gnu
--- cvs_libstdc++-v3/config/linker-map.gnu 2004-10-15 17:07:17.000000000 +0530
+++ modified_libv3/config/linker-map.gnu 2004-10-15 17:30:02.000000000 +0530
@@ -273,7 +273,7 @@ GLIBCXX_3.4.3 {
_ZN9__gnu_cxx9free_list12_S_free_listE;
_ZN9__gnu_cxx9free_list12_S_bfl_mutexE;
- _ZN9__gnu_cxx9free_list6_M_getEj;
+ _ZN9__gnu_cxx9free_list6_M_getEl;
_ZN9__gnu_cxx9free_list8_M_clearEv;
# stub functions from libmath
diff -Nrup -x '.cvs*' cvs_libstdc++-v3/include/ext/bitmap_allocator.h modified_libv3/include/ext/bitmap_allocator.h
--- cvs_libstdc++-v3/include/ext/bitmap_allocator.h 2004-10-15 17:07:26.000000000 +0530
+++ modified_libv3/include/ext/bitmap_allocator.h 2004-10-15 17:25:36.000000000 +0530
@@ -54,6 +54,9 @@
// itself(to debug the allocator itself).
//#define _BALLOC_SANITY_CHECK
+// The constant in the expression below is the alignment required in
+// bytes.
+
#if defined _BALLOC_SANITY_CHECK
#include <cassert>
#define _BALLOC_ASSERT(_EXPR) assert(_EXPR)
@@ -189,6 +192,9 @@ namespace __gnu_cxx
namespace balloc
{
+ // The type for the bit-map.
+ typedef long _Bitmap_t;
+
// __mini_vector<> is to be used only for built-in types or
// PODs. It is a stripped down version of the full-fledged
// std::vector<>. Noteable differences are:
@@ -238,6 +244,7 @@ namespace __gnu_cxx
_M_end_of_storage(0)
{ }
+#if 0
~__mini_vector()
{
if (this->_M_start)
@@ -246,6 +253,7 @@ namespace __gnu_cxx
- this->_M_start);
}
}
+#endif
size_type
size() const throw()
@@ -414,12 +422,12 @@ namespace __gnu_cxx
}
template<typename _AddrPair>
- inline size_t
+ inline long
__num_blocks(_AddrPair __ap)
{ return (__ap.second - __ap.first) + 1; }
template<typename _AddrPair>
- inline size_t
+ inline long
__num_bitmaps(_AddrPair __ap)
{ return __num_blocks(__ap) / bits_per_block; }
@@ -477,8 +485,8 @@ namespace __gnu_cxx
typedef typename balloc::__mini_vector<_Block_pair> _BPVector;
typedef typename _BPVector::difference_type _Counter_type;
- unsigned int* _M_pbitmap;
- unsigned int _M_data_offset;
+ _Bitmap_t* _M_pbitmap;
+ _Counter_type _M_data_offset;
public:
_Ffit_finder() : _M_pbitmap(0), _M_data_offset(0)
@@ -487,10 +495,11 @@ namespace __gnu_cxx
bool
operator()(_Block_pair __bp) throw()
{
- // Set the _rover to the last unsigned integer, which is the
- // bitmap to the first free block. Thus, the bitmaps are in exact
- // reverse order of the actual memory layout. So, we count down
- // the bimaps, which is the same as moving up the memory.
+ // Set the _rover to the last physical location bitmap,
+ // which is the bitmap which belongs to the first free
+ // block. Thus, the bitmaps are in exact reverse order of
+ // the actual memory layout. So, we count down the bimaps,
+ // which is the same as moving up the memory.
// If the used count stored at the start of the Bit Map headers
// is equal to the number of Objects that the current Block can
@@ -499,13 +508,12 @@ namespace __gnu_cxx
_Counter_type __diff =
__gnu_cxx::balloc::__num_bitmaps(__bp);
- if (*reinterpret_cast<unsigned int*>
- (reinterpret_cast<char*>(__bp.first) - (sizeof(unsigned int) *
- (__diff+1)))
+ if (*(reinterpret_cast<_Bitmap_t*>
+ (__bp.first) - (__diff + 1))
== __gnu_cxx::balloc::__num_blocks(__bp))
return false;
- unsigned int* __rover = reinterpret_cast<unsigned int*>(__bp.first) - 1;
+ _Bitmap_t* __rover = reinterpret_cast<_Bitmap_t*>(__bp.first) - 1;
for (_Counter_type __i = 0; __i < __diff; ++__i)
{
@@ -521,11 +529,11 @@ namespace __gnu_cxx
}
- unsigned int*
+ _Bitmap_t*
_M_get() const throw()
{ return _M_pbitmap; }
- unsigned int
+ _Counter_type
_M_offset() const throw()
{ return _M_data_offset * bits_per_block; }
};
@@ -542,8 +550,8 @@ namespace __gnu_cxx
typedef _Tp pointer;
_BPVector& _M_vbp;
- unsigned int* _M_curr_bmap;
- unsigned int* _M_last_bmap_in_block;
+ _Bitmap_t* _M_curr_bmap;
+ _Bitmap_t* _M_last_bmap_in_block;
_Index_type _M_curr_index;
public:
@@ -564,7 +572,7 @@ namespace __gnu_cxx
}
_M_curr_index = __index;
- _M_curr_bmap = reinterpret_cast<unsigned int*>
+ _M_curr_bmap = reinterpret_cast<_Bitmap_t*>
(_M_vbp[_M_curr_index].first) - 1;
_BALLOC_ASSERT(__index <= (int)_M_vbp.size() - 1);
@@ -579,7 +587,7 @@ namespace __gnu_cxx
// function ONLY those values that are known to be correct,
// otherwise this will mess up big time.
void
- _M_set_internal_bitmap(unsigned int* __new_internal_marker) throw()
+ _M_set_internal_bitmap(_Bitmap_t* __new_internal_marker) throw()
{ _M_curr_bmap = __new_internal_marker; }
bool
@@ -601,7 +609,7 @@ namespace __gnu_cxx
return *this;
}
- unsigned int*
+ _Bitmap_t*
_M_get() const throw()
{ return _M_curr_bmap; }
@@ -609,50 +617,50 @@ namespace __gnu_cxx
_M_base() const throw()
{ return _M_vbp[_M_curr_index].first; }
- unsigned int
+ _Index_type
_M_offset() const throw()
{
return bits_per_block
- * ((reinterpret_cast<unsigned int*>(this->_M_base())
+ * ((reinterpret_cast<_Bitmap_t*>(this->_M_base())
- _M_curr_bmap) - 1);
}
- unsigned int
+ _Index_type
_M_where() const throw()
{ return _M_curr_index; }
};
inline void
- __bit_allocate(unsigned int* __pbmap, unsigned int __pos) throw()
+ __bit_allocate(_Bitmap_t* __pbmap, long __pos) throw()
{
- unsigned int __mask = 1 << __pos;
+ _Bitmap_t __mask = 1 << __pos;
__mask = ~__mask;
*__pbmap &= __mask;
}
inline void
- __bit_free(unsigned int* __pbmap, unsigned int __pos) throw()
+ __bit_free(_Bitmap_t* __pbmap, long __pos) throw()
{
- unsigned int __mask = 1 << __pos;
+ _Bitmap_t __mask = 1 << __pos;
*__pbmap |= __mask;
}
} // namespace balloc
// Generic Version of the bsf instruction.
- inline unsigned int
- _Bit_scan_forward(register unsigned int __num)
- { return static_cast<unsigned int>(__builtin_ctz(__num)); }
+ inline long
+ _Bit_scan_forward(long __num)
+ { return static_cast<long>(__builtin_ctzl(__num)); }
class free_list
{
- typedef unsigned int* value_type;
+ typedef balloc::_Bitmap_t* value_type;
typedef balloc::__mini_vector<value_type> vector_type;
typedef vector_type::iterator iterator;
struct _LT_pointer_compare
{
bool
- operator()(const unsigned int* __pui, const unsigned int __cui) const throw()
+ operator()(const balloc::_Bitmap_t* __pui, const balloc::_Bitmap_t __cui) const throw()
{ return *__pui < __cui; }
};
@@ -662,9 +670,9 @@ namespace __gnu_cxx
static vector_type _S_free_list;
void
- _M_validate(unsigned int* __addr) throw()
+ _M_validate(balloc::_Bitmap_t* __addr) throw()
{
- const unsigned int __max_size = 64;
+ const vector_type::size_type __max_size = 64;
if (_S_free_list.size() >= __max_size)
{
// Ok, the threshold value has been reached. We determine
@@ -696,10 +704,10 @@ namespace __gnu_cxx
}
bool
- _M_should_i_give(unsigned int __block_size,
- unsigned int __required_size) throw()
+ _M_should_i_give(balloc::_Bitmap_t __block_size,
+ balloc::_Bitmap_t __required_size) throw()
{
- const unsigned int __max_wastage_percentage = 36;
+ const balloc::_Bitmap_t __max_wastage_percentage = 36;
if (__block_size >= __required_size &&
(((__block_size - __required_size) * 100 / __block_size)
< __max_wastage_percentage))
@@ -710,20 +718,19 @@ namespace __gnu_cxx
public:
inline void
- _M_insert(unsigned int* __addr) throw()
+ _M_insert(balloc::_Bitmap_t* __addr) throw()
{
#if defined __GTHREADS
_Auto_Lock __bfl_lock(&_S_bfl_mutex);
#endif
// Call _M_validate to decide what should be done with
// this particular free list.
- this->_M_validate(reinterpret_cast<unsigned int*>
- (reinterpret_cast<char*>(__addr)
- - sizeof(unsigned int)));
+ this->_M_validate(reinterpret_cast<balloc::_Bitmap_t*>(__addr) - 1);
+ // See discussion as to why this is 1!
}
- unsigned int*
- _M_get(unsigned int __sz) throw(std::bad_alloc);
+ balloc::_Bitmap_t*
+ _M_get(balloc::_Bitmap_t __sz) throw(std::bad_alloc);
// This function just clears the internal Free List, and gives back
// all the memory to the OS.
@@ -771,7 +778,7 @@ namespace __gnu_cxx
};
private:
- template<unsigned int _BSize, unsigned int _AlignSize>
+ template<long _BSize, long _AlignSize>
struct aligned_size
{
enum
@@ -783,7 +790,7 @@ namespace __gnu_cxx
struct _Alloc_block
{
- char __M_unused[aligned_size<sizeof(value_type), 8>::value];
+ char __M_unused[aligned_size<sizeof(value_type), 16>::value];
};
@@ -824,17 +831,15 @@ namespace __gnu_cxx
_S_check_for_free_blocks();
#endif
- const unsigned int __num_bitmaps = _S_block_size / balloc::bits_per_block;
- const unsigned int __size_to_allocate = sizeof(unsigned int)
+ const long __num_bitmaps = _S_block_size / balloc::bits_per_block;
+ const long __size_to_allocate = sizeof(balloc::_Bitmap_t)
+ _S_block_size * sizeof(_Alloc_block)
- + __num_bitmaps * sizeof(unsigned int);
+ + __num_bitmaps * sizeof(balloc::_Bitmap_t);
- unsigned int* __temp =
- reinterpret_cast<unsigned int*>(this->_M_get(__size_to_allocate));
+ balloc::_Bitmap_t* __temp =
+ reinterpret_cast<balloc::_Bitmap_t*>(this->_M_get(__size_to_allocate));
*__temp = 0;
- // ++__temp;
- __temp = reinterpret_cast<unsigned int*>
- (reinterpret_cast<char*>(__temp) + sizeof(unsigned int));
+ ++__temp;
// The Header information goes at the Beginning of the Block.
_Block_pair __bp =
@@ -847,10 +852,10 @@ namespace __gnu_cxx
// Fill the Vector with this information.
_S_mem_blocks.push_back(__bp);
- unsigned int __bit_mask = 0; // 0 Indicates all Allocated.
+ balloc::_Bitmap_t __bit_mask = 0; // 0 Indicates all Allocated.
__bit_mask = ~__bit_mask; // 1 Indicates all Free.
- for (unsigned int __i = 0; __i < __num_bitmaps; ++__i)
+ for (long __i = 0; __i < __num_bitmaps; ++__i)
__temp[__i] = __bit_mask;
_S_block_size *= 2;
@@ -858,7 +863,7 @@ namespace __gnu_cxx
static _BPVector _S_mem_blocks;
- static unsigned int _S_block_size;
+ static long _S_block_size;
static __gnu_cxx::balloc::
_Bitmap_counter<_Alloc_block*> _S_last_request;
static typename _BPVector::size_type _S_last_dealloc_index;
@@ -918,7 +923,7 @@ namespace __gnu_cxx
// Search was successful. Ok, now mark the first bit from
// the right as 0, meaning Allocated. This bit is obtained
// by calling _M_get() on __fff.
- unsigned int __nz_bit = _Bit_scan_forward(*__fff._M_get());
+ long __nz_bit = _Bit_scan_forward(*__fff._M_get());
balloc::__bit_allocate(__fff._M_get(), __nz_bit);
_S_last_request._M_reset(__bpi - _S_mem_blocks.begin());
@@ -926,10 +931,9 @@ namespace __gnu_cxx
// Now, get the address of the bit we marked as allocated.
pointer __ret = reinterpret_cast<pointer>
(__bpi->first + __fff._M_offset() + __nz_bit);
- unsigned int* __puse_count = reinterpret_cast<unsigned int*>
- (reinterpret_cast<char*>
- (__bpi->first) - (sizeof(unsigned int) *
- (__gnu_cxx::balloc::__num_bitmaps(*__bpi)+1)));
+ balloc::_Bitmap_t* __puse_count = reinterpret_cast<balloc::_Bitmap_t*>
+ (__bpi->first)
+ - (__gnu_cxx::balloc::__num_bitmaps(*__bpi) + 1);
++(*__puse_count);
return __ret;
@@ -956,12 +960,10 @@ namespace __gnu_cxx
pointer __ret = reinterpret_cast<pointer>
(_S_last_request._M_base() + _S_last_request._M_offset() + __nz_bit);
- unsigned int* __puse_count = reinterpret_cast<unsigned int*>
- (reinterpret_cast<char*>
- (_S_mem_blocks[_S_last_request._M_where()].first)
- - (sizeof(unsigned int) *
- (__gnu_cxx::balloc::
- __num_bitmaps(_S_mem_blocks[_S_last_request._M_where()])+1)));
+ balloc::_Bitmap_t* __puse_count = reinterpret_cast<balloc::_Bitmap_t*>
+ (_S_mem_blocks[_S_last_request._M_where()].first)
+ - (__gnu_cxx::balloc::
+ __num_bitmaps(_S_mem_blocks[_S_last_request._M_where()]) + 1);
++(*__puse_count);
return __ret;
@@ -1012,17 +1014,15 @@ namespace __gnu_cxx
}
// Get the position of the iterator that has been found.
- const unsigned int __rotate = __displacement % balloc::bits_per_block;
- unsigned int* __bitmapC =
- reinterpret_cast<unsigned int*>(_S_mem_blocks[__diff].first) - 1;
+ const long __rotate = __displacement % balloc::bits_per_block;
+ balloc::_Bitmap_t* __bitmapC =
+ reinterpret_cast<balloc::_Bitmap_t*>(_S_mem_blocks[__diff].first) - 1;
__bitmapC -= (__displacement / balloc::bits_per_block);
balloc::__bit_free(__bitmapC, __rotate);
- unsigned int* __puse_count = reinterpret_cast<unsigned int*>
- (reinterpret_cast<char*>
- (_S_mem_blocks[__diff].first)
- - (sizeof(unsigned int) *
- (__gnu_cxx::balloc::__num_bitmaps(_S_mem_blocks[__diff])+1)));
+ balloc::_Bitmap_t* __puse_count = reinterpret_cast<balloc::_Bitmap_t*>
+ (_S_mem_blocks[__diff].first)
+ - (__gnu_cxx::balloc::__num_bitmaps(_S_mem_blocks[__diff]) + 1);
_BALLOC_ASSERT(*__puse_count != 0);
@@ -1140,7 +1140,7 @@ namespace __gnu_cxx
bitmap_allocator<_Tp>::_S_mem_blocks;
template<typename _Tp>
- unsigned int bitmap_allocator<_Tp>::_S_block_size = balloc::bits_per_block;
+ long bitmap_allocator<_Tp>::_S_block_size = 2 * balloc::bits_per_block;
template<typename _Tp>
typename __gnu_cxx::bitmap_allocator<_Tp>::_BPVector::size_type
diff -Nrup -x '.cvs*' cvs_libstdc++-v3/src/bitmap_allocator.cc modified_libv3/src/bitmap_allocator.cc
--- cvs_libstdc++-v3/src/bitmap_allocator.cc 2004-10-14 23:22:18.000000000 +0530
+++ modified_libv3/src/bitmap_allocator.cc 2004-10-15 17:25:40.000000000 +0530
@@ -41,11 +41,11 @@ namespace __gnu_cxx
<bitmap_allocator<wchar_t>::_Alloc_block*,
bitmap_allocator<wchar_t>::_Alloc_block*> >;
- template class __mini_vector<unsigned int*>;
+ template class __mini_vector<_Bitmap_t*>;
- template unsigned int** __lower_bound
- (unsigned int**, unsigned int**,
- unsigned int const&, free_list::_LT_pointer_compare);
+ template _Bitmap_t** __lower_bound
+ (_Bitmap_t**, _Bitmap_t**,
+ _Bitmap_t const&, free_list::_LT_pointer_compare);
}
#if defined __GTHREADS
@@ -53,9 +53,9 @@ namespace __gnu_cxx
#endif
free_list::vector_type free_list::_S_free_list;
- unsigned int*
+ balloc::_Bitmap_t*
free_list::
- _M_get(unsigned int __sz) throw(std::bad_alloc)
+ _M_get(balloc::_Bitmap_t __sz) throw(std::bad_alloc)
{
#if defined __GTHREADS
_Lock __bfl_lock(&_S_bfl_mutex);
@@ -77,15 +77,15 @@ namespace __gnu_cxx
// Try twice to get the memory: once directly, and the 2nd
// time after clearing the free list. If both fail, then
// throw std::bad_alloc().
- unsigned int __ctr = 2;
+ int __ctr = 2;
while (__ctr)
{
- unsigned int* __ret = 0;
+ balloc::_Bitmap_t* __ret = 0;
--__ctr;
try
{
- __ret = reinterpret_cast<unsigned int*>
- (::operator new(__sz + sizeof(unsigned int)));
+ __ret = reinterpret_cast<balloc::_Bitmap_t*>
+ (::operator new(__sz + sizeof(balloc::_Bitmap_t)));
}
catch(...)
{
@@ -94,20 +94,18 @@ namespace __gnu_cxx
if (!__ret)
continue;
*__ret = __sz;
- return reinterpret_cast<unsigned int*>
- (reinterpret_cast<char*>(__ret) + sizeof(unsigned int));
+ return __ret + 1;
}
throw std::bad_alloc();
}
else
{
- unsigned int* __ret = *__temp;
+ balloc::_Bitmap_t* __ret = *__temp;
_S_free_list.erase(__temp);
#if defined __GTHREADS
__bfl_lock._M_unlock();
#endif
- return reinterpret_cast<unsigned int*>
- (reinterpret_cast<char*>(__ret) + sizeof(unsigned int));
+ return __ret + 1;
}
}
Attachment:
ChangeLog
Description: Text document
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |