diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fd7289aacfb64d0de95bf8a9d3e3cd44b60b9ce0..b5658d510b419264b193bf34533970f069a5e7e5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-22 Paolo Carlini <pcarlini@suse.de>
+
+ PR libstdc++/26132
+ * include/tr1/hashtable (hashtable<>::rehash): Define.
+ * testsuite/tr1/6_containers/unordered/hashtable/26132.cc: New.
+
+ * include/tr1/hashtable: Trivial formatting and stylistic fixes.
+
+ * testsuite/tr1/headers.cc: remove <tr1/hashtable>, not a tr1 header,
+ only an implementation detail.
+
2006-02-22 Paolo Carlini <pcarlini@suse.de>
* include/debug/list (splice): Remove splice_alloc check, redundant
diff --git a/libstdc++-v3/include/tr1/hashtable b/libstdc++-v3/include/tr1/hashtable
index ac3658f0148a85708aef5e52984c967783e9d109..7092e3cf39d66753fc3f41a5d94e27ef588a16d8 100644
--- a/libstdc++-v3/include/tr1/hashtable
+++ b/libstdc++-v3/include/tr1/hashtable
@@ -1132,6 +1132,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
{
return static_cast<float>(size()) / static_cast<float>(bucket_count());
}
+
// max_load_factor, if present, comes from rehash_base.
// Generalization of max_load_factor. Extension, not found in TR1. Only
@@ -1226,7 +1227,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
clear();
public:
- // Set number of buckets to be apropriate for container of n element.
+ // Set number of buckets to be appropriate for container of n element.
void rehash(size_type n);
private:
@@ -1306,7 +1307,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
// We allocate one extra bucket to hold a sentinel, an arbitrary
// non-null pointer. Iterator increment relies on this.
node** p = alloc.allocate(n + 1);
- std::fill(p, p+n, (node*) 0);
+ std::fill(p, p + n, (node*) 0);
p[n] = reinterpret_cast<node*>(0x1000);
return p;
}
@@ -1320,7 +1321,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
m_deallocate_buckets(node** p, size_type n)
{
bucket_allocator_t alloc(m_node_allocator);
- alloc.deallocate(p, n+1);
+ alloc.deallocate(p, n + 1);
}
template<typename K, typename V,
@@ -1356,11 +1357,11 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
const Eq& eq, const Ex& exk,
const allocator_type& a)
: Internal::rehash_base<RP, hashtable>(),
- Internal::hash_code_base<K, V, Ex, Eq, H1, H2, H, c> (exk, eq,
- h1, h2, h),
+ Internal::hash_code_base<K, V, Ex, Eq, H1, H2, H, c>(exk, eq,
+ h1, h2, h),
Internal::map_base<K, V, Ex, u, hashtable>(),
m_node_allocator(a),
- m_bucket_count (0),
+ m_bucket_count(0),
m_element_count(0),
m_rehash_policy()
{
@@ -1396,10 +1397,10 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
m_element_count(ht.m_element_count),
m_rehash_policy(ht.m_rehash_policy)
{
- m_buckets = m_allocate_buckets (m_bucket_count);
+ m_buckets = m_allocate_buckets(m_bucket_count);
try
{
- for (size_t i = 0; i < ht.m_bucket_count; ++i)
+ for (size_type i = 0; i < ht.m_bucket_count; ++i)
{
node* n = ht.m_buckets[i];
node** tail = m_buckets + i;
@@ -1415,7 +1416,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
catch(...)
{
clear();
- m_deallocate_buckets (m_buckets, m_bucket_count);
+ m_deallocate_buckets(m_buckets, m_bucket_count);
__throw_exception_again;
}
}
@@ -1520,7 +1521,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
{
typename hashtable::hash_code_t code = this->m_hash_code(k);
std::size_t n = this->bucket_index(k, code, this->bucket_count());
- size_t result = 0;
+ std::size_t result = 0;
for (node* p = m_buckets[n]; p; p = p->m_next)
if (this->compare(k, code, p))
++result;
@@ -1541,7 +1542,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
typename hashtable::hash_code_t code = this->m_hash_code(k);
std::size_t n = this->bucket_index(k, code, this->bucket_count());
node** head = m_buckets + n;
- node* p = find_node (*head, k, code);
+ node* p = find_node(*head, k, code);
if (p)
{
@@ -1604,7 +1605,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
find_node(node* p, const key_type& k,
typename hashtable::hash_code_t code) const
{
- for (; p ; p = p->m_next)
+ for (; p; p = p->m_next)
if (this->compare(k, code, p))
return p;
return false;
@@ -1622,12 +1623,12 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
{
const key_type& k = this->m_extract(v);
typename hashtable::hash_code_t code = this->m_hash_code(k);
- size_type n = this->bucket_index(k, code, m_bucket_count);
+ std::size_t n = this->bucket_index(k, code, m_bucket_count);
if (node* p = find_node(m_buckets[n], k, code))
return std::make_pair(iterator(p, m_buckets + n), false);
- std::pair<bool, size_t> do_rehash
+ std::pair<bool, std::size_t> do_rehash
= m_rehash_policy.need_rehash(m_bucket_count, m_element_count, 1);
// Allocate the new node before doing the rehash so that we don't
@@ -1671,7 +1672,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
const key_type& k = this->m_extract(v);
typename hashtable::hash_code_t code = this->m_hash_code(k);
- size_type n = this->bucket_index(k, code, m_bucket_count);
+ std::size_t n = this->bucket_index(k, code, m_bucket_count);
node* new_node = m_allocate_node(v);
node* prev = find_node(m_buckets[n], k, code);
@@ -1727,7 +1728,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
hashtable<K, V, A, Ex, Eq, H1, H2, H, RP, c, ci, u>::
insert(InIter first, InIter last)
{
- size_type n_elt = Internal::distance_fw (first, last);
+ size_type n_elt = Internal::distance_fw(first, last);
std::pair<bool, std::size_t> do_rehash
= m_rehash_policy.need_rehash(m_bucket_count, m_element_count, n_elt);
if (do_rehash.first)
@@ -1774,7 +1775,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
erase(const key_type& k)
{
typename hashtable::hash_code_t code = this->m_hash_code(k);
- size_type n = this->bucket_index(k, code, m_bucket_count);
+ std::size_t n = this->bucket_index(k, code, m_bucket_count);
size_type result = 0;
node** slot = m_buckets + n;
@@ -1783,9 +1784,9 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
while (*slot && this->compare(k, code, *slot))
{
- node* n = *slot;
- *slot = n->m_next;
- m_deallocate_node(n);
+ node* p = *slot;
+ *slot = p->m_next;
+ m_deallocate_node(p);
--m_element_count;
++result;
}
@@ -1833,6 +1834,19 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
m_deallocate_nodes(m_buckets, m_bucket_count);
m_element_count = 0;
}
+
+ template<typename K, typename V,
+ typename A, typename Ex, typename Eq,
+ typename H1, typename H2, typename H, typename RP,
+ bool c, bool ci, bool u>
+ void
+ hashtable<K, V, A, Ex, Eq, H1, H2, H, RP, c, ci, u>::
+ rehash(size_type n)
+ {
+ m_rehash(std::max(m_rehash_policy.next_bkt(n),
+ m_rehash_policy.bkt_for_elements(m_element_count
+ + 1)));
+ }
template<typename K, typename V,
typename A, typename Ex, typename Eq,
@@ -1840,31 +1854,31 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
bool c, bool ci, bool u>
void
hashtable<K, V, A, Ex, Eq, H1, H2, H, RP, c, ci, u>::
- m_rehash(size_type N)
+ m_rehash(size_type n)
{
- node** new_array = m_allocate_buckets(N);
+ node** new_array = m_allocate_buckets(n);
try
{
for (size_type i = 0; i < m_bucket_count; ++i)
while (node* p = m_buckets[i])
{
- size_type new_index = this->bucket_index(p, N);
+ std::size_t new_index = this->bucket_index(p, n);
m_buckets[i] = p->m_next;
p->m_next = new_array[new_index];
new_array[new_index] = p;
}
m_deallocate_buckets(m_buckets, m_bucket_count);
- m_bucket_count = N;
+ m_bucket_count = n;
m_buckets = new_array;
}
- catch (...)
+ catch(...)
{
// A failure here means that a hash function threw an exception.
// We can't restore the previous state without calling the hash
// function again, so the only sensible recovery is to delete
// everything.
- m_deallocate_nodes(new_array, N);
- m_deallocate_buckets(new_array, N);
+ m_deallocate_nodes(new_array, n);
+ m_deallocate_buckets(new_array, n);
m_deallocate_nodes(m_buckets, m_bucket_count);
m_element_count = 0;
__throw_exception_again;
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/26132.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/26132.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9d0076e96988227c69d4a25b28ed0a0e8c7a19ce
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/26132.cc
@@ -0,0 +1,58 @@
+// 2006-02-22 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2006 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 6.3 Unordered associative containers
+
+#include <tr1/unordered_set>
+#include <testsuite_hooks.h>
+
+// libstdc++/26132
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+
+ for (float lf = 1.0; lf < 101.0; lf *= 10.0)
+ for (int size = 1; size <= 6561; size *= 3)
+ {
+ std::tr1::unordered_set<int> us1;
+ typedef std::tr1::unordered_set<int>::size_type size_type;
+
+ us1.max_load_factor(10.0);
+
+ for (int i = 0; i < size; ++i)
+ us1.insert(i);
+
+ us1.max_load_factor(lf);
+
+ for (int i = 1; i <= 6561; i *= 81)
+ {
+ const size_type n = size * 81 / i;
+ us1.rehash(n);
+ VERIFY( us1.bucket_count() > us1.size() / us1.max_load_factor() );
+ VERIFY( us1.bucket_count() >= n );
+ }
+ }
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
diff --git a/libstdc++-v3/testsuite/tr1/headers.cc b/libstdc++-v3/testsuite/tr1/headers.cc
index 765abae1829e00f47379ff112cc6112e085cc95b..4be96e020b771ef38a8e84cb575e80d342916f06 100644
--- a/libstdc++-v3/testsuite/tr1/headers.cc
+++ b/libstdc++-v3/testsuite/tr1/headers.cc
@@ -39,7 +39,6 @@
#include <tr1/fenv.h>
#include <tr1/float.h>
#include <tr1/functional>
-#include <tr1/hashtable>
#include <tr1/inttypes.h>
#include <tr1/limits.h>
#include <tr1/math.h>