2004-09-01 Benjamin Kosnik <bkoz@redhat.com>

	PR libstdc++/16614
	* include/ext/mt_allocator.h (__mt_base): Not type dependent,
	split into..
	(__pool): New, specialize.
	(__common_pool): New, static bits here.
	(__per_type_pool): New, and here.
	(__mt_alloc_base): New.
	(__mt_alloc): Add template parameter, inherit from it.
	* src/allocator.cc: Split this...
	* src/allocator-inst.cc: And this...
	* src/pool_allocator.cc: ...into this.
	* src/mt_allocator.cc: ... and this. Add definitions for
	__mt_base.
	* src/Makefile.am (sources): Split allocator.cc to
	pool_allocator.cc and mt_allocator.cc.
	* src/Makefile.in: Regenerate.
	* config/linker-map.gnu: Add symbols.
	* docs/html/ext/mt_allocator.html: Document new design.
	* testsuite/ext/mt_allocator/tune-1.cc: New.
	* testsuite/ext/mt_allocator/tune-2.cc: New.
	* testsuite/ext/mt_allocator/tune-3.cc: New.
	* testsuite/ext/mt_allocator/tune-4.cc: New.

	* testsuite/testsuite_allocator.h (__gnu_test::check_new): New.
	* testsuite/ext/allocators.cc: Use check_new, split into...
	* testsuite/ext/mt_allocator/check_new.cc: this.
	* testsuite/ext/pool_allocator/check_new.cc: this.
	* testsuite/ext/malloc_allocator/check_new.cc: this.
	* testsuite/ext/debug_allocator/check_new.cc: this.
	* testsuite/ext/mt_allocator/instantiate.cc: this.
	* testsuite/ext/pool_allocator/instantiate.cc: this.
	* testsuite/ext/malloc_allocator/instantiate.cc: this.
	* testsuite/ext/debug_allocator/instantiate.cc: this.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86936 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 440 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/check_new.cc b/libstdc++-v3/testsuite/ext/mt_allocator/check_new.cc
