[multiple changes]
2004-03-27 Paolo Carlini <pcarlini@suse.de> * include/ext/mt_allocator.h: Uglify consistently names of variables, members and classes; tidy. 2004-03-27 Dhruv Matani <dhruvbird@gmx.net> * include/ext/mt_allocator.h (__mt_alloc<>::deallocate): Deallocation loop rewrote. From-SVN: r80012
This commit is contained in:
parent
ca4944e1fe
commit
6f52a889fd
|
@ -1,3 +1,13 @@
|
||||||
|
2004-03-27 Paolo Carlini <pcarlini@suse.de>
|
||||||
|
|
||||||
|
* include/ext/mt_allocator.h: Uglify consistently names of
|
||||||
|
variables, members and classes; tidy.
|
||||||
|
|
||||||
|
2004-03-27 Dhruv Matani <dhruvbird@gmx.net>
|
||||||
|
|
||||||
|
* include/ext/mt_allocator.h (__mt_alloc<>::deallocate):
|
||||||
|
Deallocation loop rewrote.
|
||||||
|
|
||||||
2004-03-26 Paolo Carlini <pcarlini@suse.de>
|
2004-03-26 Paolo Carlini <pcarlini@suse.de>
|
||||||
|
|
||||||
* include/ext/mt_allocator.h (__mt_alloc<>::allocate,
|
* include/ext/mt_allocator.h (__mt_alloc<>::allocate,
|
||||||
|
|
|
@ -57,13 +57,13 @@ namespace __gnu_cxx
|
||||||
class __mt_alloc
|
class __mt_alloc
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef size_t size_type;
|
typedef size_t size_type;
|
||||||
typedef ptrdiff_t difference_type;
|
typedef ptrdiff_t difference_type;
|
||||||
typedef _Tp* pointer;
|
typedef _Tp* pointer;
|
||||||
typedef const _Tp* const_pointer;
|
typedef const _Tp* const_pointer;
|
||||||
typedef _Tp& reference;
|
typedef _Tp& reference;
|
||||||
typedef const _Tp& const_reference;
|
typedef const _Tp& const_reference;
|
||||||
typedef _Tp value_type;
|
typedef _Tp value_type;
|
||||||
|
|
||||||
template<typename _Tp1>
|
template<typename _Tp1>
|
||||||
struct rebind
|
struct rebind
|
||||||
|
@ -88,10 +88,12 @@ namespace __gnu_cxx
|
||||||
~__mt_alloc() throw() { }
|
~__mt_alloc() throw() { }
|
||||||
|
|
||||||
pointer
|
pointer
|
||||||
address(reference __x) const { return &__x; }
|
address(reference __x) const
|
||||||
|
{ return &__x; }
|
||||||
|
|
||||||
const_pointer
|
const_pointer
|
||||||
address(const_reference __x) const { return &__x; }
|
address(const_reference __x) const
|
||||||
|
{ return &__x; }
|
||||||
|
|
||||||
size_type
|
size_type
|
||||||
max_size() const throw()
|
max_size() const throw()
|
||||||
|
@ -107,14 +109,14 @@ namespace __gnu_cxx
|
||||||
destroy(pointer __p) { __p->~_Tp(); }
|
destroy(pointer __p) { __p->~_Tp(); }
|
||||||
|
|
||||||
pointer
|
pointer
|
||||||
allocate(size_t __n, const void* = 0);
|
allocate(size_type __n, const void* = 0);
|
||||||
|
|
||||||
void
|
void
|
||||||
deallocate(pointer __p, size_type __n);
|
deallocate(pointer __p, size_type __n);
|
||||||
|
|
||||||
// Variables used to configure the behavior of the allocator,
|
// Variables used to configure the behavior of the allocator,
|
||||||
// assigned and explained in detail below.
|
// assigned and explained in detail below.
|
||||||
struct tune
|
struct _Tune
|
||||||
{
|
{
|
||||||
// Allocation requests (after round-up to power of 2) below
|
// Allocation requests (after round-up to power of 2) below
|
||||||
// this value will be handled by the allocator. A raw new/
|
// this value will be handled by the allocator. A raw new/
|
||||||
|
@ -146,7 +148,7 @@ namespace __gnu_cxx
|
||||||
// Set to true forces all allocations to use new().
|
// Set to true forces all allocations to use new().
|
||||||
bool _M_force_new;
|
bool _M_force_new;
|
||||||
|
|
||||||
explicit tune()
|
explicit _Tune()
|
||||||
: _M_max_bytes(128), _M_min_bin(8),
|
: _M_max_bytes(128), _M_min_bin(8),
|
||||||
_M_chunk_size(4096 - 4 * sizeof(void*)),
|
_M_chunk_size(4096 - 4 * sizeof(void*)),
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
|
@ -158,8 +160,8 @@ namespace __gnu_cxx
|
||||||
_M_force_new(getenv("GLIBCXX_FORCE_NEW") ? true : false)
|
_M_force_new(getenv("GLIBCXX_FORCE_NEW") ? true : false)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
explicit tune(size_t __maxb, size_t __minbin, size_t __chunk,
|
explicit _Tune(size_t __maxb, size_t __minbin, size_t __chunk,
|
||||||
size_t __maxthreads, size_t __headroom, bool __force)
|
size_t __maxthreads, size_t __headroom, bool __force)
|
||||||
: _M_max_bytes(__maxb), _M_min_bin(__minbin), _M_chunk_size(__chunk),
|
: _M_max_bytes(__maxb), _M_min_bin(__minbin), _M_chunk_size(__chunk),
|
||||||
_M_max_threads(__maxthreads), _M_freelist_headroom(__headroom),
|
_M_max_threads(__maxthreads), _M_freelist_headroom(__headroom),
|
||||||
_M_force_new(__force)
|
_M_force_new(__force)
|
||||||
|
@ -174,17 +176,18 @@ namespace __gnu_cxx
|
||||||
#endif
|
#endif
|
||||||
static bool _S_init;
|
static bool _S_init;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_S_initialize();
|
_S_initialize();
|
||||||
|
|
||||||
// Configuration options.
|
// Configuration options.
|
||||||
static tune _S_options;
|
static _Tune _S_options;
|
||||||
|
|
||||||
static const tune
|
static const _Tune
|
||||||
_S_get_options() { return _S_options; }
|
_S_get_options()
|
||||||
|
{ return _S_options; }
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_S_set_options(tune __t)
|
_S_set_options(_Tune __t)
|
||||||
{
|
{
|
||||||
if (!_S_init)
|
if (!_S_init)
|
||||||
_S_options = __t;
|
_S_options = __t;
|
||||||
|
@ -192,8 +195,8 @@ namespace __gnu_cxx
|
||||||
|
|
||||||
// Using short int as type for the binmap implies we are never
|
// Using short int as type for the binmap implies we are never
|
||||||
// caching blocks larger than 65535 with this allocator
|
// caching blocks larger than 65535 with this allocator
|
||||||
typedef unsigned short int binmap_type;
|
typedef unsigned short int _Binmap_type;
|
||||||
static binmap_type* _S_binmap;
|
static _Binmap_type* _S_binmap;
|
||||||
|
|
||||||
// Each requesting thread is assigned an id ranging from 1 to
|
// Each requesting thread is assigned an id ranging from 1 to
|
||||||
// _S_max_threads. Thread id 0 is used as a global memory pool.
|
// _S_max_threads. Thread id 0 is used as a global memory pool.
|
||||||
|
@ -205,63 +208,63 @@ namespace __gnu_cxx
|
||||||
// (i.e. the thread dies) is called, we return the thread id to
|
// (i.e. the thread dies) is called, we return the thread id to
|
||||||
// the front of this list.
|
// the front of this list.
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
struct thread_record
|
struct _Thread_record
|
||||||
{
|
{
|
||||||
// Points to next free thread id record. NULL if last record in list.
|
// Points to next free thread id record. NULL if last record in list.
|
||||||
thread_record* volatile next;
|
_Thread_record* volatile _M_next;
|
||||||
|
|
||||||
// Thread id ranging from 1 to _S_max_threads.
|
// Thread id ranging from 1 to _S_max_threads.
|
||||||
size_t id;
|
size_t _M_id;
|
||||||
};
|
};
|
||||||
|
|
||||||
static thread_record* volatile _S_thread_freelist_first;
|
static _Thread_record* volatile _S_thread_freelist_first;
|
||||||
static __gthread_mutex_t _S_thread_freelist_mutex;
|
static __gthread_mutex_t _S_thread_freelist_mutex;
|
||||||
static __gthread_key_t _S_thread_key;
|
static __gthread_key_t _S_thread_key;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_S_destroy_thread_key(void* freelist_pos);
|
_S_destroy_thread_key(void* __freelist_pos);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static size_t
|
static size_t
|
||||||
_S_get_thread_id();
|
_S_get_thread_id();
|
||||||
|
|
||||||
union block_record
|
union _Block_record
|
||||||
{
|
{
|
||||||
// Points to the next block_record for its thread_id.
|
// Points to the next block_record for its thread_id.
|
||||||
block_record* volatile next;
|
_Block_record* volatile _M_next;
|
||||||
|
|
||||||
// The thread id of the thread which has requested this block.
|
// The thread id of the thread which has requested this block.
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
size_t thread_id;
|
size_t _M_thread_id;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
struct bin_record
|
struct _Bin_record
|
||||||
{
|
{
|
||||||
// An "array" of pointers to the first free block for each
|
// An "array" of pointers to the first free block for each
|
||||||
// thread id. Memory to this "array" is allocated in _S_initialize()
|
// thread id. Memory to this "array" is allocated in _S_initialize()
|
||||||
// for _S_max_threads + global pool 0.
|
// for _S_max_threads + global pool 0.
|
||||||
block_record** volatile first;
|
_Block_record** volatile _M_first;
|
||||||
|
|
||||||
// An "array" of counters used to keep track of the amount of
|
// An "array" of counters used to keep track of the amount of
|
||||||
// blocks that are on the freelist/used for each thread id.
|
// blocks that are on the freelist/used for each thread id.
|
||||||
// Memory to these "arrays" is allocated in _S_initialize() for
|
// Memory to these "arrays" is allocated in _S_initialize() for
|
||||||
// _S_max_threads + global pool 0.
|
// _S_max_threads + global pool 0.
|
||||||
size_t* volatile free;
|
size_t* volatile _M_free;
|
||||||
size_t* volatile used;
|
size_t* volatile _M_used;
|
||||||
|
|
||||||
// Each bin has its own mutex which is used to ensure data
|
// Each bin has its own mutex which is used to ensure data
|
||||||
// integrity while changing "ownership" on a block. The mutex
|
// integrity while changing "ownership" on a block. The mutex
|
||||||
// is initialized in _S_initialize().
|
// is initialized in _S_initialize().
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
__gthread_mutex_t* mutex;
|
__gthread_mutex_t* _M_mutex;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
// An "array" of bin_records each of which represents a specific
|
// An "array" of bin_records each of which represents a specific
|
||||||
// power of 2 size. Memory to this "array" is allocated in
|
// power of 2 size. Memory to this "array" is allocated in
|
||||||
// _S_initialize().
|
// _S_initialize().
|
||||||
static bin_record* volatile _S_bin;
|
static _Bin_record* volatile _S_bin;
|
||||||
|
|
||||||
// Actual value calculated in _S_initialize().
|
// Actual value calculated in _S_initialize().
|
||||||
static size_t _S_bin_size;
|
static size_t _S_bin_size;
|
||||||
|
@ -270,7 +273,7 @@ namespace __gnu_cxx
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
typename __mt_alloc<_Tp>::pointer
|
typename __mt_alloc<_Tp>::pointer
|
||||||
__mt_alloc<_Tp>::
|
__mt_alloc<_Tp>::
|
||||||
allocate(size_t __n, const void*)
|
allocate(size_type __n, const void*)
|
||||||
{
|
{
|
||||||
// Although the test in __gthread_once() would suffice, we wrap
|
// Although the test in __gthread_once() would suffice, we wrap
|
||||||
// test of the once condition in our own unlocked check. This
|
// test of the once condition in our own unlocked check. This
|
||||||
|
@ -295,20 +298,24 @@ namespace __gnu_cxx
|
||||||
void* __ret = ::operator new(__bytes);
|
void* __ret = ::operator new(__bytes);
|
||||||
return static_cast<_Tp*>(__ret);
|
return static_cast<_Tp*>(__ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Round up to power of 2 and figure out which bin to use.
|
// Round up to power of 2 and figure out which bin to use.
|
||||||
const size_t __which = _S_binmap[__bytes];
|
const size_t __which = _S_binmap[__bytes];
|
||||||
const size_t __thread_id = _S_get_thread_id();
|
const size_t __thread_id = _S_get_thread_id();
|
||||||
|
|
||||||
// Find out if we have blocks on our freelist. If so, go ahead
|
// Find out if we have blocks on our freelist. If so, go ahead
|
||||||
// and use them directly without having to lock anything.
|
// and use them directly without having to lock anything.
|
||||||
const bin_record& __bin = _S_bin[__which];
|
const _Bin_record& __bin = _S_bin[__which];
|
||||||
block_record* block = NULL;
|
_Block_record* __block = NULL;
|
||||||
if (__bin.first[__thread_id] == NULL)
|
if (__bin._M_first[__thread_id] == NULL)
|
||||||
{
|
{
|
||||||
|
const size_t __bin_size = ((_S_options._M_min_bin << __which)
|
||||||
|
+ sizeof(_Block_record));
|
||||||
|
size_t __block_count = _S_options._M_chunk_size / __bin_size;
|
||||||
|
|
||||||
// Are we using threads?
|
// Are we using threads?
|
||||||
// - Yes, check if there are free blocks on the global
|
// - Yes, check if there are free blocks on the global
|
||||||
// list. If so, grab up to block_count blocks in one
|
// list. If so, grab up to __block_count blocks in one
|
||||||
// lock and change ownership. If the global list is
|
// lock and change ownership. If the global list is
|
||||||
// empty, we allocate a new chunk and add those blocks
|
// empty, we allocate a new chunk and add those blocks
|
||||||
// directly to our own freelist (with us as owner).
|
// directly to our own freelist (with us as owner).
|
||||||
|
@ -319,107 +326,95 @@ namespace __gnu_cxx
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
if (__gthread_active_p())
|
if (__gthread_active_p())
|
||||||
{
|
{
|
||||||
const size_t bin_size = ((_S_options._M_min_bin << __which)
|
__gthread_mutex_lock(__bin._M_mutex);
|
||||||
+ sizeof(block_record));
|
if (__bin._M_first[0] == NULL)
|
||||||
size_t block_count = _S_options._M_chunk_size / bin_size;
|
|
||||||
|
|
||||||
__gthread_mutex_lock(__bin.mutex);
|
|
||||||
if (__bin.first[0] == NULL)
|
|
||||||
{
|
{
|
||||||
// No need to hold the lock when we are adding a
|
// No need to hold the lock when we are adding a
|
||||||
// whole chunk to our own list.
|
// whole chunk to our own list.
|
||||||
__gthread_mutex_unlock(__bin.mutex);
|
__gthread_mutex_unlock(__bin._M_mutex);
|
||||||
|
|
||||||
void* v = ::operator new(_S_options._M_chunk_size);
|
void* __v = ::operator new(_S_options._M_chunk_size);
|
||||||
__bin.first[__thread_id] = static_cast<block_record*>(v);
|
__bin._M_first[__thread_id] = static_cast<_Block_record*>(__v);
|
||||||
|
__bin._M_free[__thread_id] = __block_count;
|
||||||
__bin.free[__thread_id] = block_count;
|
|
||||||
block_count--;
|
--__block_count;
|
||||||
block = __bin.first[__thread_id];
|
__block = __bin._M_first[__thread_id];
|
||||||
|
while (__block_count > 0)
|
||||||
while (block_count > 0)
|
|
||||||
{
|
{
|
||||||
char* c = reinterpret_cast<char*>(block) + bin_size;
|
char* __c = reinterpret_cast<char*>(__block) + __bin_size;
|
||||||
block->next = reinterpret_cast<block_record*>(c);
|
__block->_M_next = reinterpret_cast<_Block_record*>(__c);
|
||||||
block = block->next;
|
__block = __block->_M_next;
|
||||||
block_count--;
|
--__block_count;
|
||||||
}
|
}
|
||||||
block->next = NULL;
|
__block->_M_next = NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
size_t global_count = 0;
|
while (__bin._M_first[0] != NULL && __block_count > 0)
|
||||||
block_record* tmp;
|
|
||||||
while (__bin.first[0] != NULL && global_count < block_count)
|
|
||||||
{
|
{
|
||||||
tmp = __bin.first[0]->next;
|
_Block_record* __tmp = __bin._M_first[0]->_M_next;
|
||||||
block = __bin.first[0];
|
__block = __bin._M_first[0];
|
||||||
|
|
||||||
block->next = __bin.first[__thread_id];
|
__block->_M_next = __bin._M_first[__thread_id];
|
||||||
__bin.first[__thread_id] = block;
|
__bin._M_first[__thread_id] = __block;
|
||||||
|
|
||||||
__bin.free[__thread_id]++;
|
++__bin._M_free[__thread_id];
|
||||||
__bin.first[0] = tmp;
|
__bin._M_first[0] = __tmp;
|
||||||
global_count++;
|
--__block_count;
|
||||||
}
|
}
|
||||||
__gthread_mutex_unlock(__bin.mutex);
|
__gthread_mutex_unlock(__bin._M_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return the first newly added block in our list and
|
// Return the first newly added block in our list and
|
||||||
// update the counters
|
// update the counters
|
||||||
block = __bin.first[__thread_id];
|
__block = __bin._M_first[__thread_id];
|
||||||
__bin.first[__thread_id] = __bin.first[__thread_id]->next;
|
__bin._M_first[__thread_id] = __bin._M_first[__thread_id]->_M_next;
|
||||||
block->thread_id = __thread_id;
|
__block->_M_thread_id = __thread_id;
|
||||||
__bin.free[__thread_id]--;
|
--__bin._M_free[__thread_id];
|
||||||
__bin.used[__thread_id]++;
|
++__bin._M_used[__thread_id];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
void* __v = ::operator new(_S_options._M_chunk_size);
|
void* __v = ::operator new(_S_options._M_chunk_size);
|
||||||
__bin.first[0] = static_cast<block_record*>(__v);
|
__bin._M_first[0] = static_cast<_Block_record*>(__v);
|
||||||
|
|
||||||
const size_t bin_size = ((_S_options._M_min_bin << __which)
|
--__block_count;
|
||||||
+ sizeof(block_record));
|
__block = __bin._M_first[0];
|
||||||
size_t block_count = _S_options._M_chunk_size / bin_size;
|
while (__block_count > 0)
|
||||||
|
|
||||||
block_count--;
|
|
||||||
block = __bin.first[0];
|
|
||||||
while (block_count > 0)
|
|
||||||
{
|
{
|
||||||
char* __c = reinterpret_cast<char*>(block) + bin_size;
|
char* __c = reinterpret_cast<char*>(__block) + __bin_size;
|
||||||
block->next = reinterpret_cast<block_record*>(__c);
|
__block->_M_next = reinterpret_cast<_Block_record*>(__c);
|
||||||
block = block->next;
|
__block = __block->_M_next;
|
||||||
block_count--;
|
--__block_count;
|
||||||
}
|
}
|
||||||
block->next = NULL;
|
__block->_M_next = NULL;
|
||||||
|
|
||||||
// Remove from list.
|
// Remove from list.
|
||||||
block = __bin.first[0];
|
__block = __bin._M_first[0];
|
||||||
__bin.first[0] = __bin.first[0]->next;
|
__bin._M_first[0] = __bin._M_first[0]->_M_next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// "Default" operation - we have blocks on our own freelist
|
// "Default" operation - we have blocks on our own freelist
|
||||||
// grab the first record and update the counters.
|
// grab the first record and update the counters.
|
||||||
block = __bin.first[__thread_id];
|
__block = __bin._M_first[__thread_id];
|
||||||
__bin.first[__thread_id] = __bin.first[__thread_id]->next;
|
__bin._M_first[__thread_id] = __bin._M_first[__thread_id]->_M_next;
|
||||||
|
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
block->thread_id = __thread_id;
|
|
||||||
if (__gthread_active_p())
|
if (__gthread_active_p())
|
||||||
{
|
{
|
||||||
__bin.free[__thread_id]--;
|
__block->_M_thread_id = __thread_id;
|
||||||
__bin.used[__thread_id]++;
|
--__bin._M_free[__thread_id];
|
||||||
|
++__bin._M_used[__thread_id];
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
char* __c = reinterpret_cast<char*>(block) + sizeof(block_record);
|
char* __c = reinterpret_cast<char*>(__block) + sizeof(_Block_record);
|
||||||
return static_cast<_Tp*>(static_cast<void*>(__c));
|
return static_cast<_Tp*>(static_cast<void*>(__c));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
void
|
void
|
||||||
__mt_alloc<_Tp>::
|
__mt_alloc<_Tp>::
|
||||||
|
@ -436,58 +431,60 @@ namespace __gnu_cxx
|
||||||
|
|
||||||
// Round up to power of 2 and figure out which bin to use.
|
// Round up to power of 2 and figure out which bin to use.
|
||||||
const size_t __which = _S_binmap[__bytes];
|
const size_t __which = _S_binmap[__bytes];
|
||||||
const bin_record& __bin = _S_bin[__which];
|
const _Bin_record& __bin = _S_bin[__which];
|
||||||
|
|
||||||
char* __c = reinterpret_cast<char*>(__p) - sizeof(block_record);
|
char* __c = reinterpret_cast<char*>(__p) - sizeof(_Block_record);
|
||||||
block_record* block = reinterpret_cast<block_record*>(__c);
|
_Block_record* __block = reinterpret_cast<_Block_record*>(__c);
|
||||||
|
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
const size_t thread_id = _S_get_thread_id();
|
|
||||||
if (__gthread_active_p())
|
if (__gthread_active_p())
|
||||||
{
|
{
|
||||||
// Calculate the number of records to remove from our freelist.
|
// Calculate the number of records to remove from our freelist.
|
||||||
int remove = __bin.free[thread_id] -
|
const size_t __thread_id = _S_get_thread_id();
|
||||||
(__bin.used[thread_id] / _S_options._M_freelist_headroom);
|
int __remove = (__bin._M_free[__thread_id]
|
||||||
|
- (__bin._M_used[__thread_id]
|
||||||
|
/ _S_options._M_freelist_headroom));
|
||||||
|
|
||||||
// The calculation above will almost always tell us to
|
// The calculation above will almost always tell us to
|
||||||
// remove one or two records at a time, but this creates too
|
// remove one or two records at a time, but this creates too
|
||||||
// much contention when locking and therefore we wait until
|
// much contention when locking and therefore we wait until
|
||||||
// the number of records is "high enough".
|
// the number of records is "high enough".
|
||||||
int __cond1 = static_cast<int>(100 * (_S_bin_size - __which));
|
int __cond1 = static_cast<int>(100 * (_S_bin_size - __which));
|
||||||
int __cond2 = static_cast<int>(__bin.free[thread_id]
|
int __cond2 = static_cast<int>(__bin._M_free[__thread_id]
|
||||||
/ _S_options._M_freelist_headroom);
|
/ _S_options._M_freelist_headroom);
|
||||||
if (remove > __cond1 && remove > __cond2)
|
if (__remove > __cond1 && __remove > __cond2)
|
||||||
{
|
{
|
||||||
__gthread_mutex_lock(__bin.mutex);
|
__gthread_mutex_lock(__bin._M_mutex);
|
||||||
block_record* tmp;
|
_Block_record* __tmp = __bin._M_first[__thread_id];
|
||||||
while (remove > 0)
|
_Block_record* __first = __tmp;
|
||||||
|
const int __removed = __remove;
|
||||||
|
while (__remove > 1)
|
||||||
{
|
{
|
||||||
tmp = __bin.first[thread_id]->next;
|
__tmp = __tmp->_M_next;
|
||||||
__bin.first[thread_id]->next = __bin.first[0];
|
--__remove;
|
||||||
__bin.first[0] = __bin.first[thread_id];
|
|
||||||
|
|
||||||
__bin.first[thread_id] = tmp;
|
|
||||||
__bin.free[thread_id]--;
|
|
||||||
remove--;
|
|
||||||
}
|
}
|
||||||
__gthread_mutex_unlock(__bin.mutex);
|
__bin._M_first[__thread_id] = __tmp->_M_next;
|
||||||
|
__tmp->_M_next = __bin._M_first[0];
|
||||||
|
__bin._M_first[0] = __first;
|
||||||
|
__bin._M_free[__thread_id] -= __removed;
|
||||||
|
__gthread_mutex_unlock(__bin._M_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return this block to our list and update counters and
|
// Return this block to our list and update counters and
|
||||||
// owner id as needed.
|
// owner id as needed.
|
||||||
__bin.used[block->thread_id]--;
|
--__bin._M_used[__block->_M_thread_id];
|
||||||
|
|
||||||
block->next = __bin.first[thread_id];
|
__block->_M_next = __bin._M_first[__thread_id];
|
||||||
__bin.first[thread_id] = block;
|
__bin._M_first[__thread_id] = __block;
|
||||||
|
|
||||||
__bin.free[thread_id]++;
|
++__bin._M_free[__thread_id];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
// Single threaded application - return to global pool.
|
// Single threaded application - return to global pool.
|
||||||
block->next = __bin.first[0];
|
__block->_M_next = __bin._M_first[0];
|
||||||
__bin.first[0] = block;
|
__bin._M_first[0] = __block;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -505,22 +502,22 @@ namespace __gnu_cxx
|
||||||
while (_S_options._M_max_bytes > __bin_size)
|
while (_S_options._M_max_bytes > __bin_size)
|
||||||
{
|
{
|
||||||
__bin_size <<= 1;
|
__bin_size <<= 1;
|
||||||
_S_bin_size++;
|
++_S_bin_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup the bin map for quick lookup of the relevant bin.
|
// Setup the bin map for quick lookup of the relevant bin.
|
||||||
const size_t __j = (_S_options._M_max_bytes + 1) * sizeof(binmap_type);
|
const size_t __j = (_S_options._M_max_bytes + 1) * sizeof(_Binmap_type);
|
||||||
_S_binmap = static_cast<binmap_type*>(::operator new(__j));
|
_S_binmap = static_cast<_Binmap_type*>(::operator new(__j));
|
||||||
|
|
||||||
binmap_type* __bp = _S_binmap;
|
_Binmap_type* __bp = _S_binmap;
|
||||||
binmap_type __bin_max = _S_options._M_min_bin;
|
_Binmap_type __bin_max = _S_options._M_min_bin;
|
||||||
binmap_type __bint = 0;
|
_Binmap_type __bint = 0;
|
||||||
for (binmap_type __ct = 0; __ct <= _S_options._M_max_bytes; __ct++)
|
for (_Binmap_type __ct = 0; __ct <= _S_options._M_max_bytes; ++__ct)
|
||||||
{
|
{
|
||||||
if (__ct > __bin_max)
|
if (__ct > __bin_max)
|
||||||
{
|
{
|
||||||
__bin_max <<= 1;
|
__bin_max <<= 1;
|
||||||
__bint++;
|
++__bint;
|
||||||
}
|
}
|
||||||
*__bp++ = __bint;
|
*__bp++ = __bint;
|
||||||
}
|
}
|
||||||
|
@ -532,24 +529,23 @@ namespace __gnu_cxx
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
if (__gthread_active_p())
|
if (__gthread_active_p())
|
||||||
{
|
{
|
||||||
const size_t __k = sizeof(thread_record) * _S_options._M_max_threads;
|
const size_t __k = sizeof(_Thread_record) * _S_options._M_max_threads;
|
||||||
__v = ::operator new(__k);
|
__v = ::operator new(__k);
|
||||||
_S_thread_freelist_first = static_cast<thread_record*>(__v);
|
_S_thread_freelist_first = static_cast<_Thread_record*>(__v);
|
||||||
|
|
||||||
// NOTE! The first assignable thread id is 1 since the
|
// NOTE! The first assignable thread id is 1 since the
|
||||||
// global pool uses id 0
|
// global pool uses id 0
|
||||||
size_t __i;
|
size_t __i;
|
||||||
for (__i = 1; __i < _S_options._M_max_threads; __i++)
|
for (__i = 1; __i < _S_options._M_max_threads; ++__i)
|
||||||
{
|
{
|
||||||
thread_record& __tr = _S_thread_freelist_first[__i - 1];
|
_Thread_record& __tr = _S_thread_freelist_first[__i - 1];
|
||||||
__tr.next = &_S_thread_freelist_first[__i];
|
__tr._M_next = &_S_thread_freelist_first[__i];
|
||||||
__tr.id = __i;
|
__tr._M_id = __i;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set last record.
|
// Set last record.
|
||||||
_S_thread_freelist_first[__i - 1].next = NULL;
|
_S_thread_freelist_first[__i - 1]._M_next = NULL;
|
||||||
_S_thread_freelist_first[__i - 1].id = __i;
|
_S_thread_freelist_first[__i - 1]._M_id = __i;
|
||||||
|
|
||||||
|
|
||||||
// Make sure this is initialized.
|
// Make sure this is initialized.
|
||||||
#ifndef __GTHREAD_MUTEX_INIT
|
#ifndef __GTHREAD_MUTEX_INIT
|
||||||
|
@ -562,8 +558,8 @@ namespace __gnu_cxx
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Initialize _S_bin and its members.
|
// Initialize _S_bin and its members.
|
||||||
__v = ::operator new(sizeof(bin_record) * _S_bin_size);
|
__v = ::operator new(sizeof(_Bin_record) * _S_bin_size);
|
||||||
_S_bin = static_cast<bin_record*>(__v);
|
_S_bin = static_cast<_Bin_record*>(__v);
|
||||||
|
|
||||||
// Maximum number of threads.
|
// Maximum number of threads.
|
||||||
size_t __max_threads = 1;
|
size_t __max_threads = 1;
|
||||||
|
@ -572,44 +568,44 @@ namespace __gnu_cxx
|
||||||
__max_threads = _S_options._M_max_threads + 1;
|
__max_threads = _S_options._M_max_threads + 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (size_t __n = 0; __n < _S_bin_size; __n++)
|
for (size_t __n = 0; __n < _S_bin_size; ++__n)
|
||||||
{
|
{
|
||||||
bin_record& __bin = _S_bin[__n];
|
_Bin_record& __bin = _S_bin[__n];
|
||||||
__v = ::operator new(sizeof(block_record*) * __max_threads);
|
__v = ::operator new(sizeof(_Block_record*) * __max_threads);
|
||||||
__bin.first = static_cast<block_record**>(__v);
|
__bin._M_first = static_cast<_Block_record**>(__v);
|
||||||
|
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
if (__gthread_active_p())
|
if (__gthread_active_p())
|
||||||
{
|
{
|
||||||
__v = ::operator new(sizeof(size_t) * __max_threads);
|
__v = ::operator new(sizeof(size_t) * __max_threads);
|
||||||
__bin.free = static_cast<size_t*>(__v);
|
__bin._M_free = static_cast<size_t*>(__v);
|
||||||
|
|
||||||
__v = ::operator new(sizeof(size_t) * __max_threads);
|
__v = ::operator new(sizeof(size_t) * __max_threads);
|
||||||
__bin.used = static_cast<size_t*>(__v);
|
__bin._M_used = static_cast<size_t*>(__v);
|
||||||
|
|
||||||
__v = ::operator new(sizeof(__gthread_mutex_t));
|
__v = ::operator new(sizeof(__gthread_mutex_t));
|
||||||
__bin.mutex = static_cast<__gthread_mutex_t*>(__v);
|
__bin._M_mutex = static_cast<__gthread_mutex_t*>(__v);
|
||||||
|
|
||||||
#ifdef __GTHREAD_MUTEX_INIT
|
#ifdef __GTHREAD_MUTEX_INIT
|
||||||
{
|
{
|
||||||
// Do not copy a POSIX/gthr mutex once in use.
|
// Do not copy a POSIX/gthr mutex once in use.
|
||||||
__gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT;
|
__gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT;
|
||||||
*__bin.mutex = __tmp;
|
*__bin._M_mutex = __tmp;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
{ __GTHREAD_MUTEX_INIT_FUNCTION(__bin.mutex); }
|
{ __GTHREAD_MUTEX_INIT_FUNCTION(__bin._M_mutex); }
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (size_t __threadn = 0; __threadn < __max_threads; __threadn++)
|
for (size_t __threadn = 0; __threadn < __max_threads; ++__threadn)
|
||||||
{
|
{
|
||||||
__bin.first[__threadn] = NULL;
|
__bin._M_first[__threadn] = NULL;
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
if (__gthread_active_p())
|
if (__gthread_active_p())
|
||||||
{
|
{
|
||||||
__bin.free[__threadn] = 0;
|
__bin._M_free[__threadn] = 0;
|
||||||
__bin.used[__threadn] = 0;
|
__bin._M_used[__threadn] = 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -624,13 +620,13 @@ namespace __gnu_cxx
|
||||||
{
|
{
|
||||||
#ifdef __GTHREADS
|
#ifdef __GTHREADS
|
||||||
// If we have thread support and it's active we check the thread
|
// If we have thread support and it's active we check the thread
|
||||||
// key value and return it's id or if it's not set we take the
|
// key value and return its id or if it's not set we take the
|
||||||
// first record from _S_thread_freelist and sets the key and
|
// first record from _S_thread_freelist and sets the key and
|
||||||
// returns it's id.
|
// returns it's id.
|
||||||
if (__gthread_active_p())
|
if (__gthread_active_p())
|
||||||
{
|
{
|
||||||
thread_record* __freelist_pos =
|
_Thread_record* __freelist_pos =
|
||||||
static_cast<thread_record*>(__gthread_getspecific(_S_thread_key));
|
static_cast<_Thread_record*>(__gthread_getspecific(_S_thread_key));
|
||||||
if (__freelist_pos == NULL)
|
if (__freelist_pos == NULL)
|
||||||
{
|
{
|
||||||
// Since _S_options._M_max_threads must be larger than
|
// Since _S_options._M_max_threads must be larger than
|
||||||
|
@ -638,13 +634,13 @@ namespace __gnu_cxx
|
||||||
// list can never be empty.
|
// list can never be empty.
|
||||||
__gthread_mutex_lock(&_S_thread_freelist_mutex);
|
__gthread_mutex_lock(&_S_thread_freelist_mutex);
|
||||||
__freelist_pos = _S_thread_freelist_first;
|
__freelist_pos = _S_thread_freelist_first;
|
||||||
_S_thread_freelist_first = _S_thread_freelist_first->next;
|
_S_thread_freelist_first = _S_thread_freelist_first->_M_next;
|
||||||
__gthread_mutex_unlock(&_S_thread_freelist_mutex);
|
__gthread_mutex_unlock(&_S_thread_freelist_mutex);
|
||||||
|
|
||||||
__gthread_setspecific(_S_thread_key,
|
__gthread_setspecific(_S_thread_key,
|
||||||
static_cast<void*>(__freelist_pos));
|
static_cast<void*>(__freelist_pos));
|
||||||
}
|
}
|
||||||
return __freelist_pos->id;
|
return __freelist_pos->_M_id;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
// Otherwise (no thread support or inactive) all requests are
|
// Otherwise (no thread support or inactive) all requests are
|
||||||
|
@ -660,8 +656,8 @@ namespace __gnu_cxx
|
||||||
{
|
{
|
||||||
// Return this thread id record to front of thread_freelist.
|
// Return this thread id record to front of thread_freelist.
|
||||||
__gthread_mutex_lock(&_S_thread_freelist_mutex);
|
__gthread_mutex_lock(&_S_thread_freelist_mutex);
|
||||||
thread_record* __tr = static_cast<thread_record*>(__freelist_pos);
|
_Thread_record* __tr = static_cast<_Thread_record*>(__freelist_pos);
|
||||||
__tr->next = _S_thread_freelist_first;
|
__tr->_M_next = _S_thread_freelist_first;
|
||||||
_S_thread_freelist_first = __tr;
|
_S_thread_freelist_first = __tr;
|
||||||
__gthread_mutex_unlock(&_S_thread_freelist_mutex);
|
__gthread_mutex_unlock(&_S_thread_freelist_mutex);
|
||||||
}
|
}
|
||||||
|
@ -681,13 +677,13 @@ namespace __gnu_cxx
|
||||||
bool __mt_alloc<_Tp>::_S_init = false;
|
bool __mt_alloc<_Tp>::_S_init = false;
|
||||||
|
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
typename __mt_alloc<_Tp>::tune __mt_alloc<_Tp>::_S_options;
|
typename __mt_alloc<_Tp>::_Tune __mt_alloc<_Tp>::_S_options;
|
||||||
|
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
typename __mt_alloc<_Tp>::binmap_type* __mt_alloc<_Tp>::_S_binmap;
|
typename __mt_alloc<_Tp>::_Binmap_type* __mt_alloc<_Tp>::_S_binmap;
|
||||||
|
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
typename __mt_alloc<_Tp>::bin_record* volatile __mt_alloc<_Tp>::_S_bin;
|
typename __mt_alloc<_Tp>::_Bin_record* volatile __mt_alloc<_Tp>::_S_bin;
|
||||||
|
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
size_t __mt_alloc<_Tp>::_S_bin_size = 1;
|
size_t __mt_alloc<_Tp>::_S_bin_size = 1;
|
||||||
|
@ -698,7 +694,7 @@ namespace __gnu_cxx
|
||||||
__gthread_once_t __mt_alloc<_Tp>::_S_once = __GTHREAD_ONCE_INIT;
|
__gthread_once_t __mt_alloc<_Tp>::_S_once = __GTHREAD_ONCE_INIT;
|
||||||
|
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
typename __mt_alloc<_Tp>::thread_record*
|
typename __mt_alloc<_Tp>::_Thread_record*
|
||||||
volatile __mt_alloc<_Tp>::_S_thread_freelist_first = NULL;
|
volatile __mt_alloc<_Tp>::_S_thread_freelist_first = NULL;
|
||||||
|
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
|
|
Loading…
Reference in New Issue