ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-19 10:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use aged containers in Validators module (RIPD-349)

Browse Source
This commit is contained in:
Scott Schurr
2014-08-06 14:24:42 -07:00
committed by Vinnie Falco
parent 97d87dff09
commit cb0e91c602
2 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
beast/container/detail/aged_ordered_container.h
View File

@@ -1503,8 +1503,8 @@ operator[] (Key const& key)
element* const p (new_element (
std::piecewise_construct, std::forward_as_tuple (key),
std::forward_as_tuple ()));
chronological.list.push_back (*p);
m_cont.insert_commit (*p, d);
chronological.list.push_back (*p);
return p->value.second;
}
return result.first->value.second;
@@ -1526,8 +1526,8 @@ operator[] (Key&& key)
std::piecewise_construct,
std::forward_as_tuple (std::move (key)),
std::forward_as_tuple ()));
chronological.list.push_back (*p);
m_cont.insert_commit (*p, d);
chronological.list.push_back (*p);
return p->value.second;
}
return result.first->value.second;
@@ -1564,8 +1564,8 @@ insert (value_type const& value) ->
if (result.second)
{
element* const p (new_element (value));
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return std::make_pair (iterator (iter), true);
}
return std::make_pair (iterator (result.first), false);
@@ -1605,8 +1605,8 @@ insert (value_type&& value) ->
if (result.second)
{
element* const p (new_element (std::move (value)));
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return std::make_pair (iterator (iter), true);
}
return std::make_pair (iterator (result.first), false);
@@ -1648,8 +1648,8 @@ insert (const_iterator hint, value_type const& value) ->
if (result.second)
{
element* const p (new_element (value));
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return iterator (iter);
}
return iterator (result.first);
@@ -1671,8 +1671,8 @@ insert (const_iterator hint, value_type&& value) ->
if (result.second)
{
element* const p (new_element (std::move (value)));
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return iterator (iter);
}
return iterator (result.first);
@@ -1697,8 +1697,8 @@ emplace (Args&&... args) ->
std::cref (m_config.key_compare()), d));
if (result.second)
{
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return std::make_pair (iterator (iter), true);
}
delete_element (p);
@@ -1743,8 +1743,8 @@ emplace_hint (const_iterator hint, Args&&... args) ->
extract (p->value), std::cref (m_config.key_compare()), d));
if (result.second)
{
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return std::make_pair (iterator (iter), true);
}
delete_element (p);

41
beast/container/detail/aged_unordered_container.h
View File

@@ -2057,8 +2057,8 @@ operator[] (Key const& key)
std::piecewise_construct,
std::forward_as_tuple (key),
std::forward_as_tuple ()));
chronological.list.push_back (*p);
m_cont.insert_commit (*p, d);
chronological.list.push_back (*p);
return p->value.second;
}
return result.first->value.second;
@@ -2083,8 +2083,8 @@ operator[] (Key&& key)
std::piecewise_construct,
std::forward_as_tuple (std::move (key)),
std::forward_as_tuple ()));
chronological.list.push_back (*p);
m_cont.insert_commit (*p, d);
chronological.list.push_back (*p);
return p->value.second;
}
return result.first->value.second;
@@ -2126,8 +2126,8 @@ insert (value_type const& value) ->
if (result.second)
{
element* const p (new_element (value));
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return std::make_pair (iterator (iter), true);
}
return std::make_pair (iterator (result.first), false);
@@ -2170,8 +2170,8 @@ insert (value_type&& value) ->
if (result.second)
{
element* const p (new_element (std::move (value)));
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return std::make_pair (iterator (iter), true);
}
return std::make_pair (iterator (result.first), false);
@@ -2195,6 +2195,32 @@ insert (value_type&& value) ->
return iterator (iter);
}
#if 1 // Use insert() instead of insert_check() insert_commit()
// set, map
template <bool IsMulti, bool IsMap, class Key, class T,
class Duration, class Hash, class KeyEqual, class Allocator>
template <bool maybe_multi, class... Args>
auto
aged_unordered_container <IsMulti, IsMap, Key, T, Duration,
Hash, KeyEqual, Allocator>::
emplace (Args&&... args) ->
typename std::enable_if <! maybe_multi,
std::pair <iterator, bool>>::type
{
maybe_rehash (1);
// VFALCO NOTE Its unfortunate that we need to
// construct element here
element* const p (new_element (std::forward <Args> (args)...));
auto const result (m_cont.insert (*p));
if (result.second)
{
chronological.list.push_back (*p);
return std::make_pair (iterator (result.first), true);
}
delete_element (p);
return std::make_pair (iterator (result.first), false);
}
#else // As original, use insert_check() / insert_commit () pair.
// set, map
template <bool IsMulti, bool IsMap, class Key, class T,
class Duration, class Hash, class KeyEqual, class Allocator>
@@ -2217,13 +2243,14 @@ emplace (Args&&... args) ->
std::cref (m_config.key_value_equal()), d));
if (result.second)
{
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return std::make_pair (iterator (iter), true);
}
delete_element (p);
return std::make_pair (iterator (result.first), false);
}
#endif // 0
// multiset, multimap
template <bool IsMulti, bool IsMap, class Key, class T,
@@ -2266,8 +2293,8 @@ emplace_hint (const_iterator /*hint*/, Args&&... args) ->
std::cref (m_config.key_value_equal()), d));
if (result.second)
{
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return std::make_pair (iterator (iter), true);
}
delete_element (p);
@@ -2458,8 +2485,8 @@ insert_unchecked (value_type const& value) ->
if (result.second)
{
element* const p (new_element (value));
chronological.list.push_back (*p);
auto const iter (m_cont.insert_commit (*p, d));
chronological.list.push_back (*p);
return std::make_pair (iterator (iter), true);
}
return std::make_pair (iterator (result.first), false);