ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add CachedLedger:

Browse Source 
This type alias provide cache-wrapping for Ledger objects.
Through the CachedLedger interface, access to the underlying
Ledger is permitted to allow for cases where the implementation
must perform Ledger specific activities. For example, building
a fetch pack from the contained SHAMap objects.

The CachingReadView is refactored:

* Renamed to CachedView
* Templated on Base, the base type
* base() returns a shared_ptr to the wrapped object
* Constructor requires a shared_ptr<Base>
This commit is contained in:
Vinnie Falco
2015-07-15 14:58:08 -07:00
parent fad9998f9d
commit 110bbf3956
8 changed files with 85 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Builds/VisualStudio2013/RippleD.vcxproj
View File

@@ -2303,7 +2303,7 @@
</ClInclude>
<ClInclude Include="..\..\src\ripple\ledger\CachedSLEs.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\ledger\CachingReadView.h">
<ClInclude Include="..\..\src\ripple\ledger\CachedView.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\ledger\detail\ApplyStateTable.h">
</ClInclude>
@@ -2333,7 +2333,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\ledger\impl\CachingReadView.cpp">
<ClCompile Include="..\..\src\ripple\ledger\impl\CachedView.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>

4
Builds/VisualStudio2013/RippleD.vcxproj.filters
View File

@@ -3030,7 +3030,7 @@
<ClInclude Include="..\..\src\ripple\ledger\CachedSLEs.h">
<Filter>ripple\ledger</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\ledger\CachingReadView.h">
<ClInclude Include="..\..\src\ripple\ledger\CachedView.h">
<Filter>ripple\ledger</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\ledger\detail\ApplyStateTable.h">
@@ -3063,7 +3063,7 @@
<ClCompile Include="..\..\src\ripple\ledger\impl\CachedSLEs.cpp">
<Filter>ripple\ledger\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\ledger\impl\CachingReadView.cpp">
<ClCompile Include="..\..\src\ripple\ledger\impl\CachedView.cpp">
<Filter>ripple\ledger\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\ledger\impl\Directory.cpp">

4
src/ripple/app/ledger/Ledger.h
View File

@@ -22,6 +22,7 @@
#include <ripple/ledger/TxMeta.h>
#include <ripple/ledger/View.h>
#include <ripple/ledger/CachedView.h>
#include <ripple/app/tx/Transaction.h>
#include <ripple/basics/CountedObject.h>
#include <ripple/protocol/Indexes.h>
@@ -412,6 +413,9 @@ private:
std::uint32_t mutable mReserveIncrement = 0;
};
/** A ledger wrapped in a CachedView. */
using CachedLedger = CachedView<Ledger>;
//------------------------------------------------------------------------------
//
// API

2
src/ripple/app/ledger/OpenLedger.h
View File

