[tor-commits] [tor/master] Rename DIRCACHE_MIN_BANDWIDTH and DIRCACHE_MIN_MB_BANDWIDTH

nickm at torproject.org nickm at torproject.org
Wed Jan 18 20:08:57 UTC 2017


commit 426ceb41ef8a583cedaac5df68400c201aa30d8f
Author: Neel Chauhan <neel at neelc.org>
Date:   Sat Dec 24 07:26:37 2016 -0500

    Rename DIRCACHE_MIN_BANDWIDTH and DIRCACHE_MIN_MB_BANDWIDTH
    
    Renamed to DIRCACHE_MIN_MEM and DIRCACHE_MIN_MB_MEM.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/config.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index c4e9ca2..e83eb54 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4350,8 +4350,8 @@ compute_real_max_mem_in_queues(const uint64_t val, int log_guess)
 }
 
 /* If we have less than 300 MB suggest disabling dircache */
-#define DIRCACHE_MIN_MB_BANDWIDTH 300
-#define DIRCACHE_MIN_BANDWIDTH (DIRCACHE_MIN_MB_BANDWIDTH*ONE_MEGABYTE)
+#define DIRCACHE_MIN_MEM 300
+#define DIRCACHE_MIN_MB_MEM (DIRCACHE_MIN_MEM*ONE_MEGABYTE)
 #define STRINGIFY(val) #val
 
 /** Create a warning message for emitting if we are a dircache but may not have
@@ -4371,21 +4371,21 @@ have_enough_mem_for_dircache(const or_options_t *options, size_t total_mem,
     }
   }
   if (options->DirCache) {
-    if (total_mem < DIRCACHE_MIN_BANDWIDTH) {
+    if (total_mem < DIRCACHE_MIN_MB_MEM) {
       if (options->BridgeRelay) {
         *msg = tor_strdup("Running a Bridge with less than "
-                      STRINGIFY(DIRCACHE_MIN_MB_BANDWIDTH) " MB of memory is "
-                      "not recommended.");
+                      STRINGIFY(DIRCACHE_MIN_MEM) " MB of memory is not "
+                      "recommended.");
       } else {
         *msg = tor_strdup("Being a directory cache (default) with less than "
-                      STRINGIFY(DIRCACHE_MIN_MB_BANDWIDTH) " MB of memory is "
-                      "not recommended and may consume most of the available "
+                      STRINGIFY(DIRCACHE_MIN_MEM) " MB of memory is not "
+                      "recommended and may consume most of the available "
                       "resources, consider disabling this functionality by "
                       "setting the DirCache option to 0.");
       }
     }
   } else {
-    if (total_mem >= DIRCACHE_MIN_BANDWIDTH) {
+    if (total_mem >= DIRCACHE_MIN_MB_MEM) {
       *msg = tor_strdup("DirCache is disabled and we are configured as a "
                "relay. This may disqualify us from becoming a guard in the "
                "future.");





More information about the tor-commits mailing list