OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

debug_allocator.h: _M_extra now stands for the number of extra objects instead of the number of... 

2004-02-04  Dhruv Matani  <dhruvbird@gmx.net>

	* include/ext/debug_allocator.h: _M_extra now stands for the
	number of extra objects instead of the number of extra bytes.
	(debug_allocator::allocate): Adjust.
	(debug_allocator::deallocate): Adjust.

	* include/ext/pool_allocator.h: Fix typo.

From-SVN: r77256
This commit is contained in:
Dhruv Matani 2004-02-04 17:37:10 +00:00 committed by Benjamin Kosnik
parent 7bdff56f69
commit 56766e0db5
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2004-02-04 Dhruv Matani <dhruvbird@gmx.net>
* include/ext/debug_allocator.h: _M_extra now stands for the
number of extra objects instead of the number of extra bytes.
(debug_allocator::allocate): Adjust.
(debug_allocator::deallocate): Adjust.
* include/ext/pool_allocator.h: Fix typo.
2004-02-03 Felix Yen <fwy@alumni.brown.edu>
Benjamin Kosnik <bkoz@redhat.com>

36
libstdc++-v3/include/ext/debug_allocator.h
View File

@ -1,6 +1,6 @@
// Allocators -*- C++ -*-
// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -48,7 +48,7 @@
#ifndef _DEBUG_ALLOCATOR_H
#define _DEBUG_ALLOCATOR_H 1
#include <memory>
#include <cstdlib>
namespace __gnu_cxx
{
@ -74,28 +74,42 @@ namespace __gnu_cxx
typedef typename _Alloc::value_type value_type;
private:
// Size of space used to store size. Note that this must be
// large enough to preserve alignment.
const size_t _M_extra;
// _M_extra is the number of objects that correspond to the
// extra space where debug information is stored.
size_type _M_extra;
_Alloc _M_allocator;
public:
debug_allocator() : _M_extra(8) { }
debug_allocator()
{
const size_t __obj_size = sizeof(value_type);
_M_extra = (sizeof(size_type) + __obj_size - 1) / __obj_size;
}
pointer
allocate(size_type __n)
{
pointer __res = _M_allocator.allocate(__n + _M_extra);
size_type* __ps = reinterpret_cast<size_type*>(__res);
*__ps = __n;
return __res + _M_extra;
}
pointer
allocate(size_type __n, std::allocator<void>::const_pointer = 0)
allocate(size_type __n, const void* __hint)
{
pointer __result = _M_allocator.allocate(__n + _M_extra);
*__result = __n;
return __result + _M_extra;
pointer __res = _M_allocator.allocate(__n + _M_extra, __hint);
size_type* __ps = reinterpret_cast<size_type*>(__res);
*__ps = __n;
return __res + _M_extra;
}
void
deallocate(pointer __p, size_type __n)
{
pointer __real_p = __p - _M_extra;
if (*__real_p != __n)
if (*reinterpret_cast<size_type*>(__real_p) != __n)
abort();
_M_allocator.deallocate(__real_p, __n + _M_extra);
}

2
libstdc++-v3/include/ext/pool_allocator.h
View File

@ -40,7 +40,7 @@
* purpose. It is provided "as is" without express or implied warranty.
*/
/** @file ext/debug_allocator.h
/** @file ext/pool_allocator.h
* This file is a GNU extension to the Standard C++ Library.
* You should only include this header if you are using GCC 3 or later.
*/