TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-09 04:19:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: retire deprecated stream_logger ctor

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2023-12-28 12:20:05 +01:00
parent 676e46dd60
commit 56191f34d0
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/dwarfs/logger.h
View File

@ -86,10 +86,6 @@ class stream_logger : public logger {
stream_logger(std::shared_ptr<terminal const> term, std::ostream& os,
level_type threshold = WARN, bool with_context = false);
[[deprecated]] stream_logger(std::ostream& os = std::cerr,
level_type threshold = WARN,
bool with_context = false);
void write(level_type level, const std::string& output, char const* file,
int line) override;

4
src/dwarfs/logger.cpp
View File

@ -80,10 +80,6 @@ stream_logger::stream_logger(std::shared_ptr<terminal const> term,
set_threshold(threshold);
}
stream_logger::stream_logger(std::ostream& os, level_type threshold,
bool with_context)
: stream_logger{terminal::create(), os, threshold, with_context} {}
void stream_logger::preamble() {}
void stream_logger::postamble() {}
std::string_view stream_logger::get_newline() const { return "\n"; }

11
test/dwarfs_benchmark.cpp
View File

@ -41,6 +41,7 @@
#include "dwarfs/worker_group.h"
#include "mmap_mock.h"
#include "test_helpers.h"
#include "test_logger.h"
#include "test_strings.h"
#include "dwarfs/gen-cpp2/metadata_layouts.h"
@ -117,9 +118,7 @@ std::string make_filesystem(::benchmark::State const& state) {
worker_group wg("writer", 4);
progress prog([](const progress&, bool) {}, 1000);
std::ostringstream logss;
stream_logger lgr(logss); // TODO: mock
lgr.set_policy<prod_logger_policy>();
test::test_logger lgr;
auto sf = std::make_shared<segmenter_factory>(lgr, prog, cfg);
@ -170,7 +169,7 @@ void frozen_string_table_lookup(::benchmark::State& state) {
auto data = make_frozen_string_table(
test::test_strings,
string_table::pack_options(state.range(0), state.range(1), true));
stream_logger lgr;
test::test_logger lgr;
string_table table(lgr, "bench", data);
int i = 0;
std::string str;
@ -182,7 +181,7 @@ void frozen_string_table_lookup(::benchmark::State& state) {
void dwarfs_initialize(::benchmark::State& state) {
auto image = make_filesystem(state);
stream_logger lgr;
test::test_logger lgr;
auto mm = std::make_shared<test::mmap_mock>(image);
filesystem_options opts;
opts.block_cache.max_bytes = 1 << 20;
@ -283,7 +282,7 @@ class filesystem : public ::benchmark::Fixture {
std::vector<inode_view> entries;
private:
stream_logger lgr;
test::test_logger lgr;
std::string image;
std::shared_ptr<mmif> mm;
};

2
test/fuzz_categorizers.cpp
View File

@ -34,7 +34,7 @@ int main(int argc, char** argv) {
return 1;
}
stream_logger lgr(std::cerr);
null_logger lgr;
auto& catreg = categorizer_registry::instance();
auto catmgr = std::make_shared<categorizer_manager>(lgr);