diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj
index b512202edd..63c2bd51ef 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj
+++ b/Builds/VisualStudio2015/RippleD.vcxproj
@@ -2546,12 +2546,6 @@
..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)
..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)
-
- True
- True
- ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)
- ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)
-
@@ -2560,8 +2554,6 @@
-
-
diff --git a/Builds/VisualStudio2015/RippleD.vcxproj.filters b/Builds/VisualStudio2015/RippleD.vcxproj.filters
index fab7841dde..14d053373c 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2015/RippleD.vcxproj.filters
@@ -3228,9 +3228,6 @@
ripple\nodestore\impl
-
- ripple\nodestore\impl
-
ripple\nodestore\impl
@@ -3243,9 +3240,6 @@
ripple\nodestore
-
- ripple\nodestore
-
ripple\nodestore
diff --git a/src/ripple/nodestore/ScopedMetrics.h b/src/ripple/nodestore/ScopedMetrics.h
deleted file mode 100644
index 0d5631a2e5..0000000000
--- a/src/ripple/nodestore/ScopedMetrics.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//------------------------------------------------------------------------------
-/*
- This file is part of rippled: https://github.com/ripple/rippled
- Copyright (c) 2012, 2013 Ripple Labs Inc.
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_NODESTORE_SCOPEDMETRICS_H_INCLUDED
-#define RIPPLE_NODESTORE_SCOPEDMETRICS_H_INCLUDED
-
-#include
-
-namespace ripple {
-namespace NodeStore {
-
-/** RAII observer to track NodeStore fetches made by the calling thread. */
-class ScopedMetrics
-{
-private:
- ScopedMetrics* prev_;
-
-public:
- ScopedMetrics ();
- ~ScopedMetrics ();
-
- static
- ScopedMetrics*
- get ();
-
- static
- void
- incrementThreadFetches ();
-
- std::size_t fetches = 0;
-};
-
-}
-}
-
-#endif
diff --git a/src/ripple/nodestore/impl/DatabaseImp.h b/src/ripple/nodestore/impl/DatabaseImp.h
index 2e586c7554..361747e668 100644
--- a/src/ripple/nodestore/impl/DatabaseImp.h
+++ b/src/ripple/nodestore/impl/DatabaseImp.h
@@ -30,7 +30,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -160,8 +159,6 @@ public:
std::shared_ptr fetch (uint256 const& hash) override
{
- ScopedMetrics::incrementThreadFetches ();
-
return doTimedFetch (hash, false);
}
diff --git a/src/ripple/nodestore/impl/ScopedMetrics.cpp b/src/ripple/nodestore/impl/ScopedMetrics.cpp
deleted file mode 100644
index 939ad65357..0000000000
--- a/src/ripple/nodestore/impl/ScopedMetrics.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-//------------------------------------------------------------------------------
-/*
- This file is part of rippled: https://github.com/ripple/rippled
- Copyright (c) 2012, 2013 Ripple Labs Inc.
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#include
-#include
-
-namespace ripple {
-namespace NodeStore {
-
-static
-void
-cleanup (ScopedMetrics*)
-{
-}
-
-static
-boost::thread_specific_ptr scopedMetricsPtr (&cleanup);
-
-ScopedMetrics::ScopedMetrics () : prev_ (scopedMetricsPtr.get ())
-{
- scopedMetricsPtr.reset (this);
-}
-
-ScopedMetrics::~ScopedMetrics ()
-{
- scopedMetricsPtr.reset (prev_);
-}
-
-ScopedMetrics*
-ScopedMetrics::get ()
-{
- return scopedMetricsPtr.get ();
-}
-
-void
-ScopedMetrics::incrementThreadFetches ()
-{
- if (scopedMetricsPtr.get ())
- ++scopedMetricsPtr.get ()->fetches;
-}
-
-}
-}
diff --git a/src/ripple/rpc/Context.h b/src/ripple/rpc/Context.h
index 1f44b6037e..2dd918e66e 100644
--- a/src/ripple/rpc/Context.h
+++ b/src/ripple/rpc/Context.h
@@ -24,7 +24,6 @@
#include
#include
#include
-#include
#include
@@ -48,7 +47,6 @@ struct Context
Role role;
std::shared_ptr jobCoro;
InfoSub::pointer infoSub;
- NodeStore::ScopedMetrics metrics;
};
} // RPC
diff --git a/src/ripple/server/impl/ServerHandlerImp.cpp b/src/ripple/server/impl/ServerHandlerImp.cpp
index 927ab17ef5..6a9a251e1a 100644
--- a/src/ripple/server/impl/ServerHandlerImp.cpp
+++ b/src/ripple/server/impl/ServerHandlerImp.cpp
@@ -68,7 +68,6 @@ ServerHandlerImp::ServerHandlerImp (Application& app, Stoppable& parent,
{
auto const& group (cm.group ("rpc"));
rpc_requests_ = group->make_counter ("requests");
- rpc_io_ = group->make_event ("io");
rpc_size_ = group->make_event ("size");
rpc_time_ = group->make_event ("time");
}
@@ -365,8 +364,6 @@ ServerHandlerImp::processRequest (HTTP::Port const& port,
std::chrono::duration_cast (
std::chrono::high_resolution_clock::now () - start)));
++rpc_requests_;
- rpc_io_.notify (static_cast (
- context.metrics.fetches));
rpc_size_.notify (static_cast (
response.size ()));
diff --git a/src/ripple/server/impl/ServerHandlerImp.h b/src/ripple/server/impl/ServerHandlerImp.h
index a4dd3c3569..5c6b75c538 100644
--- a/src/ripple/server/impl/ServerHandlerImp.h
+++ b/src/ripple/server/impl/ServerHandlerImp.h
@@ -44,7 +44,6 @@ private:
Setup setup_;
JobQueue& m_jobQueue;
beast::insight::Counter rpc_requests_;
- beast::insight::Event rpc_io_;
beast::insight::Event rpc_size_;
beast::insight::Event rpc_time_;
diff --git a/src/ripple/unity/nodestore.cpp b/src/ripple/unity/nodestore.cpp
index aa57e1da8a..291f699536 100644
--- a/src/ripple/unity/nodestore.cpp
+++ b/src/ripple/unity/nodestore.cpp
@@ -35,7 +35,6 @@
#include
#include
#include
-#include
#include
#include
diff --git a/src/ripple/websocket/Handler.h b/src/ripple/websocket/Handler.h
index b69fce90d5..864ce0c548 100644
--- a/src/ripple/websocket/Handler.h
+++ b/src/ripple/websocket/Handler.h
@@ -73,7 +73,6 @@ public:
private:
Application& app_;
beast::insight::Counter rpc_requests_;
- beast::insight::Event rpc_io_;
beast::insight::Event rpc_size_;
beast::insight::Event rpc_time_;
ServerDescription desc_;
@@ -95,7 +94,6 @@ public:
{
auto const& group (desc_.collectorManager.group ("rpc"));
rpc_requests_ = group->make_counter ("requests");
- rpc_io_ = group->make_event ("io");
rpc_size_ = group->make_event ("size");
rpc_time_ = group->make_event ("time");
}
@@ -483,12 +481,6 @@ public:
"connectivity is working.