diff --git a/bench/Makefile b/bench/Makefile index 24a4d7b0..98fcccb7 100644 --- a/bench/Makefile +++ b/bench/Makefile @@ -1,18 +1,15 @@ -CXX ?= g++ +CXX = g++ CXXFLAGS = -march=native -Wall -Wextra -pedantic -std=c++11 -pthread -I../include -CXX_RELEASE_FLAGS = -O3 -flto -DNDEBUG +CXX_RELEASE_FLAGS = -O3 -flto -binaries=bench spdlog-null-async +binaries=bench all: $(binaries) bench: bench.cpp $(CXX) bench.cpp -o bench $(CXXFLAGS) $(CXX_RELEASE_FLAGS) - -spdlog-null-async: spdlog-null-async.cpp - $(CXX) spdlog-null-async.cpp -o spdlog-null-async $(CXXFLAGS) $(CXX_RELEASE_FLAGS) - + .PHONY: clean diff --git a/bench/bench.cpp b/bench/bench.cpp index 68cdd9be..52e2ffaf 100644 --- a/bench/bench.cpp +++ b/bench/bench.cpp @@ -32,7 +32,7 @@ void bench_mt(int howmany, std::shared_ptr log, int thread_count int main(int argc, char *argv[]) { - int queue_size = 1048576; + int queue_size = 1000000; int howmany = 1000000; int threads = 10; int file_size = 30 * 1024 * 1024; diff --git a/bench/spdlog-null-async.cpp b/bench/spdlog-null-async.cpp deleted file mode 100644 index ee64eb92..00000000 --- a/bench/spdlog-null-async.cpp +++ /dev/null @@ -1,116 +0,0 @@ -// -// Copyright(c) 2015 Gabi Melman. -// Distributed under the MIT License (http://opensource.org/licenses/MIT) -// - -// -// bench.cpp : spdlog benchmarks -// -#include "spdlog/async.h" -#include "spdlog/async_logger.h" -#include "spdlog/sinks/null_sink.h" -#include "spdlog/spdlog.h" -#include "utils.h" -#include -#include // EXIT_FAILURE -#include -#include -#include -#include - -using namespace std; -using namespace std::chrono; -using namespace spdlog; -using namespace spdlog::sinks; -using namespace utils; - -size_t bench_as(int howmany, std::shared_ptr log, int thread_count); - -int main(int argc, char *argv[]) -{ - - int howmany; - int tp_queue_size; - int tp_threads = 1; - int client_threads = 10; - int iters = 10; - - try - { - if (argc < 2) - { - cout << "Usage: " << argv[0] << " [client_threads] [q_size] [tp_threads]" << endl; - return (1); - } - - howmany = atoi(argv[1]); - if (argc > 2) - client_threads = atoi(argv[2]); - - if (argc > 3) - tp_queue_size = atoi(argv[3]); - else - tp_queue_size = howmany; - - if (argc > 4) - tp_threads = atoi(argv[4]); - - cout << "\n*******************************************************************************\n"; - cout << "messages:\t" << format(howmany) << endl; - cout << "client_threads:\t" << client_threads << endl; - cout << "tp queue:\t" << format(tp_queue_size) << endl; - cout << "tp threads:\t" << tp_threads << endl; - cout << "*******************************************************************************\n"; - - size_t total_rate = 0; - - for (int i = 0; i < iters; ++i) - { - spdlog::init_thread_pool(tp_queue_size, tp_threads); - auto as = spdlog::create_async_logger("async(null-sink)"); - total_rate += bench_as(howmany, as, client_threads); - spdlog::drop("async(null-sink)"); - } - std::cout << endl; - std::cout << "Avg rate: " << format(total_rate / iters) << "/sec" << std::endl; - } - catch (std::exception &ex) - { - std::cerr << "Error: " << ex.what() << std::endl; - perror("Last error"); - return EXIT_FAILURE; - } - return EXIT_SUCCESS; -} - -// return rate/sec -size_t bench_as(int howmany, std::shared_ptr log, int thread_count) -{ - cout << log->name() << "...\t\t" << flush; - std::atomic msg_counter{0}; - vector threads; - auto start = system_clock::now(); - for (int t = 0; t < thread_count; ++t) - { - threads.push_back(std::thread([&]() { - for (;;) - { - int counter = ++msg_counter; - if (counter > howmany) - break; - log->info("Hello logger: msg number {}", counter); - } - })); - } - - for (auto &t : threads) - { - t.join(); - } - - auto delta = system_clock::now() - start; - auto delta_d = duration_cast>(delta).count(); - auto per_sec = size_t(howmany / delta_d); - cout << format(per_sec) << "/sec" << endl; - return per_sec; -}