Skip to content

R
riscv-gcc-1
Commit 29d4adf4 by Paolo Carlini Committed by Paolo Carlini
Options

acinclude.m4 (GLIBCXX_ENABLE_ALLOCATOR): Add pool_allocator. 

2004-03-22  Paolo Carlini  <pcarlini@suse.de>

	* acinclude.m4 (GLIBCXX_ENABLE_ALLOCATOR): Add pool_allocator.
	* configure: Regenerate.
	* config/allocator/pool_allocator_base.h: New.
	* include/ext/pool_allocator.h: Convert to a standard-conforming
	allocator.
	* src/allocator.cc: Tweak instantiations.
	* testsuite/performance/20_util/allocator/insert.cc: Add __pool_alloc.
	* testsuite/performance/20_util/allocator/insert_insert.cc: Ditto.
	* testsuite/performance/20_util/allocator/list_sort_search.cc: Ditto.
	* testsuite/performance/20_util/allocator/map_mt_find.cc: Ditto.
	* testsuite/performance/20_util/allocator/map_thread.cc: Ditto.
	* testsuite/performance/20_util/allocator/producer_consumer.cc: Ditto.

From-SVN: r79824
parent 1bbd65cd
Showing with 323 additions and 173 deletions
libstdc++-v3/ChangeLog
2004-03-22 Paolo Carlini <pcarlini@suse.de>
* acinclude.m4 (GLIBCXX_ENABLE_ALLOCATOR): Add pool_allocator.
* configure: Regenerate.
* config/allocator/pool_allocator_base.h: New.
* include/ext/pool_allocator.h: Convert to a standard-conforming
allocator.
* src/allocator.cc: Tweak instantiations.
* testsuite/performance/20_util/allocator/insert.cc: Add __pool_alloc.
* testsuite/performance/20_util/allocator/insert_insert.cc: Ditto.
* testsuite/performance/20_util/allocator/list_sort_search.cc: Ditto.
* testsuite/performance/20_util/allocator/map_mt_find.cc: Ditto.
* testsuite/performance/20_util/allocator/map_thread.cc: Ditto.
* testsuite/performance/20_util/allocator/producer_consumer.cc: Ditto.
2004-03-22 Hans-Peter Nilsson <hp@axis.com>
* config/cpu/cris/atomicity.h (__atomic_add): Remove "static
......
libstdc++-v3/acinclude.m4
......@@ -1183,7 +1183,7 @@ AC_DEFUN([GLIBCXX_ENABLE_ALLOCATOR], [
AC_MSG_CHECKING([for std::allocator base class to use])
GLIBCXX_ENABLE(libstdcxx-allocator,auto,[=KIND],
[use KIND for target std::allocator base],
[permit new|malloc|mt|bitmap|yes|no|auto])
[permit new|malloc|mt|bitmap|pool|yes|no|auto])
# If they didn't use this option switch, or if they specified --enable
# with no specific model, we'll have to look for one. If they
# specified --disable (???), do likewise.
......@@ -1224,6 +1224,10 @@ AC_DEFUN([GLIBCXX_ENABLE_ALLOCATOR], [
ALLOCATOR_H=config/allocator/new_allocator_base.h
ALLOCATOR_NAME=__gnu_cxx::new_allocator
;;
pool)
ALLOCATOR_H=config/allocator/pool_allocator_base.h
ALLOCATOR_NAME=__gnu_cxx::__pool_alloc
;;
esac
AC_SUBST(ALLOCATOR_H)
......
libstdc++-v3/config/allocator/pool_allocator_base.h 0 → 100644
// Base to std::allocator -*- C++ -*-
// Copyright (C) 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
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING. If not, write to the Free
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
// As a special exception, you may use this file as part of a free software
// library without restriction. Specifically, if other files instantiate
// templates or use macros or inline functions from this file, or you compile
// this file and link it with other files to produce an executable, this
// file does not by itself cause the resulting executable to be covered by
// the GNU General Public License. This exception does not however
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
#ifndef _CXX_ALLOCATOR_H
#define _CXX_ALLOCATOR_H 1
// Define new_allocator as the base class to std::allocator.
#include <ext/pool_allocator.h>
#define ___glibcxx_base_allocator __gnu_cxx::__pool_alloc
#endif
libstdc++-v3/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
libstdc++-v3/src/allocator.cc
......@@ -44,5 +44,6 @@ namespace __gnu_cxx
template class __mt_alloc<wchar_t>;
// Static members of __pool_alloc.
template class __pool_alloc<true, 0>;
template class __pool_alloc<char>;
template class __pool_alloc<wchar_t>;
} // namespace __gnu_cxx
libstdc++-v3/testsuite/performance/20_util/allocator/insert.cc
......@@ -44,6 +44,7 @@
#include <ext/new_allocator.h>
#include <ext/malloc_allocator.h>
#include <ext/bitmap_allocator.h>
#include <ext/pool_allocator.h>
#include <cxxabi.h>
#include <testsuite_performance.h>
......@@ -148,6 +149,7 @@ int main(void)
typedef __gnu_cxx::new_allocator<test_type> n_alloc_type;
typedef __gnu_cxx::__mt_alloc<test_type> so_alloc_type;
typedef __gnu_cxx::bitmap_allocator<test_type> bit_alloc_type;
typedef __gnu_cxx::__pool_alloc<test_type> po_alloc_type;
#ifdef TEST_B0
test_container(vector<test_type, m_alloc_type>());
......@@ -161,59 +163,74 @@ int main(void)
#ifdef TEST_B3
test_container(vector<test_type, bit_alloc_type>());
#endif
#ifdef TEST_B4
test_container(list<test_type, m_alloc_type>());
test_container(vector<test_type, po_alloc_type>());
#endif
#ifdef TEST_B5
test_container(list<test_type, n_alloc_type>());
test_container(list<test_type, m_alloc_type>());
#endif
#ifdef TEST_B6
test_container(list<test_type, so_alloc_type>());
test_container(list<test_type, n_alloc_type>());
#endif
#ifdef TEST_B7
test_container(list<test_type, so_alloc_type>());
#endif
#ifdef TEST_B8
test_container(list<test_type, bit_alloc_type>());
#endif
#ifdef TEST_B9
test_container(list<test_type, po_alloc_type>());
#endif
#ifdef TEST_B8
#ifdef TEST_B10
test_container(deque<test_type, m_alloc_type>());
#endif
#ifdef TEST_B9
#ifdef TEST_B11
test_container(deque<test_type, n_alloc_type>());
#endif
#ifdef TEST_B10
#ifdef TEST_B12
test_container(deque<test_type, so_alloc_type>());
#endif
#ifdef TEST_B11
#ifdef TEST_B13
test_container(deque<test_type, bit_alloc_type>());
#endif
#ifdef TEST_B14
test_container(deque<test_type, po_alloc_type>());
#endif
typedef less<test_type> compare_type;
#ifdef TEST_B12
#ifdef TEST_B15
test_container(map<test_type, test_type, compare_type, m_alloc_type>());
#endif
#ifdef TEST_B13
#ifdef TEST_B16
test_container(map<test_type, test_type, compare_type, n_alloc_type>());
#endif
#ifdef TEST_B14
#ifdef TEST_B17
test_container(map<test_type, test_type, compare_type, so_alloc_type>());
#endif
#ifdef TEST_B15
#ifdef TEST_B18
test_container(map<test_type, test_type, compare_type, bit_alloc_type>());
#endif
#ifdef TEST_B19
test_container(map<test_type, test_type, compare_type, po_alloc_type>());
#endif
#ifdef TEST_B16
#ifdef TEST_B20
test_container(set<test_type, compare_type, m_alloc_type>());
#endif
#ifdef TEST_B17
#ifdef TEST_B21
test_container(set<test_type, compare_type, n_alloc_type>());
#endif
#ifdef TEST_B18
#ifdef TEST_B22
test_container(set<test_type, compare_type, so_alloc_type>());
#endif
#ifdef TEST_B19
#ifdef TEST_B23
test_container(set<test_type, compare_type, bit_alloc_type>());
#endif
#ifdef TEST_B24
test_container(set<test_type, compare_type, po_alloc_type>());
#endif
#ifdef TEST_T0
test_container(vector<test_type, m_alloc_type>(), true);
......@@ -227,59 +244,73 @@ int main(void)
#ifdef TEST_T3
test_container(vector<test_type, bit_alloc_type>(), true);
#endif
#ifdef TEST_T4
test_container(list<test_type, m_alloc_type>(), true);
test_container(vector<test_type, po_alloc_type>(), true);
#endif
#ifdef TEST_T5
test_container(list<test_type, n_alloc_type>(), true);
test_container(list<test_type, m_alloc_type>(), true);
#endif
#ifdef TEST_T6
test_container(list<test_type, so_alloc_type>(), true);
test_container(list<test_type, n_alloc_type>(), true);
#endif
#ifdef TEST_T7
test_container(list<test_type, so_alloc_type>(), true);
#endif
#ifdef TEST_T8
test_container(list<test_type, bit_alloc_type>(), true);
#endif
#ifdef TEST_T9
test_container(list<test_type, po_alloc_type>(), true);
#endif
#ifdef TEST_T8
#ifdef TEST_T10
test_container(deque<test_type, m_alloc_type>(), true);
#endif
#ifdef TEST_T9
#ifdef TEST_T11
test_container(deque<test_type, n_alloc_type>(), true);
#endif
#ifdef TEST_T10
#ifdef TEST_T12
test_container(deque<test_type, so_alloc_type>(), true);
#endif
#ifdef TEST_T11
#ifdef TEST_T13
test_container(deque<test_type, bit_alloc_type>(), true);
#endif
#ifdef TEST_T14
test_container(deque<test_type, po_alloc_type>(), true);
#endif
typedef less<test_type> compare_type;
#ifdef TEST_T12
#ifdef TEST_T15
test_container(map<test_type, test_type, compare_type, m_alloc_type>(), true);
#endif
#ifdef TEST_T13
#ifdef TEST_T16
test_container(map<test_type, test_type, compare_type, n_alloc_type>(), true);
#endif
#ifdef TEST_T14
#ifdef TEST_T17
test_container(map<test_type, test_type, compare_type, so_alloc_type>(), true);
#endif
#ifdef TEST_T15
#ifdef TEST_T18
test_container(map<test_type, test_type, compare_type, bit_alloc_type>(), true);
#endif
#ifdef TEST_T19
test_container(map<test_type, test_type, compare_type, po_alloc_type>(), true);
#endif
#ifdef TEST_T16
#ifdef TEST_T20
test_container(set<test_type, compare_type, m_alloc_type>(), true);
#endif
#ifdef TEST_T17
#ifdef TEST_T21
test_container(set<test_type, compare_type, n_alloc_type>(), true);
#endif
#ifdef TEST_T18
#ifdef TEST_T22
test_container(set<test_type, compare_type, so_alloc_type>(), true);
#endif
#ifdef TEST_T19
#ifdef TEST_T23
test_container(set<test_type, compare_type, bit_alloc_type>(), true);
#endif
#ifdef TEST_T24
test_container(set<test_type, compare_type, po_alloc_type>(), true);
#endif
return 0;
}
libstdc++-v3/testsuite/performance/20_util/allocator/insert_insert.cc
......@@ -44,6 +44,7 @@
#include <ext/new_allocator.h>
#include <ext/malloc_allocator.h>
#include <ext/bitmap_allocator.h>
#include <ext/pool_allocator.h>
#include <cxxabi.h>
#include <testsuite_performance.h>
......@@ -119,6 +120,7 @@ int main(void)
typedef __gnu_cxx::new_allocator<test_type> n_alloc_type;
typedef __gnu_cxx::__mt_alloc<test_type> so_alloc_type;
typedef __gnu_cxx::bitmap_allocator<test_type> bit_alloc_type;
typedef __gnu_cxx::__pool_alloc<test_type> po_alloc_type;
#ifdef TEST_S0
test_container(vector<test_type, m_alloc_type>());
......@@ -132,62 +134,73 @@ int main(void)
#ifdef TEST_S3
test_container(vector<test_type, bit_alloc_type>());
#endif
#ifdef TEST_S4
test_container(list<test_type, m_alloc_type>());
test_container(vector<test_type, po_alloc_type>());
#endif
#ifdef TEST_S5
test_container(list<test_type, n_alloc_type>());
test_container(list<test_type, m_alloc_type>());
#endif
#ifdef TEST_S6
test_container(list<test_type, so_alloc_type>());
test_container(list<test_type, n_alloc_type>());
#endif
#ifdef TEST_S7
test_container(list<test_type, so_alloc_type>());
#endif
#ifdef TEST_S8
test_container(list<test_type, bit_alloc_type>());
#endif
#ifdef TEST_S9
test_container(list<test_type, po_alloc_type>());
#endif
#ifdef TEST_S8
#ifdef TEST_S10
test_container(deque<test_type, m_alloc_type>());
#endif
#ifdef TEST_S9
#ifdef TEST_S11
test_container(deque<test_type, n_alloc_type>());
#endif
#ifdef TEST_S10
#ifdef TEST_S12
test_container(deque<test_type, so_alloc_type>());
#endif
#ifdef TEST_S11
#ifdef TEST_S13
test_container(deque<test_type, bit_alloc_type>());
#endif
#ifdef TEST_S14
test_container(deque<test_type, po_alloc_type>());
#endif
typedef less<test_type> compare_type;
#ifdef TEST_S12
#ifdef TEST_S15
test_container(map<test_type, test_type, compare_type, m_alloc_type>());
#endif
#ifdef TEST_S13
#ifdef TEST_S16
test_container(map<test_type, test_type, compare_type, n_alloc_type>());
#endif
#ifdef TEST_S14
#ifdef TEST_S17
test_container(map<test_type, test_type, compare_type, so_alloc_type>());
#endif
#ifdef TEST_S15
#ifdef TEST_S18
test_container(map<test_type, test_type, compare_type, bit_alloc_type>());
#endif
#ifdef TEST_S19
test_container(map<test_type, test_type, compare_type, po_alloc_type>());
#endif
#ifdef TEST_S12
#ifdef TEST_S20
test_container(set<test_type, compare_type, m_alloc_type>());
#endif
#ifdef TEST_S13
#ifdef TEST_S21
test_container(set<test_type, compare_type, n_alloc_type>());
#endif
#ifdef TEST_S14
#ifdef TEST_S22
test_container(set<test_type, compare_type, so_alloc_type>());
#endif
#ifdef TEST_S14
#ifdef TEST_S23
test_container(set<test_type, compare_type, bit_alloc_type>());
#endif
#ifdef TEST_S24
test_container(set<test_type, compare_type, po_alloc_type>());
#endif
return 0;
}
libstdc++-v3/testsuite/performance/20_util/allocator/list_sort_search.cc
......@@ -34,11 +34,13 @@
#include <cxxabi.h>
#include <testsuite_performance.h>
#include <ext/bitmap_allocator.h>
#include <ext/pool_allocator.h>
using namespace std;
using __gnu_cxx::malloc_allocator;
using __gnu_cxx::__mt_alloc;
using __gnu_cxx::bitmap_allocator;
using __gnu_cxx::__pool_alloc;
typedef int test_type;
......@@ -105,7 +107,6 @@ void do_test ()
report_performance(__FILE__, string(), time, resource);
}
int main ()
{
#ifdef TEST_S0
......@@ -120,6 +121,9 @@ int main ()
#ifdef TEST_S3
do_test<__mt_alloc<int> >();
#endif
#ifdef TEST_S4
do_test<__pool_alloc<int> >();
#endif
}
libstdc++-v3/testsuite/performance/20_util/allocator/map_mt_find.cc
......@@ -40,11 +40,13 @@
#include <cxxabi.h>
#include <testsuite_performance.h>
#include <ext/bitmap_allocator.h>
#include <ext/pool_allocator.h>
using namespace std;
using __gnu_cxx::malloc_allocator;
using __gnu_cxx::__mt_alloc;
using __gnu_cxx::bitmap_allocator;
using __gnu_cxx::__pool_alloc;
typedef int test_type;
......@@ -145,4 +147,7 @@ int main()
#ifdef TEST_T3
exec_tests<__mt_alloc<int> >();
#endif
#ifdef TEST_T4
exec_tests<__pool_alloc<int> >();
#endif
}
libstdc++-v3/testsuite/performance/20_util/allocator/map_thread.cc
......@@ -41,6 +41,7 @@
#include <ext/new_allocator.h>
#include <ext/malloc_allocator.h>
#include <ext/bitmap_allocator.h>
#include <ext/pool_allocator.h>
#include <cxxabi.h>
#include <testsuite_performance.h>
......@@ -49,6 +50,7 @@ using __gnu_cxx::__mt_alloc;
using __gnu_cxx::new_allocator;
using __gnu_cxx::malloc_allocator;
using __gnu_cxx::bitmap_allocator;
using __gnu_cxx::__pool_alloc;
// The number of iterations to be performed.
int iterations = 10000;
......@@ -125,7 +127,8 @@ int main(void)
#ifdef TEST_T5
test_container(map<int, int, less<const int>, bitmap_allocator<int> >());
#endif
#ifdef TEST_T6
test_container(map<int, int, less<const int>, __pool_alloc<int> >());
#endif
return 0;
}
libstdc++-v3/testsuite/performance/20_util/allocator/producer_consumer.cc
......@@ -42,6 +42,7 @@
#include <ext/new_allocator.h>
#include <ext/malloc_allocator.h>
#include <ext/bitmap_allocator.h>
#include <ext/pool_allocator.h>
#include <cxxabi.h>
#include <testsuite_performance.h>
......@@ -51,6 +52,7 @@ using __gnu_cxx::__mt_alloc;
using __gnu_cxx::new_allocator;
using __gnu_cxx::malloc_allocator;
using __gnu_cxx::bitmap_allocator;
using __gnu_cxx::__pool_alloc;
using abi::__cxa_demangle;
typedef int test_type;
......@@ -59,6 +61,7 @@ typedef malloc_allocator<test_type> malloc_alloc_type;
typedef new_allocator<test_type> new_alloc_type;
typedef __mt_alloc<test_type> so_alloc_type;
typedef bitmap_allocator<test_type> bit_alloc_type;
typedef __pool_alloc<test_type> po_alloc_type;
// The number of iterations to be performed.
int iterations = 10000;
......@@ -298,35 +301,41 @@ int main(void)
#ifdef TEST_T4
test_container(vector<test_type, bit_alloc_type>());
#endif
#ifdef TEST_T5
test_container(list<test_type, malloc_alloc_type>());
test_container(vector<test_type, po_alloc_type>());
#endif
#ifdef TEST_T6
test_container(list<test_type, new_alloc_type>());
test_container(list<test_type, malloc_alloc_type>());
#endif
#ifdef TEST_T7
test_container(list<test_type, so_alloc_type>());
test_container(list<test_type, new_alloc_type>());
#endif
#ifdef TEST_T8
test_container(list<test_type, so_alloc_type>());
#endif
#ifdef TEST_T9
test_container(list<test_type, bit_alloc_type>());
#endif
#ifdef TEST_T10
test_container(list<test_type, po_alloc_type>());
#endif
#ifdef TEST_T9
#ifdef TEST_T11
test_container(map<test_type, test_type, compare_type, malloc_alloc_type>());
#endif
#ifdef TEST_T10
#ifdef TEST_T12
test_container(map<test_type, test_type, compare_type, new_alloc_type>());
#endif
#ifdef TEST_T11
#ifdef TEST_T13
test_container(map<test_type, test_type, compare_type, so_alloc_type>());
#endif
#ifdef TEST_T12
#ifdef TEST_T14
test_container(map<test_type, test_type, compare_type, bit_alloc_type>());
#endif
#ifdef TEST_T15
test_container(map<test_type, test_type, compare_type, po_alloc_type>());
#endif
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment