From 95e55a25444dbd38010083e5f16846dd5904aef4 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Mon, 1 Jun 2020 13:31:12 -0400 Subject: [PATCH] consistent spelling and use std::max --- llarp/context.cpp | 4 +--- llarp/ev/ev_libuv.cpp | 4 ++-- llarp/ev/ev_libuv.hpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/llarp/context.cpp b/llarp/context.cpp index f25d41eea..257a3e8e3 100644 --- a/llarp/context.cpp +++ b/llarp/context.cpp @@ -78,9 +78,7 @@ namespace llarp llarp::LogInfo("starting up"); if (mainloop == nullptr) { - auto jobQueueSize = config->router.m_JobQueueSize; - if (jobQueueSize < 1024) - jobQueueSize = 1024; + auto jobQueueSize = std::max(event_loop_queue_size, config->router.m_JobQueueSize); mainloop = llarp_make_ev_loop(jobQueueSize); } logic->set_event_loop(mainloop.get()); diff --git a/llarp/ev/ev_libuv.cpp b/llarp/ev/ev_libuv.cpp index 5eacbf354..7242a71c8 100644 --- a/llarp/ev/ev_libuv.cpp +++ b/llarp/ev/ev_libuv.cpp @@ -753,8 +753,8 @@ namespace libuv llarp::LogContext::Instance().logStream->Tick(loop->time_now()); } - Loop::Loop(size_t queueLength) - : llarp_ev_loop(), m_LogicCalls(queueLength), m_timerQueue(20), m_timerCancelQueue(20) + Loop::Loop(size_t queue_size) + : llarp_ev_loop(), m_LogicCalls(queue_size), m_timerQueue(20), m_timerCancelQueue(20) { } diff --git a/llarp/ev/ev_libuv.hpp b/llarp/ev/ev_libuv.hpp index ff016e48b..3eac53481 100644 --- a/llarp/ev/ev_libuv.hpp +++ b/llarp/ev/ev_libuv.hpp @@ -24,7 +24,7 @@ namespace libuv Callback callback; }; - Loop(size_t queueSize); + Loop(size_t queue_size); bool init() override;