Attached patch applied.
2011-12-12 François Dumont <fdum...@gcc.gnu.org>
* include/profile/unordered_set: Minor formatting changes.
(unordered_set<>::_M_profile_destruct,
unordered_multiset<>::_M_profile_destruct): Fix implementation
to not
rely on normal implementation details anymore.
(unordered_set<>::_M_profile_resize,
unordered_multiset<>::_M_profile_resize): Implement consistently
accross all unordered containers.
(unordered_set<>::emplace, unordered_set<>::emplace_hint,
unordered_multiset<>::emplace,
unordered_multset<>::emplace_hint): Add
to signal rehash to profiling system.
* include/profile/unordered_map: Likewise for unordered_map<> and
unordered_multimap<>.
Thanks Paolo for the help on the ChangeLog, this is quite hard sometimes
to find the correct level of details.
François
Index: include/profile/unordered_map
===================================================================
--- include/profile/unordered_map (revision 182173)
+++ include/profile/unordered_map (working copy)
@@ -171,6 +171,28 @@
_Base::clear();
}
+ template<typename... _Args>
+ std::pair<iterator, bool>
+ emplace(_Args&&... __args)
+ {
+ size_type __old_size = _Base::bucket_count();
+ std::pair<iterator, bool> __res
+ = _Base::emplace(std::forward<_Args>(__args)...);
+ _M_profile_resize(__old_size);
+ return __res;
+ }
+
+ template<typename... _Args>
+ iterator
+ emplace_hint(const_iterator __it, _Args&&... __args)
+ {
+ size_type __old_size = _Base::bucket_count();
+ iterator __res
+ = _Base::emplace_hint(__it, std::forward<_Args>(__args)...);
+ _M_profile_resize(__old_size);
+ return __res;
+ }
+
void
insert(std::initializer_list<value_type> __l)
{
@@ -182,7 +204,7 @@
std::pair<iterator, bool>
insert(const value_type& __obj)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
std::pair<iterator, bool> __res = _Base::insert(__obj);
_M_profile_resize(__old_size);
return __res;
@@ -203,7 +225,7 @@
std::pair<iterator, bool>
insert(_Pair&& __obj)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
std::pair<iterator, bool> __res
= _Base::insert(std::forward<_Pair>(__obj));
_M_profile_resize(__old_size);
@@ -243,7 +265,7 @@
mapped_type&
operator[](const _Key& __k)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
mapped_type& __res = _M_base()[__k];
_M_profile_resize(__old_size);
return __res;
@@ -252,7 +274,7 @@
mapped_type&
operator[](_Key&& __k)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
mapped_type& __res = _M_base()[std::move(__k)];
_M_profile_resize(__old_size);
return __res;
@@ -264,9 +286,9 @@
void rehash(size_type __n)
{
- size_type __old_size = _Base::bucket_count();
- _Base::rehash(__n);
- _M_profile_resize(__old_size);
+ size_type __old_size = _Base::bucket_count();
+ _Base::rehash(__n);
+ _M_profile_resize(__old_size);
}
private:
@@ -274,33 +296,33 @@
_M_profile_resize(size_type __old_size)
{
size_type __new_size = _Base::bucket_count();
- if (__old_size != __new_size)
+ if (__old_size != __new_size)
__profcxx_hashtable_resize(this, __old_size, __new_size);
}
void
_M_profile_destruct()
{
- size_type __hops = 0, __lc = 0, __chain = 0;
- for (iterator __it = _M_base().begin(); __it != _M_base().end();
- ++__it)
+ size_type __hops = 0, __lc = 0, __chain = 0;
+ iterator __it = this->begin();
+ while (__it != this->end())
{
- while (__it._M_cur_node->_M_next)
- {
- ++__chain;
- ++__it;
- }
+ size_type __bkt = this->bucket(__it->first);
+ for (++__it; __it != this->end()
+ && this->bucket(__it->first) == __bkt;
+ ++__it)
+ ++__chain;
if (__chain)
{
++__chain;
- __lc = __lc > __chain ? __lc : __chain;
+ __lc = __lc > __chain ? __lc : __chain;
__hops += __chain * (__chain - 1) / 2;
__chain = 0;
}
}
- __profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
+ __profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
}
- };
+ };
template<typename _Key, typename _Tp, typename _Hash,
typename _Pred, typename _Alloc>
@@ -429,12 +451,6 @@
_M_profile_destruct();
}
- _Base&
- _M_base() noexcept { return *this; }
-
- const _Base&
- _M_base() const noexcept { return *this; }
-
void
clear() noexcept
{
@@ -444,20 +460,42 @@
_Base::clear();
}
+ template<typename... _Args>
+ iterator
+ emplace(_Args&&... __args)
+ {
+ size_type __old_size = _Base::bucket_count();
+ iterator __res
+ = _Base::emplace(std::forward<_Args>(__args)...);
+ _M_profile_resize(__old_size);
+ return __res;
+ }
+
+ template<typename... _Args>
+ iterator
+ emplace_hint(const_iterator __it, _Args&&... __args)
+ {
+ size_type __old_size = _Base::bucket_count();
+ iterator __res
+ = _Base::emplace_hint(__it, std::forward<_Args>(__args)...);
+ _M_profile_resize(__old_size);
+ return __res;
+ }
+
void
insert(std::initializer_list<value_type> __l)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
_Base::insert(__l);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
iterator
insert(const value_type& __obj)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
iterator __res = _Base::insert(__obj);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -466,7 +504,7 @@
{
size_type __old_size = _Base::bucket_count();
iterator __res = _Base::insert(__iter, __v);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -476,9 +514,9 @@
iterator
insert(_Pair&& __obj)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
iterator __res = _Base::insert(std::forward<_Pair>(__obj));
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -490,7 +528,7 @@
{
size_type __old_size = _Base::bucket_count();
iterator __res = _Base::insert(__iter, std::forward<_Pair>(__v));
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -500,7 +538,7 @@
{
size_type __old_size = _Base::bucket_count();
_Base::insert(__first, __last);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
void
@@ -508,7 +546,7 @@
{
size_type __old_size = _Base::bucket_count();
_Base::insert(__first, __last);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
void
@@ -517,15 +555,16 @@
void rehash(size_type __n)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
_Base::rehash(__n);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
private:
void
- _M_profile_resize(size_type __old_size, size_type __new_size)
+ _M_profile_resize(size_type __old_size)
{
+ size_type __new_size = _Base::bucket_count();
if (__old_size != __new_size)
__profcxx_hashtable_resize(this, __old_size, __new_size);
}
@@ -533,15 +572,15 @@
void
_M_profile_destruct()
{
- size_type __hops = 0, __lc = 0, __chain = 0;
- for (iterator __it = _M_base().begin(); __it != _M_base().end();
- ++__it)
+ size_type __hops = 0, __lc = 0, __chain = 0;
+ iterator __it = this->begin();
+ while (__it != this->end())
{
- while (__it._M_cur_node->_M_next)
- {
- ++__chain;
- ++__it;
- }
+ size_type __bkt = this->bucket(__it->first);
+ for (++__it; __it != this->end()
+ && this->bucket(__it->first) == __bkt;
+ ++__it)
+ ++__chain;
if (__chain)
{
++__chain;
@@ -550,11 +589,10 @@
__chain = 0;
}
}
- __profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
+ __profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
}
+ };
- };
-
template<typename _Key, typename _Tp, typename _Hash,
typename _Pred, typename _Alloc>
inline void
Index: include/profile/unordered_set
===================================================================
--- include/profile/unordered_set (revision 182173)
+++ include/profile/unordered_set (working copy)
@@ -170,12 +170,34 @@
_Base::clear();
}
+ template<typename... _Args>
+ std::pair<iterator, bool>
+ emplace(_Args&&... __args)
+ {
+ size_type __old_size = _Base::bucket_count();
+ std::pair<iterator, bool> __res
+ = _Base::emplace(std::forward<_Args>(__args)...);
+ _M_profile_resize(__old_size);
+ return __res;
+ }
+
+ template<typename... _Args>
+ iterator
+ emplace_hint(const_iterator __it, _Args&&... __args)
+ {
+ size_type __old_size = _Base::bucket_count();
+ iterator __res
+ = _Base::emplace_hint(__it, std::forward<_Args>(__args)...);
+ _M_profile_resize(__old_size);
+ return __res;
+ }
+
void
insert(std::initializer_list<value_type> __l)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
_Base::insert(__l);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
std::pair<iterator, bool>
@@ -183,7 +205,7 @@
{
size_type __old_size = _Base::bucket_count();
std::pair<iterator, bool> __res = _Base::insert(__obj);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -192,7 +214,7 @@
{
size_type __old_size = _Base::bucket_count();
iterator __res = _Base::insert(__iter, __v);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -201,7 +223,7 @@
{
size_type __old_size = _Base::bucket_count();
std::pair<iterator, bool> __res = _Base::insert(std::move(__obj));
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -210,7 +232,7 @@
{
size_type __old_size = _Base::bucket_count();
iterator __res = _Base::insert(__iter, std::move(__v));
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -220,7 +242,7 @@
{
size_type __old_size = _Base::bucket_count();
_Base::insert(__first, __last);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
void
@@ -228,56 +250,49 @@
{
size_type __old_size = _Base::bucket_count();
_Base::insert(__first, __last);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
void rehash(size_type __n)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
_Base::rehash(__n);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
private:
- _Base&
- _M_base() noexcept { return *this; }
-
- const _Base&
- _M_base() const noexcept { return *this; }
-
void
- _M_profile_resize(size_type __old_size, size_type __new_size)
+ _M_profile_resize(size_type __old_size)
{
- if (__old_size != __new_size)
+ size_type __new_size = _Base::bucket_count();
+ if (__old_size != __new_size)
__profcxx_hashtable_resize(this, __old_size, __new_size);
}
void
_M_profile_destruct()
{
- size_type __hops = 0, __lc = 0, __chain = 0;
- for (iterator __it = _M_base().begin(); __it != _M_base().end();
- ++__it)
- {
- while (__it._M_cur_node->_M_next)
- {
+ size_type __hops = 0, __lc = 0, __chain = 0;
+ iterator __it = this->begin();
+ while (__it != this->end())
+ {
+ size_type __bkt = this->bucket(*__it);
+ for (++__it; __it != this->end() && this->bucket(*__it) == __bkt;
+ ++__it)
++__chain;
- ++__it;
- }
- if (__chain)
- {
- ++__chain;
- __lc = __lc > __chain ? __lc : __chain;
- __hops += __chain * (__chain - 1) / 2;
- __chain = 0;
- }
- }
- __profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
+ if (__chain)
+ {
+ ++__chain;
+ __lc = __lc > __chain ? __lc : __chain;
+ __hops += __chain * (__chain - 1) / 2;
+ __chain = 0;
+ }
+ }
+ __profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
}
+ };
- };
-
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
inline void
swap(unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
@@ -418,20 +433,41 @@
_Base::clear();
}
+ template<typename... _Args>
+ iterator
+ emplace(_Args&&... __args)
+ {
+ size_type __old_size = _Base::bucket_count();
+ iterator __res = _Base::emplace(std::forward<_Args>(__args)...);
+ _M_profile_resize(__old_size);
+ return __res;
+ }
+
+ template<typename... _Args>
+ iterator
+ emplace_hint(const_iterator __it, _Args&&... __args)
+ {
+ size_type __old_size = _Base::bucket_count();
+ iterator __res
+ = _Base::emplace_hint(__it, std::forward<_Args>(__args)...);
+ _M_profile_resize(__old_size);
+ return __res;
+ }
+
void
insert(std::initializer_list<value_type> __l)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
_Base::insert(__l);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
iterator
insert(const value_type& __obj)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
iterator __res = _Base::insert(__obj);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -440,16 +476,16 @@
{
size_type __old_size = _Base::bucket_count();
iterator __res = _Base::insert(__iter, __v);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
iterator
insert(value_type&& __obj)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
iterator __res = _Base::insert(std::move(__obj));
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -458,7 +494,7 @@
{
size_type __old_size = _Base::bucket_count();
iterator __res = _Base::insert(__iter, std::move(__v));
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
return __res;
}
@@ -468,7 +504,7 @@
{
size_type __old_size = _Base::bucket_count();
_Base::insert(__first, __last);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
void
@@ -476,26 +512,21 @@
{
size_type __old_size = _Base::bucket_count();
_Base::insert(__first, __last);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
void rehash(size_type __n)
{
- size_type __old_size = _Base::bucket_count();
+ size_type __old_size = _Base::bucket_count();
_Base::rehash(__n);
- _M_profile_resize(__old_size, _Base::bucket_count());
+ _M_profile_resize(__old_size);
}
private:
- _Base&
- _M_base() noexcept { return *this; }
-
- const _Base&
- _M_base() const noexcept { return *this; }
-
void
- _M_profile_resize(size_type __old_size, size_type __new_size)
+ _M_profile_resize(size_type __old_size)
{
+ size_type __new_size = _Base::bucket_count();
if (__old_size != __new_size)
__profcxx_hashtable_resize(this, __old_size, __new_size);
}
@@ -503,27 +534,25 @@
void
_M_profile_destruct()
{
- size_type __hops = 0, __lc = 0, __chain = 0;
- for (iterator __it = _M_base().begin(); __it != _M_base().end();
- ++__it)
- {
- while (__it._M_cur_node->_M_next)
- {
- ++__chain;
- ++__it;
- }
+ size_type __hops = 0, __lc = 0, __chain = 0;
+ iterator __it = this->begin();
+ while (__it != this->end())
+ {
+ size_type __bkt = this->bucket(*__it);
+ for (++__it; __it != this->end() && this->bucket(*__it) == __bkt;
+ ++__it)
+ ++__chain;
- if (__chain)
- {
- ++__chain;
- __lc = __lc > __chain ? __lc : __chain;
- __hops += __chain * (__chain - 1) / 2;
- __chain = 0;
- }
- }
- __profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
+ if (__chain)
+ {
+ ++__chain;
+ __lc = __lc > __chain ? __lc : __chain;
+ __hops += __chain * (__chain - 1) / 2;
+ __chain = 0;
+ }
+ }
+ __profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
}
-
};
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
