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

Changes for beast logging

Browse Source
This commit is contained in:
Vinnie Falco
2016-05-18 16:07:52 -04:00
parent fa0ef25ffb
commit 3de738429f
14 changed files with 145 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Builds/VisualStudio2015/RippleD.vcxproj
View File

@@ -240,6 +240,8 @@
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\detail\const_container.hpp"> <ClInclude Include="..\..\src\beast\extras\beast\unit_test\detail\const_container.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\dstream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\global_suites.hpp"> <ClInclude Include="..\..\src\beast\extras\beast\unit_test\global_suites.hpp">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\match.hpp"> <ClInclude Include="..\..\src\beast\extras\beast\unit_test\match.hpp">
@@ -1895,6 +1897,8 @@
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\ripple\beast\utility\tagged_integer.h"> <ClInclude Include="..\..\src\ripple\beast\utility\tagged_integer.h">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\beast\utility\temp_dir.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\beast\utility\test\beast_Journal_test.cpp"> <ClCompile Include="..\..\src\ripple\beast\utility\test\beast_Journal_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>

6
Builds/VisualStudio2015/RippleD.vcxproj.filters
View File

@@ -543,6 +543,9 @@
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\detail\const_container.hpp"> <ClInclude Include="..\..\src\beast\extras\beast\unit_test\detail\const_container.hpp">
<Filter>extras\beast\unit_test\detail</Filter> <Filter>extras\beast\unit_test\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\dstream.hpp">
<Filter>extras\beast\unit_test</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\global_suites.hpp"> <ClInclude Include="..\..\src\beast\extras\beast\unit_test\global_suites.hpp">
<Filter>extras\beast\unit_test</Filter> <Filter>extras\beast\unit_test</Filter>
</ClInclude> </ClInclude>
@@ -2460,6 +2463,9 @@
<ClInclude Include="..\..\src\ripple\beast\utility\tagged_integer.h"> <ClInclude Include="..\..\src\ripple\beast\utility\tagged_integer.h">
<Filter>ripple\beast\utility</Filter> <Filter>ripple\beast\utility</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\beast\utility\temp_dir.h">
<Filter>ripple\beast\utility</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\beast\utility\test\beast_Journal_test.cpp"> <ClCompile Include="..\..\src\ripple\beast\utility\test\beast_Journal_test.cpp">
<Filter>ripple\beast\utility\test</Filter> <Filter>ripple\beast\utility\test</Filter>
</ClCompile> </ClCompile>

6
src/ripple/app/main/Main.cpp
View File

@@ -40,7 +40,7 @@
#include <ripple/beast/core/Time.h> #include <ripple/beast/core/Time.h>
#include <ripple/beast/unit_test.h> #include <ripple/beast/unit_test.h>
#include <ripple/beast/utility/Debug.h> #include <ripple/beast/utility/Debug.h>
#include <beast/unit_test/debug_ostream.hpp> #include <beast/unit_test/dstream.hpp>
#include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/common.h>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <cstdlib> #include <cstdlib>
@@ -201,8 +201,8 @@ static int runUnitTests(
std::string const& argument) std::string const& argument)
{ {
using namespace beast::unit_test; using namespace beast::unit_test;
beast::debug_ostream stream; beast::unit_test::dstream dlog;
reporter r (stream); reporter r(dlog);
r.arg(argument); r.arg(argument);
bool const failed (r.run_each_if ( bool const failed (r.run_each_if (
global_suites(), match_auto (pattern))); global_suites(), match_auto (pattern)));

6
src/ripple/beast/nudb/test/beast_nudb_callgrind_test.cpp
View File

@@ -18,7 +18,7 @@
//============================================================================== //==============================================================================
#include <ripple/beast/nudb/test/common.h> #include <ripple/beast/nudb/test/common.h>
#include <beast/core/detail/temp_dir.hpp> #include <ripple/beast/utility/temp_dir.h>
#include <ripple/beast/xor_shift_engine.h> #include <ripple/beast/xor_shift_engine.h>
#include <ripple/beast/unit_test.h> #include <ripple/beast/unit_test.h>
#include <cmath> #include <cmath>
@@ -96,9 +96,9 @@ public:
N = 100000 N = 100000
}; };
testcase (abort_on_fail); testcase (beast::unit_test::abort_on_fail);
beast::detail::temp_dir tempDir; beast::temp_dir tempDir;
do_test (N, tempDir.path()); do_test (N, tempDir.path());
} }
}; };

4
src/ripple/beast/nudb/test/beast_nudb_recover_test.cpp
View File