new file mode 100644
index 00000000000..9e088214602
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/check_new.cc
@@ -0,0 +1,54 @@
+// 2001-11-25  Phil Edwards  <pme@gcc.gnu.org>
+//
+// Copyright (C) 2001, 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
+// 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.
+
+// 20.4.1.1 allocator members
+
+#include <cstdlib>
+#include <ext/mt_allocator.h>
+#include <testsuite_allocator.h>
+
+using __gnu_cxx::__mt_alloc;
+
+void* 
+operator new(std::size_t n) throw(std::bad_alloc)
+{
+  new_called = true;
+  requested = n;
+  return std::malloc(n);
+}
+
+void
+operator delete(void *v) throw()
+{
+  delete_called = true;
+  return std::free(v);
+}
+
+bool test03() 
+{ 
+  typedef __mt_alloc<unsigned int> allocator_type;
+  return (__gnu_test::check_new<allocator_type, true>() == true); 
+}
+
+int main()
+{
+  return test03();
+}
+
diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/instantiate.cc b/libstdc++-v3/testsuite/ext/mt_allocator/instantiate.cc
new file mode 100644
index 00000000000..8e16b92df39
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/instantiate.cc
@@ -0,0 +1,28 @@
+// { dg-do compile }
+
+// 2001-11-25  Phil Edwards  <pme@gcc.gnu.org>
+//
+// Copyright (C) 2001, 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
+// 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.
+
+// 20.4.1.1 allocator members
+
+#include <cstdlib>
+#include <ext/mt_allocator.h>
+
+template class __gnu_cxx::__mt_alloc<int>;
diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/tune-1.cc b/libstdc++-v3/testsuite/ext/mt_allocator/tune-1.cc
new file mode 100644
index 00000000000..d5769fce026
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/tune-1.cc
@@ -0,0 +1,69 @@
+// 2004-08-25 Benjamin Kosnik <bkoz@redhat.com>
+//
+// 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.
+
+#include <cassert>
+#include <memory>
+#include <ext/mt_allocator.h>
+
+struct pod
+{
+  int i;
+};
+
+// Tune characteristics. 
+// __common_pool_policy
+void test01()
+{
+  typedef pod value_type;
+#ifdef __GTHREADS
+  typedef __gnu_cxx::__common_pool_policy<true> policy_type;
+#else
+  typedef __gnu_cxx::__common_pool_policy<false> policy_type;
+#endif
+  typedef __gnu_cxx::__mt_alloc<value_type, policy_type> allocator_type;
+  typedef __gnu_cxx::__pool_base::_Tune tune_type;
+
+  tune_type t_default;
+  tune_type t_opt(16, 5120, 32, 5120, 20, 10, false);
+  tune_type t_single(16, 5120, 32, 5120, 1, 10, false);
+
+  allocator_type a;
+  tune_type t1 = a._M_get_options();  
+  assert(t1._M_align == t_default._M_align);
+  a._M_set_options(t_opt);
+  tune_type t2 = a._M_get_options();  
+  assert(t1._M_align != t2._M_align);
+
+  allocator_type::pointer p1 = a.allocate(128);
+  allocator_type::pointer p2 = a.allocate(5128);
+  a._M_set_options(t_single);
+  t1 = a._M_get_options();  
+  assert(t1._M_max_threads != t_single._M_max_threads);
+  assert(t1._M_max_threads == t_opt._M_max_threads);
+
+  a.deallocate(p1, 128);
+  a.deallocate(p2, 5128);
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc b/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc
new file mode 100644
index 00000000000..72860694205
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/tune-2.cc
@@ -0,0 +1,71 @@
+// 2004-08-25 Benjamin Kosnik <bkoz@redhat.com>
+//
+// 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.
+
+#include <cassert>
+#include <memory>
+#include <ext/mt_allocator.h>
+
+struct pod
+{
+  int i;
+};
+
+// Tune characteristics. 
+// __per_type_pool_policy
+void test02()
+{
+  typedef pod value_type;
+#ifdef __GTHREADS
+  typedef __gnu_cxx::__per_type_pool_policy<value_type, true> policy_type;
+#else
+  typedef __gnu_cxx::__per_type_pool_policy<value_type, false> policy_type;
+#endif
+  typedef __gnu_cxx::__mt_alloc<value_type, policy_type> allocator_type;
+  typedef __gnu_cxx::__pool_base::_Tune tune_type;
+
+  tune_type t_default;
+  tune_type t_opt(16, 5120, 32, 5120, 20, 10, false);
+  tune_type t_single(16, 5120, 32, 5120, 1, 10, false);
+
+  allocator_type a;
+  tune_type t1 = a._M_get_options();  
+  assert(t1._M_align == t_default._M_align);
+  a._M_set_options(t_opt);
+  tune_type t2 = a._M_get_options();  
+  assert(t1._M_align != t2._M_align);
+
+  allocator_type::pointer p1 = a.allocate(128);
+  allocator_type::pointer p2 = a.allocate(5128);
+  a._M_set_options(t_single);
+  t1 = a._M_get_options();  
+  assert(t1._M_max_threads != t_single._M_max_threads);
+  assert(t1._M_max_threads == t_opt._M_max_threads);
+
+  a.deallocate(p1, 128);
+  a.deallocate(p2, 5128);
+}
+
+
+int main()
+{
+  test02();
+
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/tune-3.cc b/libstdc++-v3/testsuite/ext/mt_allocator/tune-3.cc
new file mode 100644
index 00000000000..aeb732f1156
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/tune-3.cc
@@ -0,0 +1,100 @@
+// 2004-08-25 Benjamin Kosnik <bkoz@redhat.com>
+//
+// 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.
+
+#include <cassert>
+#include <memory>
+#include <ext/mt_allocator.h>
+
+struct pod
+{
+  int i;
+};
+
+// Tune characteristics, two of same type
+template<typename _Tp>
+struct test_policy
+{ static bool per_type() { return true; } };
+
+template<bool _Thread>
+struct test_policy<__gnu_cxx::__common_pool_policy<_Thread> >
+{ 
+  typedef __gnu_cxx::__common_pool_policy<_Thread> pool_type;
+  static bool per_type() { return false; } 
+};
+
+// Tune characteristics, two of different types
+template<typename _Tp, typename _Cp>
+void test03()
+{
+  typedef __gnu_cxx::__pool_base::_Tune tune_type;
+  typedef _Tp value_type;
+  typedef _Cp policy_type;
+  typedef __gnu_cxx::__mt_alloc<value_type, policy_type> allocator_type;
+
+  tune_type t_default;
+  tune_type t_opt(16, 5120, 32, 5120, 20, 10, false);
+  tune_type t_single(16, 5120, 32, 5120, 1, 10, false);
+
+  // First instances assured.
+  allocator_type a;
+  tune_type t1 = a._M_get_options();
+  tune_type t2;
+  if (test_policy<policy_type>::per_type())
+    {
+      assert(t1._M_align == t_default._M_align);
+      a._M_set_options(t_opt);
+      t2 = a._M_get_options();  
+      assert(t1._M_align != t2._M_align);
+    }
+  else
+    t2 = t1;
+
+
+  // Lock tune settings.
+  typename allocator_type::pointer p1 = a.allocate(128);
+
+  allocator_type a2;
+  tune_type t3 = a2._M_get_options();  
+  tune_type t4;
+  assert(t3._M_max_threads == t2._M_max_threads);
+
+  typename allocator_type::pointer p2 = a2.allocate(5128);
+
+  a2._M_set_options(t_single);
+  t4 = a2._M_get_options();  
+  assert(t4._M_max_threads != t_single._M_max_threads);
+  assert(t4._M_max_threads == t3._M_max_threads);
+
+  a.deallocate(p1, 128);
+  a2.deallocate(p2, 5128);
+}
+
+int main()
+{
+#ifdef __GTHREADS
+  test03<int, __gnu_cxx::__per_type_pool_policy<int, true> >();
+  test03<int, __gnu_cxx::__common_pool_policy<true> >();
+#endif
+
+  test03<int, __gnu_cxx::__common_pool_policy<false> >();
+  test03<int, __gnu_cxx::__per_type_pool_policy<int, false> >();
+
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/mt_allocator/tune-4.cc b/libstdc++-v3/testsuite/ext/mt_allocator/tune-4.cc
new file mode 100644
index 00000000000..b85de24e561
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/mt_allocator/tune-4.cc
@@ -0,0 +1,118 @@
+// 2004-08-25 Benjamin Kosnik <bkoz@redhat.com>
+//
+// 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.
+
+#include <cassert>
+#include <memory>
+#include <ext/mt_allocator.h>
+
+struct pod
+{
+  int i;
+};
+
+// Tune characteristics, two of same type
+template<typename _Tp>
+struct test_policy
+{ static bool per_type() { return true; } };
+
+template<bool _Thread>
+struct test_policy<__gnu_cxx::__common_pool_policy<_Thread> >
+{ 
+  typedef __gnu_cxx::__common_pool_policy<_Thread> pool_type;
+  static bool per_type() { return false; } 
+};
+
+struct pod2
+{
+  int i;
+  int j;
+};
+
+// Tune characteristics, two of different instantiations
+template<typename _Tp, typename _Cp>
+void test04()
+{
+  typedef __gnu_cxx::__pool_base::_Tune tune_type;
+  typedef _Tp value_type;
+  typedef _Cp policy_type;
+
+  typedef __gnu_cxx::__mt_alloc<value_type, policy_type> allocator_type;
+  tune_type t_default;
+  tune_type t_opt(16, 5120, 32, 5120, 20, 10, false);
+  tune_type t_single(16, 5120, 32, 5120, 1, 10, false);
+
+  allocator_type a;
+  tune_type t1 = a._M_get_options();
+  tune_type t2;
+  if (test_policy<policy_type>::per_type())
+    {
+      assert(t1._M_align == t_default._M_align);
+      a._M_set_options(t_opt);
+      t2 = a._M_get_options();  
+      assert(t1._M_align != t2._M_align);
+    }
+  else
+    t2 = t1;
+
+  // Lock tune settings.
+  typename allocator_type::pointer p1 = a.allocate(128);
+
+  // First instance of local type assured.
+  typedef pod2 value2_type;
+  typedef typename allocator_type::template rebind<value2_type>::other rebind_type;
+
+  rebind_type a2;
+  tune_type t3 = a2._M_get_options();  
+  tune_type t4;
+
+  // Both policy_type and rebind_type::policy_type have same characteristics.
+  if (test_policy<policy_type>::per_type())
+    {
+      assert(t3._M_align == t_default._M_align);
+      a2._M_set_options(t_opt);
+      t4 = a2._M_get_options();  
+      assert(t3._M_align != t4._M_align);
+      t3 = t4;
+    }
+  else
+    assert(t3._M_max_threads == t2._M_max_threads);
+
+  typename rebind_type::pointer p2 = a2.allocate(5128);
+
+  a2._M_set_options(t_single);
+  t4 = a2._M_get_options();  
+  assert(t4._M_max_threads != t_single._M_max_threads);
+  assert(t4._M_max_threads == t3._M_max_threads);
+
+  a.deallocate(p1, 128);
+  a2.deallocate(p2, 5128);
+}
+
+int main()
+{
+#ifdef __GTHREADS
+  test04<float, __gnu_cxx::__common_pool_policy<true> >();
+  test04<double, __gnu_cxx::__per_type_pool_policy<double, true> >();
+#endif
+  test04<float, __gnu_cxx::__common_pool_policy<false> >();
+  test04<double, __gnu_cxx::__per_type_pool_policy<double, false> >();
+
+  return 0;
+}