Patchwork Re: Export _Prime_rehash_policy symbols

login
register
mail settings
Submitter François Dumont
Date Feb. 1, 2013, 9:04 p.m.
Message ID <510C2DDD.2060908@gmail.com>
Download mbox | patch
Permalink /patch/217585/
State New
Headers show

Comments

François Dumont - Feb. 1, 2013, 9:04 p.m.
Test successful so attached patch applied.

2013-02-01  François Dumont <fdumont@gcc.gnu.org>

     * include/bits/hashtable_policy.h
     (_Prime_rehash_policy::_M_next_bkt)
     (_Prime_rehash_policy::_M_need_rehash): Move definition...
     * src/c++11/hashtable_c++0x.cc: ... here.
     * src/shared/hashtable-aux.cc: Remove c++config.h include.
     * config/abi/gnu.ver (GLIBCXX_3.4.18): Export _Prime_rehash_policy
     symbols.

François


On 01/30/2013 11:12 AM, Paolo Carlini wrote:
> ... before committing, please double check that we aren't breaking 
> |--enable-symvers=|gnu-versioned-namespace, wouldn't be the first time 
> that we do that and we notice only much later. At minimum build with 
> it and run the testsuite.
>
> Paolo.

Patch

Index: include/bits/hashtable_policy.h
===================================================================
--- include/bits/hashtable_policy.h	(revision 195557)
+++ include/bits/hashtable_policy.h	(working copy)
@@ -369,7 +369,8 @@ 
 
     // Return a bucket count appropriate for n elements
     std::size_t
-    _M_bkt_for_elements(std::size_t __n) const;
+    _M_bkt_for_elements(std::size_t __n) const
+    { return __builtin_ceil(__n / (long double)_M_max_load_factor); }
 
     // __n_bkt is current bucket count, __n_elt is current element count,
     // and __n_ins is number of elements to be inserted.  Do we need to
@@ -397,77 +398,6 @@ 
     mutable std::size_t  _M_next_resize;
   };
 
-  extern const unsigned long __prime_list[];
-
-  // XXX This is a hack.  There's no good reason for any of
-  // _Prime_rehash_policy's member functions to be inline.
-
-  // Return a prime no smaller than n.
-  inline std::size_t
-  _Prime_rehash_policy::
-  _M_next_bkt(std::size_t __n) const
-  {
-    // Optimize lookups involving the first elements of __prime_list.
-    // (useful to speed-up, eg, constructors)
-    static const unsigned char __fast_bkt[12]
-      = { 2, 2, 2, 3, 5, 5, 7, 7, 11, 11, 11, 11 };
-
-    if (__n <= 11)
-      {
-	_M_next_resize
-	  = __builtin_ceil(__fast_bkt[__n]
-			   * (long double)_M_max_load_factor);
-	return __fast_bkt[__n];
-      }
-
-    const unsigned long* __next_bkt
-      = std::lower_bound(__prime_list + 5, __prime_list + _S_n_primes,
-			 __n);
-    _M_next_resize
-      = __builtin_ceil(*__next_bkt * (long double)_M_max_load_factor);
-    return *__next_bkt;
-  }
-
-  // Return the smallest integer p such that alpha p >= n, where alpha
-  // is the load factor.
-  inline std::size_t
-  _Prime_rehash_policy::
-  _M_bkt_for_elements(std::size_t __n) const
-  { return __builtin_ceil(__n / (long double)_M_max_load_factor); }
-
-  // Finds the smallest prime p such that alpha p > __n_elt + __n_ins.
-  // If p > __n_bkt, return make_pair(true, p); otherwise return
-  // make_pair(false, 0).  In principle this isn't very different from
-  // _M_bkt_for_elements.
-
-  // The only tricky part is that we're caching the element count at
-  // which we need to rehash, so we don't have to do a floating-point
-  // multiply for every insertion.
-
-  inline std::pair<bool, std::size_t>
-  _Prime_rehash_policy::
-  _M_need_rehash(std::size_t __n_bkt, std::size_t __n_elt,
-		 std::size_t __n_ins) const
-  {
-    if (__n_elt + __n_ins >= _M_next_resize)
-      {
-	long double __min_bkts = (__n_elt + __n_ins)
-				 / (long double)_M_max_load_factor;
-	if (__min_bkts >= __n_bkt)
-	  return std::make_pair(true,
-	    _M_next_bkt(std::max<std::size_t>(__builtin_floor(__min_bkts) + 1,
-					      __n_bkt * _S_growth_factor)));
-	else
-	  {
-	    _M_next_resize
-	      = __builtin_floor(__n_bkt * (long double)_M_max_load_factor);
-	    return std::make_pair(false, 0);
-	  }
-      }
-    else
-      return std::make_pair(false, 0);
-  }
-
   // Base classes for std::_Hashtable.  We define these base classes
   // because in some cases we want to do different things depending on
   // the value of a policy class.  In some cases the policy class