@@ -20,7 +20,7 @@
#include <ripple/beast/nudb/test/common.h> #include <ripple/beast/nudb/test/common.h>
#include <ripple/beast/xor_shift_engine.h> #include <ripple/beast/xor_shift_engine.h>
#include <ripple/beast/unit_test.h> #include <ripple/beast/unit_test.h>
#include <beast/core/detail/temp_dir.hpp> #include <ripple/beast/utility/temp_dir.h>
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>
#include <memory> #include <memory>
@@ -117,7 +117,7 @@ public:
{ {
testcase << count << " inserts"; testcase << count << " inserts";
beast::detail::temp_dir tempDir; beast::temp_dir tempDir;
auto const path = tempDir.path(); auto const path = tempDir.path();
for (std::size_t n = 1;;++n) for (std::size_t n = 1;;++n)

6
src/ripple/beast/nudb/test/beast_nudb_store_test.cpp
View File

@@ -18,7 +18,7 @@
//============================================================================== //==============================================================================
#include <ripple/beast/nudb/test/common.h> #include <ripple/beast/nudb/test/common.h>
#include <beast/core/detail/temp_dir.hpp> #include <ripple/beast/utility/temp_dir.h>
#include <ripple/beast/xor_shift_engine.h> #include <ripple/beast/xor_shift_engine.h>
#include <ripple/beast/unit_test.h> #include <ripple/beast/unit_test.h>
#include <cmath> #include <cmath>
@@ -43,8 +43,8 @@ public:
do_test (std::size_t N, do_test (std::size_t N,
std::size_t block_size, float load_factor) std::size_t block_size, float load_factor)
{ {
testcase (abort_on_fail); testcase (beast::unit_test::abort_on_fail);
beast::detail::temp_dir tempDir; beast::temp_dir tempDir;
auto const dp = tempDir.file ("nudb.dat"); auto const dp = tempDir.file ("nudb.dat");
auto const kp = tempDir.file ("nudb.key"); auto const kp = tempDir.file ("nudb.key");

4
src/ripple/beast/nudb/test/beast_nudb_verify_test.cpp
View File

@@ -242,7 +242,7 @@ public:
void void
run() override run() override
{ {
testcase(abort_on_fail) << "verify " << arg(); testcase(beast::unit_test::abort_on_fail) << "verify " << arg();
if (arg().empty()) if (arg().empty())
return fail("missing unit test argument"); return fail("missing unit test argument");
do_verify(arg()); do_verify(arg());
@@ -270,7 +270,7 @@ public:
void void
run() override run() override
{ {
testcase(abort_on_fail) << "verify_fast " << arg(); testcase(beast::unit_test::abort_on_fail) << "verify_fast " << arg();
if (arg().empty()) if (arg().empty())
return fail("missing unit test argument"); return fail("missing unit test argument");
do_verify(arg()); do_verify(arg());

60
src/ripple/beast/nudb/test/common.h
View File

@@ -209,47 +209,43 @@ num (T t)
return s2; return s2;
} }
template <class Log> inline
void void
print (Log log, print(std::ostream& log,
beast::nudb::verify_info const& info) beast::nudb::verify_info const& info)
{ {
log << "avg_fetch: " << std::fixed << std::setprecision(3) << log <<
info.avg_fetch; "avg_fetch: " << std::fixed << std::setprecision(3) << info.avg_fetch << '\n' <<
log << "waste: " << std::fixed << std::setprecision(3) << "waste: " << std::fixed << std::setprecision(3) << info.waste * 100 << "%\n" <<
info.waste * 100 << "%"; "overhead: " << std::fixed << std::setprecision(1) << info.overhead * 100 << "%\n" <<
log << "overhead: " << std::fixed << std::setprecision(1) << "actual_load: " << std::fixed << std::setprecision(0) << info.actual_load * 100 << "%\n" <<
info.overhead * 100 << "%"; "version: " << num(info.version) << '\n' <<
log << "actual_load: " << std::fixed << std::setprecision(0) << "uid: " << std::showbase << std::hex << info.uid << '\n' <<
info.actual_load * 100 << "%"; "appnum: " << info.appnum << '\n' <<
log << "version: " << num(info.version); "key_size: " << num(info.key_size) << '\n' <<
log << "uid: " << std::showbase << std::hex << info.uid; "salt: " << std::showbase << std::hex << info.salt << '\n' <<
log << "appnum: " << info.appnum; "pepper: " << std::showbase << std::hex << info.pepper << '\n' <<
log << "key_size: " << num(info.key_size); "block_size: " << num(info.block_size) << '\n' <<
log << "salt: " << std::showbase << std::hex << info.salt; "bucket_size: " << num(info.bucket_size) << '\n' <<
log << "pepper: " << std::showbase << std::hex << info.pepper; "load_factor: " << std::fixed << std::setprecision(0) << info.load_factor * 100 << "%\n" <<
log << "block_size: " << num(info.block_size); "capacity: " << num(info.capacity) << '\n' <<
log << "bucket_size: " << num(info.bucket_size); "buckets: " << num(info.buckets) << '\n' <<
log << "load_factor: " << std::fixed << std::setprecision(0) << "key_count: " << num(info.key_count) << '\n' <<
info.load_factor * 100 << "%"; "value_count: " << num(info.value_count) << '\n' <<
log << "capacity: " << num(info.capacity); "value_bytes: " << num(info.value_bytes) << '\n' <<
log << "buckets: " << num(info.buckets); "spill_count: " << num(info.spill_count) << '\n' <<
log << "key_count: " << num(info.key_count); "spill_count_tot: " << num(info.spill_count_tot) << '\n' <<
log << "value_count: " << num(info.value_count); "spill_bytes: " << num(info.spill_bytes) << '\n' <<
log << "value_bytes: " << num(info.value_bytes); "spill_bytes_tot: " << num(info.spill_bytes_tot) << '\n' <<
log << "spill_count: " << num(info.spill_count); "key_file_size: " << num(info.key_file_size) << '\n' <<
log << "spill_count_tot: " << num(info.spill_count_tot); "dat_file_size: " << num(info.dat_file_size) << std::endl;
log << "spill_bytes: " << num(info.spill_bytes);
log << "spill_bytes_tot: " << num(info.spill_bytes_tot);
log << "key_file_size: " << num(info.key_file_size);
log << "dat_file_size: " << num(info.dat_file_size);
std::string s; std::string s;
for (int i = 0; i < info.hist.size(); ++i) for (int i = 0; i < info.hist.size(); ++i)
s += (i==0) ? s += (i==0) ?
std::to_string(info.hist[i]) : std::to_string(info.hist[i]) :
(", " + std::to_string(info.hist[i])); (", " + std::to_string(info.hist[i]));
log << "hist: " << s; log << "hist: " << s << std::endl;
} }
} // test } // test

1
src/ripple/beast/unit_test.h
View File

@@ -21,7 +21,6 @@
#define BEAST_UNIT_TEST_H_INCLUDED #define BEAST_UNIT_TEST_H_INCLUDED
#include <beast/unit_test/amount.hpp> #include <beast/unit_test/amount.hpp>
#include <beast/unit_test/print.hpp>
#include <beast/unit_test/global_suites.hpp> #include <beast/unit_test/global_suites.hpp>
#include <beast/unit_test/match.hpp> #include <beast/unit_test/match.hpp>
#include <beast/unit_test/recorder.hpp> #include <beast/unit_test/recorder.hpp>

83
src/ripple/beast/utility/temp_dir.h Normal file
View File

@@ -0,0 +1,83 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 BEAST_UTILITY_TEMP_DIR_H_INCLUDED
#define BEAST_UTILITY_TEMP_DIR_H_INCLUDED
#include <boost/filesystem.hpp>
#include <string>
namespace beast {
/** RAII temporary directory.
The directory and all its contents are deleted when
the instance of `temp_dir` is destroyed.
*/
class temp_dir
{
boost::filesystem::path path_;
public:
#if ! GENERATING_DOCS
temp_dir(const temp_dir&) = delete;
temp_dir& operator=(const temp_dir&) = delete;
#endif
/// Construct a temporary directory.
temp_dir()
{
auto const dir =
boost::filesystem::temp_directory_path();
do
{
path_ =
dir / boost::filesystem::unique_path();
}
while(boost::filesystem::exists(path_));
boost::filesystem::create_directory (path_);
}
/// Destroy a temporary directory.
~temp_dir()
{
boost::filesystem::remove_all (path_);
}
/// Get the native path for the temporary directory
std::string
path() const
{
return path_.string();
}
/** Get the native path for the a file.
The file does not need to exist.
*/
std::string
file(std::string const& name) const
{
return (path_ / name).string();
}
};
} // beast
#endif

4
src/ripple/nodestore/tests/Backend.test.cpp
View File

@@ -21,7 +21,7 @@
#include <ripple/nodestore/tests/Base.test.h> #include <ripple/nodestore/tests/Base.test.h>
#include <ripple/nodestore/DummyScheduler.h> #include <ripple/nodestore/DummyScheduler.h>
#include <ripple/nodestore/Manager.h> #include <ripple/nodestore/Manager.h>
#include <beast/core/detail/temp_dir.hpp> #include <ripple/beast/utility/temp_dir.h>
#include <algorithm> #include <algorithm>
namespace ripple { namespace ripple {
@@ -42,7 +42,7 @@ public:
testcase ("Backend type=" + type); testcase ("Backend type=" + type);
Section params; Section params;
beast::detail::temp_dir tempDir; beast::temp_dir tempDir;
params.set ("type", type); params.set ("type", type);
params.set ("path", tempDir.path()); params.set ("path", tempDir.path());

8
src/ripple/nodestore/tests/Database.test.cpp
View File

@@ -21,7 +21,7 @@
#include <ripple/nodestore/tests/Base.test.h> #include <ripple/nodestore/tests/Base.test.h>
#include <ripple/nodestore/DummyScheduler.h> #include <ripple/nodestore/DummyScheduler.h>
#include <ripple/nodestore/Manager.h> #include <ripple/nodestore/Manager.h>
#include <beast/core/detail/temp_dir.hpp> #include <ripple/beast/utility/temp_dir.h>
#include <algorithm> #include <algorithm>
namespace ripple { namespace ripple {
@@ -35,7 +35,7 @@ public:
{ {
DummyScheduler scheduler; DummyScheduler scheduler;
beast::detail::temp_dir node_db; beast::temp_dir node_db;
Section srcParams; Section srcParams;
srcParams.set ("type", srcBackendType); srcParams.set ("type", srcBackendType);
srcParams.set ("path", node_db.path()); srcParams.set ("path", node_db.path());
@@ -61,7 +61,7 @@ public:
"test", scheduler, j, 2, srcParams); "test", scheduler, j, 2, srcParams);
// Set up the destination database // Set up the destination database
beast::detail::temp_dir dest_db; beast::temp_dir dest_db;
Section destParams; Section destParams;
destParams.set ("type", destBackendType); destParams.set ("type", destBackendType);
destParams.set ("path", dest_db.path()); destParams.set ("path", dest_db.path());
@@ -98,7 +98,7 @@ public:
testcase (s); testcase (s);
beast::detail::temp_dir node_db; beast::temp_dir node_db;
Section nodeParams; Section nodeParams;
nodeParams.set ("type", type); nodeParams.set ("type", type);
nodeParams.set ("path", node_db.path()); nodeParams.set ("path", node_db.path());

6
src/ripple/nodestore/tests/Timing.test.cpp
View File

@@ -23,7 +23,7 @@
#include <ripple/nodestore/Manager.h> #include <ripple/nodestore/Manager.h>
#include <ripple/basics/BasicConfig.h> #include <ripple/basics/BasicConfig.h>
#include <ripple/unity/rocksdb.h> #include <ripple/unity/rocksdb.h>
#include <beast/core/detail/temp_dir.hpp> #include <ripple/beast/utility/temp_dir.h>
#include <ripple/beast/xor_shift_engine.h> #include <ripple/beast/xor_shift_engine.h>
#include <ripple/beast/unit_test.h> #include <ripple/beast/unit_test.h>
#include <beast/unit_test/thread.hpp> #include <beast/unit_test/thread.hpp>
@@ -679,7 +679,7 @@ public:
params.threads = threads; params.threads = threads;
for (auto i = default_repeat; i--;) for (auto i = default_repeat; i--;)
{ {
beast::detail::temp_dir tempDir; beast::temp_dir tempDir;
Section config = parse(config_string); Section config = parse(config_string);
config.set ("path", tempDir.path()); config.set ("path", tempDir.path());
std::stringstream ss; std::stringstream ss;
@@ -697,7 +697,7 @@ public:
void void
run() override run() override
{ {
testcase ("Timing", suite::abort_on_fail); testcase ("Timing", beast::unit_test::abort_on_fail);
/* Parameters: /* Parameters:

4
src/ripple/nodestore/tests/import_test.cpp
View File

@@ -301,7 +301,7 @@ public:
void void
run() override run() override
{ {
testcase(abort_on_fail) << arg(); testcase(beast::unit_test::abort_on_fail) << arg();
using namespace beast::nudb; using namespace beast::nudb;
using namespace beast::nudb::detail; using namespace beast::nudb::detail;
@@ -573,7 +573,7 @@ public:
void void
run() override run() override
{ {
testcase(abort_on_fail) << arg(); testcase(beast::unit_test::abort_on_fail) << arg();
using namespace beast::nudb; using namespace beast::nudb;
using namespace beast::nudb::detail; using namespace beast::nudb::detail;