February 2021 - tor-commits - lists.torproject.org

[tor/master] Make dirauths vote the Sybil flag when other flags are zeroed out
by asn＠torproject.org 24 Feb '21

24 Feb '21

commit 88559aca2d9487a9b101bb563b1ddf857a013962 Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Feb 12 15:43:48 2021 -0800 Make dirauths vote the Sybil flag when other flags are zeroed out --- changes/ticket40255 | 5 +++++ src/feature/dirauth/dirvote.c | 10 +++++++--- src/feature/dirparse/ns_parse.c | 2 ++ src/feature/nodelist/fmt_routerstatus.c | 3 ++- src/feature/nodelist/routerstatus_st.h | 1 + 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/changes/ticket40255 b/changes/ticket40255 new file mode 100644 index 0000000000..026c64f697 --- /dev/null +++ b/changes/ticket40255 @@ -0,0 +1,5 @@ + o Major features (directory authority, sybil): + - When voting for a relay with a Sybil-like appearance, add the Sybil + flag when clearing out the other flags. This lets a relay operator + know why their relay hasn't been voted on. Closes ticket 40255. + Patch by Neel Chauhan. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 0f62a8bbf5..430589b2ae 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4542,13 +4542,16 @@ routers_make_ed_keys_unique(smartlist_t *routers) } SMARTLIST_FOREACH_END(ri); } -/** Routerstatus rs is part of a group of routers that are on - * too narrow an IP-space. Clear out its flags since we don't want it be used +/** Routerstatus rs is part of a group of routers that are on too + * narrow an IP-space. Clear out its flags since we don't want it be used * because of its Sybil-like appearance. * * Leave its BadExit flag alone though, since if we think it's a bad exit, * we want to vote that way in case all the other authorities are voting * Running and Exit. + * + * Also set the Sybil flag in order to let a relay operator know that's + * why their relay hasn't been voted on. */ static void clear_status_flags_on_sybil(routerstatus_t *rs) @@ -4556,6 +4559,7 @@ clear_status_flags_on_sybil(routerstatus_t *rs) rs->is_authority = rs->is_exit = rs->is_stable = rs->is_fast = rs->is_flagged_running = rs->is_named = rs->is_valid = rs->is_hs_dir = rs->is_v2_dir = rs->is_possible_guard = 0; + rs->is_sybil = 1; /* FFFF we might want some mechanism to check later on if we * missed zeroing any flags: it's easy to add a new flag but * forget to add it to this clause. */ @@ -4570,6 +4574,7 @@ const char DIRVOTE_UNIVERSAL_FLAGS[] = "HSDir " "Stable " "StaleDesc " + "Sybil " "V2Dir " "Valid"; /** Space-separated list of all flags that we may or may not vote on, @@ -4749,7 +4754,6 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, dirserv_read_measured_bandwidths(options->V3BandwidthsFile, routerstatuses, bw_file_headers, bw_file_digest256); - } else { /* * No bandwidths file; clear the measured bandwidth cache in case we had diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index 138d248b08..8c5f449b89 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -446,6 +446,8 @@ routerstatus_parse_entry_from_string(memarea_t *area, rs->is_v2_dir = 1; } else if (!strcmp(tok->args[i], "StaleDesc")) { rs->is_staledesc = 1; + } else if (!strcmp(tok->args[i], "Sybil")) { + rs->is_sybil = 1; } } /* These are implied true by having been included in a consensus made diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index 252b2e61fe..5c1e9309b9 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -87,7 +87,7 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, goto done; smartlist_add_asprintf(chunks, - "s%s%s%s%s%s%s%s%s%s%s%s\n", + "s%s%s%s%s%s%s%s%s%s%s%s%s\n", /* These must stay in alphabetical order. */ rs->is_authority?" Authority":"", rs->is_bad_exit?" BadExit":"", @@ -98,6 +98,7 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, rs->is_flagged_running?" Running":"", rs->is_stable?" Stable":"", rs->is_staledesc?" StaleDesc":"", + rs->is_sybil?" Sybil":"", rs->is_v2_dir?" V2Dir":"", rs->is_valid?" Valid":""); diff --git a/src/feature/nodelist/routerstatus_st.h b/src/feature/nodelist/routerstatus_st.h index 254ba73f7f..ef8687db76 100644 --- a/src/feature/nodelist/routerstatus_st.h +++ b/src/feature/nodelist/routerstatus_st.h @@ -58,6 +58,7 @@ struct routerstatus_t { */ unsigned int is_staledesc:1; /** True iff the authorities think this router * should upload a new descriptor soon. */ + unsigned int is_sybil:1; /** True iff this router is a sybil. */ unsigned int has_bandwidth:1; /**< The vote/consensus had bw info */ unsigned int has_exitsummary:1; /**< The vote/consensus had exit summaries */

1 0

[tpo/master] Add new Tor Browser version 10.0.12
by sysrqb＠torproject.org 23 Feb '21

23 Feb '21

commit 9a38b4731517e16b98118c6a04c6b40b0c8a6942 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Feb 23 20:00:55 2021 +0000 Add new Tor Browser version 10.0.12 --- databags/versions.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index 26a605d8..be736286 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,12 +1,12 @@ [torbrowser-stable] -version = 10.0.10 -win32 = 0.4.4.6 +version = 10.0.12 +win32 = 0.4.5.6 [torbrowser-android-stable] -version = 10.0.10 +version = 10.0.12 [torbrowser-win-stable] -version = 10.0.11 +version = 10.0.12 [torbrowser-alpha] version = 10.5a8

1 0

[tor/maint-0.4.5] Remove mallinfo() from codebase
by dgoulet＠torproject.org 23 Feb '21

23 Feb '21

commit ad4f87ed3f2126814e42565e2d815e37f99f7c1f Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 11:02:33 2021 -0500 Remove mallinfo() from codebase Now deprecated in libc >= 2.33 Closes #40309 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo.c | 23 --------------------- src/lib/meminfo/meminfo.h | 1 - src/test/test_util.c | 52 ----------------------------------------------- 6 files changed, 3 insertions(+), 78 deletions(-) diff --git a/changes/ticket40309 b/changes/ticket40309 new file mode 100644 index 0000000000..087ac36a4f --- /dev/null +++ b/changes/ticket40309 @@ -0,0 +1,3 @@ + o New system requirements (mallinfo() deprecated): + - Remove mallinfo() usage entirely. Libc 2.33+ now deprecates it. Closes + ticket 40309. diff --git a/configure.ac b/configure.ac index 03c80d73b5..db5bfee202 100644 --- a/configure.ac +++ b/configure.ac @@ -2038,7 +2038,6 @@ AS_CASE([$malloc], [system], [ # handle this later, including the jemalloc fallback - AC_CHECK_FUNCS(mallinfo) ], [AC_MSG_ERROR([--with-malloc=`$with_malloc' not supported, see --help]) diff --git a/src/app/main/main.c b/src/app/main/main.c index d7d36bff4e..fd166638db 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -319,7 +319,6 @@ dumpmemusage(int severity) dump_routerlist_mem_usage(severity); dump_cell_pool_usage(severity); dump_dns_mem_usage(severity); - tor_log_mallinfo(severity); } /** Write all statistics to the log, with log level severity. Called diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index 0c5e0ed665..b7d991e410 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -37,29 +37,6 @@ #include <sys/sysctl.h> #endif -DISABLE_GCC_WARNING("-Waggregate-return") -/** Call the platform malloc info function, and dump the results to the log at - * level severity. If no such function exists, do nothing. */ -void -tor_log_mallinfo(int severity) -{ -#ifdef HAVE_MALLINFO - struct mallinfo mi; - memset(&mi, 0, sizeof(mi)); - mi = mallinfo(); - tor_log(severity, LD_MM, - "mallinfo() said: arena=%d, ordblks=%d, smblks=%d, hblks=%d, " - "hblkhd=%d, usmblks=%d, fsmblks=%d, uordblks=%d, fordblks=%d, " - "keepcost=%d", - mi.arena, mi.ordblks, mi.smblks, mi.hblks, - mi.hblkhd, mi.usmblks, mi.fsmblks, mi.uordblks, mi.fordblks, - mi.keepcost); -#else /* !defined(HAVE_MALLINFO) */ - (void)severity; -#endif /* defined(HAVE_MALLINFO) */ -} -ENABLE_GCC_WARNING("-Waggregate-return") - #if defined(HW_PHYSMEM64) /* OpenBSD and NetBSD define this */ #define INT64_HW_MEM HW_PHYSMEM64 diff --git a/src/lib/meminfo/meminfo.h b/src/lib/meminfo/meminfo.h index a5ebfd5a6a..36a85c133d 100644 --- a/src/lib/meminfo/meminfo.h +++ b/src/lib/meminfo/meminfo.h @@ -15,7 +15,6 @@ #include "lib/testsupport/testsupport.h" #include <stddef.h> -void tor_log_mallinfo(int severity); MOCK_DECL(int, get_total_system_memory, (size_t *mem_out)); #endif /* !defined(TOR_MEMINFO_H) */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 2aee07a26a..00626c7ec0 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6255,57 +6255,6 @@ test_util_get_unquoted_path(void *arg) tor_free(r); } -static void -test_util_log_mallinfo(void *arg) -{ - (void)arg; - char *log1 = NULL, *log2 = NULL, *mem = NULL; -#ifdef HAVE_MALLINFO - setup_capture_of_logs(LOG_INFO); - tor_log_mallinfo(LOG_INFO); - expect_single_log_msg_containing("mallinfo() said: "); - mock_saved_log_entry_t *lg = smartlist_get(mock_saved_logs(), 0); - log1 = tor_strdup(lg->generated_msg); - - mock_clean_saved_logs(); - mem = tor_malloc(8192); - tor_log_mallinfo(LOG_INFO); - expect_single_log_msg_containing("mallinfo() said: "); - lg = smartlist_get(mock_saved_logs(), 0); - log2 = tor_strdup(lg->generated_msg); - - /* Make sure that the amount of used memory increased. */ - const char *used1 = strstr(log1, "uordblks="); - const char *used2 = strstr(log2, "uordblks="); - tt_assert(used1); - tt_assert(used2); - used1 += strlen("uordblks="); - used2 += strlen("uordblks="); - - int ok1, ok2; - char *next1 = NULL, *next2 = NULL; - uint64_t mem1 = tor_parse_uint64(used1, 10, 0, UINT64_MAX, &ok1, &next1); - uint64_t mem2 = tor_parse_uint64(used2, 10, 0, UINT64_MAX, &ok2, &next2); - tt_assert(ok1); - tt_assert(ok2); - tt_assert(next1); - tt_assert(next2); - if (mem2 == 0) { - /* This is a fake mallinfo that doesn't actually fill in its outputs. */ - tt_u64_op(mem1, OP_EQ, 0); - } else { - tt_u64_op(mem1, OP_LT, mem2); - } -#else /* !defined(HAVE_MALLINFO) */ - tt_skip(); -#endif /* defined(HAVE_MALLINFO) */ - done: - teardown_capture_of_logs(); - tor_free(log1); - tor_free(log2); - tor_free(mem); -} - static void test_util_map_anon(void *arg) { @@ -6573,7 +6522,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(monotonic_time_add_msec, 0), UTIL_TEST(htonll, 0), UTIL_TEST(get_unquoted_path, 0), - UTIL_TEST(log_mallinfo, 0), UTIL_TEST(map_anon, 0), UTIL_TEST(map_anon_nofork, 0), END_OF_TESTCASES

1 0

[tor/maint-0.4.5] Merge branch 'tor-gitlab/mr/326' into maint-0.4.5
by dgoulet＠torproject.org 23 Feb '21

23 Feb '21

commit 97e51dd01b228ecb72c912c6cf3ffae6334c8d07 Merge: bc21ed3290 ad4f87ed3f Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 12:27:59 2021 -0500 Merge branch 'tor-gitlab/mr/326' into maint-0.4.5 changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo.c | 23 --------------------- src/lib/meminfo/meminfo.h | 1 - src/test/test_util.c | 52 ----------------------------------------------- 6 files changed, 3 insertions(+), 78 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.5'
by dgoulet＠torproject.org 23 Feb '21

23 Feb '21

commit 6edb648aa0f23a507e7557a07fd291d6c3ad7747 Merge: bc799a1eaf 97e51dd01b Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 12:28:04 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo.c | 23 --------------------- src/lib/meminfo/meminfo.h | 1 - src/test/test_util.c | 52 ----------------------------------------------- 6 files changed, 3 insertions(+), 78 deletions(-)

1 0

[tor/master] Merge branch 'tor-gitlab/mr/326' into maint-0.4.5
by dgoulet＠torproject.org 23 Feb '21

23 Feb '21

commit 97e51dd01b228ecb72c912c6cf3ffae6334c8d07 Merge: bc21ed3290 ad4f87ed3f Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 12:27:59 2021 -0500 Merge branch 'tor-gitlab/mr/326' into maint-0.4.5 changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo.c | 23 --------------------- src/lib/meminfo/meminfo.h | 1 - src/test/test_util.c | 52 ----------------------------------------------- 6 files changed, 3 insertions(+), 78 deletions(-)

1 0

[tor/master] Remove mallinfo() from codebase
by dgoulet＠torproject.org 23 Feb '21

23 Feb '21

commit ad4f87ed3f2126814e42565e2d815e37f99f7c1f Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 11:02:33 2021 -0500 Remove mallinfo() from codebase Now deprecated in libc >= 2.33 Closes #40309 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo.c | 23 --------------------- src/lib/meminfo/meminfo.h | 1 - src/test/test_util.c | 52 ----------------------------------------------- 6 files changed, 3 insertions(+), 78 deletions(-) diff --git a/changes/ticket40309 b/changes/ticket40309 new file mode 100644 index 0000000000..087ac36a4f --- /dev/null +++ b/changes/ticket40309 @@ -0,0 +1,3 @@ + o New system requirements (mallinfo() deprecated): + - Remove mallinfo() usage entirely. Libc 2.33+ now deprecates it. Closes + ticket 40309. diff --git a/configure.ac b/configure.ac index 03c80d73b5..db5bfee202 100644 --- a/configure.ac +++ b/configure.ac @@ -2038,7 +2038,6 @@ AS_CASE([$malloc], [system], [ # handle this later, including the jemalloc fallback - AC_CHECK_FUNCS(mallinfo) ], [AC_MSG_ERROR([--with-malloc=`$with_malloc' not supported, see --help]) diff --git a/src/app/main/main.c b/src/app/main/main.c index d7d36bff4e..fd166638db 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -319,7 +319,6 @@ dumpmemusage(int severity) dump_routerlist_mem_usage(severity); dump_cell_pool_usage(severity); dump_dns_mem_usage(severity); - tor_log_mallinfo(severity); } /** Write all statistics to the log, with log level severity. Called diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index 0c5e0ed665..b7d991e410 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -37,29 +37,6 @@ #include <sys/sysctl.h> #endif -DISABLE_GCC_WARNING("-Waggregate-return") -/** Call the platform malloc info function, and dump the results to the log at - * level severity. If no such function exists, do nothing. */ -void -tor_log_mallinfo(int severity) -{ -#ifdef HAVE_MALLINFO - struct mallinfo mi; - memset(&mi, 0, sizeof(mi)); - mi = mallinfo(); - tor_log(severity, LD_MM, - "mallinfo() said: arena=%d, ordblks=%d, smblks=%d, hblks=%d, " - "hblkhd=%d, usmblks=%d, fsmblks=%d, uordblks=%d, fordblks=%d, " - "keepcost=%d", - mi.arena, mi.ordblks, mi.smblks, mi.hblks, - mi.hblkhd, mi.usmblks, mi.fsmblks, mi.uordblks, mi.fordblks, - mi.keepcost); -#else /* !defined(HAVE_MALLINFO) */ - (void)severity; -#endif /* defined(HAVE_MALLINFO) */ -} -ENABLE_GCC_WARNING("-Waggregate-return") - #if defined(HW_PHYSMEM64) /* OpenBSD and NetBSD define this */ #define INT64_HW_MEM HW_PHYSMEM64 diff --git a/src/lib/meminfo/meminfo.h b/src/lib/meminfo/meminfo.h index a5ebfd5a6a..36a85c133d 100644 --- a/src/lib/meminfo/meminfo.h +++ b/src/lib/meminfo/meminfo.h @@ -15,7 +15,6 @@ #include "lib/testsupport/testsupport.h" #include <stddef.h> -void tor_log_mallinfo(int severity); MOCK_DECL(int, get_total_system_memory, (size_t *mem_out)); #endif /* !defined(TOR_MEMINFO_H) */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 2aee07a26a..00626c7ec0 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6255,57 +6255,6 @@ test_util_get_unquoted_path(void *arg) tor_free(r); } -static void -test_util_log_mallinfo(void *arg) -{ - (void)arg; - char *log1 = NULL, *log2 = NULL, *mem = NULL; -#ifdef HAVE_MALLINFO - setup_capture_of_logs(LOG_INFO); - tor_log_mallinfo(LOG_INFO); - expect_single_log_msg_containing("mallinfo() said: "); - mock_saved_log_entry_t *lg = smartlist_get(mock_saved_logs(), 0); - log1 = tor_strdup(lg->generated_msg); - - mock_clean_saved_logs(); - mem = tor_malloc(8192); - tor_log_mallinfo(LOG_INFO); - expect_single_log_msg_containing("mallinfo() said: "); - lg = smartlist_get(mock_saved_logs(), 0); - log2 = tor_strdup(lg->generated_msg); - - /* Make sure that the amount of used memory increased. */ - const char *used1 = strstr(log1, "uordblks="); - const char *used2 = strstr(log2, "uordblks="); - tt_assert(used1); - tt_assert(used2); - used1 += strlen("uordblks="); - used2 += strlen("uordblks="); - - int ok1, ok2; - char *next1 = NULL, *next2 = NULL; - uint64_t mem1 = tor_parse_uint64(used1, 10, 0, UINT64_MAX, &ok1, &next1); - uint64_t mem2 = tor_parse_uint64(used2, 10, 0, UINT64_MAX, &ok2, &next2); - tt_assert(ok1); - tt_assert(ok2); - tt_assert(next1); - tt_assert(next2); - if (mem2 == 0) { - /* This is a fake mallinfo that doesn't actually fill in its outputs. */ - tt_u64_op(mem1, OP_EQ, 0); - } else { - tt_u64_op(mem1, OP_LT, mem2); - } -#else /* !defined(HAVE_MALLINFO) */ - tt_skip(); -#endif /* defined(HAVE_MALLINFO) */ - done: - teardown_capture_of_logs(); - tor_free(log1); - tor_free(log2); - tor_free(mem); -} - static void test_util_map_anon(void *arg) { @@ -6573,7 +6522,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(monotonic_time_add_msec, 0), UTIL_TEST(htonll, 0), UTIL_TEST(get_unquoted_path, 0), - UTIL_TEST(log_mallinfo, 0), UTIL_TEST(map_anon, 0), UTIL_TEST(map_anon_nofork, 0), END_OF_TESTCASES

1 0

[tor/release-0.4.5] Remove mallinfo() from codebase
by dgoulet＠torproject.org 23 Feb '21

23 Feb '21

commit ad4f87ed3f2126814e42565e2d815e37f99f7c1f Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 11:02:33 2021 -0500 Remove mallinfo() from codebase Now deprecated in libc >= 2.33 Closes #40309 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo.c | 23 --------------------- src/lib/meminfo/meminfo.h | 1 - src/test/test_util.c | 52 ----------------------------------------------- 6 files changed, 3 insertions(+), 78 deletions(-) diff --git a/changes/ticket40309 b/changes/ticket40309 new file mode 100644 index 0000000000..087ac36a4f --- /dev/null +++ b/changes/ticket40309 @@ -0,0 +1,3 @@ + o New system requirements (mallinfo() deprecated): + - Remove mallinfo() usage entirely. Libc 2.33+ now deprecates it. Closes + ticket 40309. diff --git a/configure.ac b/configure.ac index 03c80d73b5..db5bfee202 100644 --- a/configure.ac +++ b/configure.ac @@ -2038,7 +2038,6 @@ AS_CASE([$malloc], [system], [ # handle this later, including the jemalloc fallback - AC_CHECK_FUNCS(mallinfo) ], [AC_MSG_ERROR([--with-malloc=`$with_malloc' not supported, see --help]) diff --git a/src/app/main/main.c b/src/app/main/main.c index d7d36bff4e..fd166638db 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -319,7 +319,6 @@ dumpmemusage(int severity) dump_routerlist_mem_usage(severity); dump_cell_pool_usage(severity); dump_dns_mem_usage(severity); - tor_log_mallinfo(severity); } /** Write all statistics to the log, with log level severity. Called diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index 0c5e0ed665..b7d991e410 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -37,29 +37,6 @@ #include <sys/sysctl.h> #endif -DISABLE_GCC_WARNING("-Waggregate-return") -/** Call the platform malloc info function, and dump the results to the log at - * level severity. If no such function exists, do nothing. */ -void -tor_log_mallinfo(int severity) -{ -#ifdef HAVE_MALLINFO - struct mallinfo mi; - memset(&mi, 0, sizeof(mi)); - mi = mallinfo(); - tor_log(severity, LD_MM, - "mallinfo() said: arena=%d, ordblks=%d, smblks=%d, hblks=%d, " - "hblkhd=%d, usmblks=%d, fsmblks=%d, uordblks=%d, fordblks=%d, " - "keepcost=%d", - mi.arena, mi.ordblks, mi.smblks, mi.hblks, - mi.hblkhd, mi.usmblks, mi.fsmblks, mi.uordblks, mi.fordblks, - mi.keepcost); -#else /* !defined(HAVE_MALLINFO) */ - (void)severity; -#endif /* defined(HAVE_MALLINFO) */ -} -ENABLE_GCC_WARNING("-Waggregate-return") - #if defined(HW_PHYSMEM64) /* OpenBSD and NetBSD define this */ #define INT64_HW_MEM HW_PHYSMEM64 diff --git a/src/lib/meminfo/meminfo.h b/src/lib/meminfo/meminfo.h index a5ebfd5a6a..36a85c133d 100644 --- a/src/lib/meminfo/meminfo.h +++ b/src/lib/meminfo/meminfo.h @@ -15,7 +15,6 @@ #include "lib/testsupport/testsupport.h" #include <stddef.h> -void tor_log_mallinfo(int severity); MOCK_DECL(int, get_total_system_memory, (size_t *mem_out)); #endif /* !defined(TOR_MEMINFO_H) */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 2aee07a26a..00626c7ec0 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6255,57 +6255,6 @@ test_util_get_unquoted_path(void *arg) tor_free(r); } -static void -test_util_log_mallinfo(void *arg) -{ - (void)arg; - char *log1 = NULL, *log2 = NULL, *mem = NULL; -#ifdef HAVE_MALLINFO - setup_capture_of_logs(LOG_INFO); - tor_log_mallinfo(LOG_INFO); - expect_single_log_msg_containing("mallinfo() said: "); - mock_saved_log_entry_t *lg = smartlist_get(mock_saved_logs(), 0); - log1 = tor_strdup(lg->generated_msg); - - mock_clean_saved_logs(); - mem = tor_malloc(8192); - tor_log_mallinfo(LOG_INFO); - expect_single_log_msg_containing("mallinfo() said: "); - lg = smartlist_get(mock_saved_logs(), 0); - log2 = tor_strdup(lg->generated_msg); - - /* Make sure that the amount of used memory increased. */ - const char *used1 = strstr(log1, "uordblks="); - const char *used2 = strstr(log2, "uordblks="); - tt_assert(used1); - tt_assert(used2); - used1 += strlen("uordblks="); - used2 += strlen("uordblks="); - - int ok1, ok2; - char *next1 = NULL, *next2 = NULL; - uint64_t mem1 = tor_parse_uint64(used1, 10, 0, UINT64_MAX, &ok1, &next1); - uint64_t mem2 = tor_parse_uint64(used2, 10, 0, UINT64_MAX, &ok2, &next2); - tt_assert(ok1); - tt_assert(ok2); - tt_assert(next1); - tt_assert(next2); - if (mem2 == 0) { - /* This is a fake mallinfo that doesn't actually fill in its outputs. */ - tt_u64_op(mem1, OP_EQ, 0); - } else { - tt_u64_op(mem1, OP_LT, mem2); - } -#else /* !defined(HAVE_MALLINFO) */ - tt_skip(); -#endif /* defined(HAVE_MALLINFO) */ - done: - teardown_capture_of_logs(); - tor_free(log1); - tor_free(log2); - tor_free(mem); -} - static void test_util_map_anon(void *arg) { @@ -6573,7 +6522,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(monotonic_time_add_msec, 0), UTIL_TEST(htonll, 0), UTIL_TEST(get_unquoted_path, 0), - UTIL_TEST(log_mallinfo, 0), UTIL_TEST(map_anon, 0), UTIL_TEST(map_anon_nofork, 0), END_OF_TESTCASES

1 0

[tor/release-0.4.5] Merge branch 'tor-gitlab/mr/326' into maint-0.4.5
by dgoulet＠torproject.org 23 Feb '21

23 Feb '21

commit 97e51dd01b228ecb72c912c6cf3ffae6334c8d07 Merge: bc21ed3290 ad4f87ed3f Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 12:27:59 2021 -0500 Merge branch 'tor-gitlab/mr/326' into maint-0.4.5 changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo.c | 23 --------------------- src/lib/meminfo/meminfo.h | 1 - src/test/test_util.c | 52 ----------------------------------------------- 6 files changed, 3 insertions(+), 78 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 23 Feb '21

23 Feb '21

commit 83e448dd4d4b324526d01898b5d421e2d11e1bfa Merge: 4400ca83e0 97e51dd01b Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 23 12:28:04 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo.c | 23 --------------------- src/lib/meminfo/meminfo.h | 1 - src/test/test_util.c | 52 ----------------------------------------------- 6 files changed, 3 insertions(+), 78 deletions(-)

1 0