[tor-commits] [tor/release-0.4.4] Rename argument to compute_real_max_mem_in_queues()

dgoulet at torproject.org dgoulet at torproject.org
Tue Aug 18 12:51:47 UTC 2020


commit 431dcc42e028e1b56f60131e3e153296ff73c25e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 11 12:59:07 2020 -0400

    Rename argument to compute_real_max_mem_in_queues()
---
 src/app/config/config.c | 4 ++--
 src/app/config/config.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 1d61b76310..8e21d67f23 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -4583,7 +4583,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
  * actual maximum value.  We clip this value if it's too low, and autodetect
  * it if it's set to 0. */
 STATIC uint64_t
-compute_real_max_mem_in_queues(const uint64_t val, int log_guess)
+compute_real_max_mem_in_queues(const uint64_t val, bool is_server)
 {
   uint64_t result;
 
@@ -4642,7 +4642,7 @@ compute_real_max_mem_in_queues(const uint64_t val, int log_guess)
         result = avail;
       }
     }
-    if (log_guess && ! notice_sent) {
+    if (is_server && ! notice_sent) {
       log_notice(LD_CONFIG, "%sMaxMemInQueues is set to %"PRIu64" MB. "
                  "You can override this by setting MaxMemInQueues by hand.",
                  ram ? "Based on detected system memory, " : "",
diff --git a/src/app/config/config.h b/src/app/config/config.h
index 301faf7067..35905ef767 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -290,7 +290,7 @@ STATIC int parse_port_config(smartlist_t *out,
 STATIC int check_bridge_distribution_setting(const char *bd);
 
 STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val,
-                                               int log_guess);
+                                               bool is_server);
 STATIC int open_and_add_file_log(const log_severity_list_t *severity,
                                  const char *fname,
                                  int truncate_log);





More information about the tor-commits mailing list