@@ -68,7 +68,7 @@ public:
@param ledger A closed ledger
*/
explicit
OpenLedger (std::shared_ptr<
OpenLedger(std::shared_ptr<
Ledger const> const& ledger,
Config const& config, CachedSLEs& cache,
beast::Journal journal);

12
src/ripple/app/ledger/impl/OpenLedger.cpp
View File

@@ -20,13 +20,13 @@
#include <BeastConfig.h>
#include <ripple/app/ledger/OpenLedger.h>
#include <ripple/app/tx/apply.h>
#include <ripple/ledger/CachingReadView.h>
#include <ripple/ledger/CachedView.h>
#include <boost/range/adaptor/transformed.hpp>
namespace ripple {
OpenLedger::OpenLedger(
std::shared_ptr<Ledger const> const& ledger,
OpenLedger::OpenLedger(std::shared_ptr<
Ledger const> const& ledger,
Config const& config, CachedSLEs& cache,
beast::Journal journal)
: j_ (journal)
@@ -65,7 +65,7 @@ OpenLedger::modify (std::function<
}
void
OpenLedger::accept (std::shared_ptr<
OpenLedger::accept(std::shared_ptr<
Ledger const> const& ledger,
OrderedTxs const& locals, bool retriesFirst,
OrderedTxs& retries, ApplyFlags flags,
@@ -113,12 +113,12 @@ OpenLedger::accept (std::shared_ptr<
//------------------------------------------------------------------------------
std::shared_ptr<OpenView>
OpenLedger::create (std::shared_ptr<
OpenLedger::create(std::shared_ptr<
Ledger const> const& ledger)
{
return std::make_shared<OpenView>(
open_ledger, std::make_shared<
CachingReadView const>(ledger,
CachedLedger const>(ledger,
cache_));
}

109
src/ripple/ledger/CachingReadView.h → src/ripple/ledger/CachedView.h
View File

@@ -17,8 +17,8 @@
*/
//==============================================================================
#ifndef RIPPLE_LEDGER_CACHINGREADVIEW_H_INCLUDED
#define RIPPLE_LEDGER_CACHINGREADVIEW_H_INCLUDED
#ifndef RIPPLE_LEDGER_CACHEDVIEW_H_INCLUDED
#define RIPPLE_LEDGER_CACHEDVIEW_H_INCLUDED
#include <ripple/ledger/CachedSLEs.h>
#include <ripple/ledger/ReadView.h>
@@ -26,41 +26,39 @@
#include <map>
#include <memory>
#include <mutex>
#include <type_traits>
namespace ripple {
//------------------------------------------------------------------------------
namespace detail {
/** ReadView that caches by key and hash. */
class CachingReadView
: public ReadView
class CachedViewImpl
: public DigestAwareReadView
{
private:
DigestAwareReadView const& base_;
CachedSLEs& cache_;
std::mutex mutable mutex_;
DigestAwareReadView const& base_;
std::shared_ptr<void const> hold_;
std::unordered_map<key_type,
std::shared_ptr<SLE const>,
hardened_hash<>> mutable map_;
public:
CachingReadView() = delete;
CachingReadView (CachingReadView const&) = delete;
CachingReadView& operator= (CachingReadView const&) = delete;
CachedViewImpl() = delete;
CachedViewImpl (CachedViewImpl const&) = delete;
CachedViewImpl& operator= (CachedViewImpl const&) = delete;
CachingReadView(
DigestAwareReadView const* base,
CachedSLEs& cache,
std::shared_ptr<void const> hold);
CachingReadView (std::shared_ptr<
DigestAwareReadView const> const& base,
CachedViewImpl (DigestAwareReadView const* base,
CachedSLEs& cache)
: CachingReadView (&*base, cache, base)
: base_ (*base)
, cache_ (cache)
{
}
//
// ReadView
//
bool
exists (Keylet const& k) const override;
@@ -110,39 +108,58 @@ public:
return base_.txRead(key);
}
//
// DigestAwareReadView
//
boost::optional<digest_type>
digest (key_type const& key) const override
{
return base_.digest(key);
}
};
//------------------------------------------------------------------------------
} // detail
/** Wrap a DigestAwareReadView with a cache.
/** Wraps a DigestAwareReadView to provide caching.
Effects:
Returns ownership of a base ReadView that is
wrapped in a thread-safe cache.
The returned ReadView gains a reference to
the base.
Postconditions:
The base object will not be destroyed before
the returned view is destroyed.
The caller is responsible for ensuring that the
`cache` object lifetime extends to the lifetime of
the returned object.
@tparam Base A subclass of DigestAwareReadView
*/
inline
std::shared_ptr<ReadView const>
makeCached (std::shared_ptr<
DigestAwareReadView const> const& base,
CachedSLEs& cache)
template <class Base>
class CachedView
: public detail::CachedViewImpl
{
return std::make_shared<
CachingReadView const>(
&*base, cache, base);
}
private:
static_assert(std::is_base_of<
DigestAwareReadView, Base>::value, "");
std::shared_ptr<Base const> sp_;
public:
using base_type = Base;
CachedView() = delete;
CachedView (CachedView const&) = delete;
CachedView& operator= (CachedView const&) = delete;
CachedView (std::shared_ptr<
Base const> const& base, CachedSLEs& cache)
: CachedViewImpl (base.get(), cache)
, sp_ (base)
{
}
/** Returns the base type.
@note This breaks encapsulation and bypasses the cache.
*/
std::shared_ptr<Base const> const&
base() const
{
return sp_;
}
};
} // ripple

20
src/ripple/ledger/impl/CachingReadView.cpp → src/ripple/ledger/impl/CachedView.cpp
View File

@@ -18,30 +18,21 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/ledger/CachingReadView.h>
#include <ripple/ledger/CachedView.h>
#include <ripple/basics/contract.h>
#include <ripple/protocol/Serializer.h>
namespace ripple {
CachingReadView::CachingReadView(
DigestAwareReadView const* base,
CachedSLEs& cache,
std::shared_ptr<void const> hold)
: cache_ (cache)
, base_ (*base)
, hold_ (hold)
{
}
namespace detail {
bool
CachingReadView::exists (Keylet const& k) const
CachedViewImpl::exists (Keylet const& k) const
{
return read(k) != nullptr;
}
std::shared_ptr<SLE const>
CachingReadView::read (Keylet const& k) const
CachedViewImpl::read (Keylet const& k) const
{
{
std::lock_guard<
@@ -70,9 +61,10 @@ CachingReadView::read (Keylet const& k) const
return sle;
}
if (! k.check(*iter->second))
LogicError("CachingReadView::read: wrong type");
LogicError("CachedView::read: wrong type");
return iter->second;
}
} // detail
} // ripple

2
src/ripple/unity/ledger.cpp
View File

@@ -23,7 +23,7 @@
#include <ripple/ledger/impl/ApplyViewBase.cpp>
#include <ripple/ledger/impl/ApplyViewImpl.cpp>
#include <ripple/ledger/impl/CachedSLEs.cpp>
#include <ripple/ledger/impl/CachingReadView.cpp>
#include <ripple/ledger/impl/CachedView.cpp>
#include <ripple/ledger/impl/Directory.cpp>
#include <ripple/ledger/impl/OpenView.cpp>
#include <ripple/ledger/impl/PaymentSandbox.cpp>