From 27bbb305fc11adf39d4e8348b08cc1dbb17fb94f Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 11 Sep 2017 12:03:33 -0400 Subject: [PATCH] fix enqueue_once_maybe... maybe? --- src/lib/logging/Logger.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lib/logging/Logger.h b/src/lib/logging/Logger.h index bf06dbff1..365cd9b31 100644 --- a/src/lib/logging/Logger.h +++ b/src/lib/logging/Logger.h @@ -55,15 +55,21 @@ public: unlock(); } + size_t aggregate_hash() { return 0; } + template + size_t aggregate_hash(Arg1& arg1, Args&&... args2) { + return + std::hash()(arg1) + + aggregate_hash(args2...); + } + template void enqueue_once_maybe(Subsystem subsystem,Level lv, const char*file, int line, const char *msg_template, Args&&... msg_args) { const size_t filter_size = 1024*8; // 1kb static std::vector s_bloom(filter_size); - std::vector hashes {std::hash()(msg_template), std::hash()(msg_args)...}; - auto arg_hash = std::accumulate(hashes.begin(),hashes.end(),0); - size_t hash = (arg_hash+ std::hash()(msg_template)) % filter_size; - + auto arg_hash = aggregate_hash(msg_args...); + size_t hash = (arg_hash + std::hash()(msg_template)) % filter_size; if (s_bloom[hash]) return; else