Index: src/shared/hashtable-aux.cc
===================================================================
--- src/shared/hashtable-aux.cc	(revision 195557)
+++ src/shared/hashtable-aux.cc	(working copy)
@@ -1,6 +1,6 @@ 
 // std::__detail and std::tr1::__detail definitions -*- C++ -*-
 
-// Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
+// Copyright (C) 2007-2013 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
@@ -22,8 +22,6 @@ 
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include <bits/c++config.h>
-
 namespace __detail
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
Index: src/c++11/hashtable_c++0x.cc
===================================================================
--- src/c++11/hashtable_c++0x.cc	(revision 195557)
+++ src/c++11/hashtable_c++0x.cc	(working copy)
@@ -1,6 +1,6 @@ 
 // std::__detail definitions -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright (C) 2007-2013 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
@@ -22,13 +22,76 @@ 
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include <bits/c++config.h>
-
 #if __cplusplus < 201103L
 # error "hashtable_c++0x.cc must be compiled with -std=gnu++0x"
 #endif
 
+#include <initializer_list>
+#include <tuple>
+#include <bits/hashtable_policy.h>
+
 namespace std _GLIBCXX_VISIBILITY(default)
 {
 #include "../shared/hashtable-aux.cc"
-} // namespace // namespace std
+
+namespace __detail
+{
+  _GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  // Return a prime no smaller than n.
+  std::size_t
+  _Prime_rehash_policy::_M_next_bkt(std::size_t __n) const
+  {
+    // Optimize lookups involving the first elements of __prime_list.
+    // (useful to speed-up, eg, constructors)
+    static const unsigned char __fast_bkt[12]
+      = { 2, 2, 2, 3, 5, 5, 7, 7, 11, 11, 11, 11 };
+
+    if (__n <= 11)
+      {
+	_M_next_resize =
+	  __builtin_ceil(__fast_bkt[__n] * (long double)_M_max_load_factor);
+	return __fast_bkt[__n];
+      }
+
+    const unsigned long* __next_bkt =
+      std::lower_bound(__prime_list + 5, __prime_list + _S_n_primes, __n);
+    _M_next_resize =
+      __builtin_ceil(*__next_bkt * (long double)_M_max_load_factor);
+    return *__next_bkt;
+  }
+
+  // Finds the smallest prime p such that alpha p > __n_elt + __n_ins.
+  // If p > __n_bkt, return make_pair(true, p); otherwise return
+  // make_pair(false, 0).  In principle this isn't very different from
+  // _M_bkt_for_elements.
+
+  // The only tricky part is that we're caching the element count at
+  // which we need to rehash, so we don't have to do a floating-point
+  // multiply for every insertion.
+
+  std::pair<bool, std::size_t>
+  _Prime_rehash_policy::
+  _M_need_rehash(std::size_t __n_bkt, std::size_t __n_elt,
+		 std::size_t __n_ins) const
+  {
+    if (__n_elt + __n_ins >= _M_next_resize)
+      {
+	long double __min_bkts = (__n_elt + __n_ins)
+				   / (long double)_M_max_load_factor;
+	if (__min_bkts >= __n_bkt)
+	  return std::make_pair(true,
+	    _M_next_bkt(std::max<std::size_t>(__builtin_floor(__min_bkts) + 1,
+					      __n_bkt * _S_growth_factor)));
+
+	_M_next_resize
+	  = __builtin_floor(__n_bkt * (long double)_M_max_load_factor);
+	return std::make_pair(false, 0);
+      }
+    else
+      return std::make_pair(false, 0);
+  }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace __detail
+} // namespace std
Index: config/abi/pre/gnu.ver
===================================================================
--- config/abi/pre/gnu.ver	(revision 195557)
+++ config/abi/pre/gnu.ver	(working copy)
@@ -1,7 +1,6 @@ 
 ## Linker script for GNU versioning (GNU ld 2.13.91+ only.)
 ##
-## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-## 2011, 2012 Free Software Foundation, Inc.
+## Copyright (C) 2002-2013 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
@@ -1334,6 +1333,7 @@ 
     extern "C++"
     {
       std::random_device::*;
+      std::__detail::_Prime_rehash_policy::*;
     };
 
     # std::this_thread::__sleep_for