diff options
author | David Goulet <dgoulet@torproject.org> | 2021-02-23 11:02:33 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2021-02-23 11:02:33 -0500 |
commit | 296a557bfc5769617da53eee5a8670e2428ca458 (patch) | |
tree | 4fa2ad2d37b54fd69f64363190cece279d86231b /src/test/test_util.c | |
parent | 21317c92296f0c08176c8788f8f2bcf501e78032 (diff) | |
download | tor-296a557bfc5769617da53eee5a8670e2428ca458.tar.gz tor-296a557bfc5769617da53eee5a8670e2428ca458.zip |
Remove mallinfo() from codebase
Now deprecated in libc >= 2.33
Closes #40309
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/test/test_util.c')
-rw-r--r-- | src/test/test_util.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index 06ea8191a2..7f07370998 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6394,57 +6394,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 - tt_skip(); -#endif - done: - teardown_capture_of_logs(); - tor_free(log1); - tor_free(log2); - tor_free(mem); -} - #define UTIL_LEGACY(name) \ { #name, test_util_ ## name , 0, NULL, NULL } @@ -6584,6 +6533,5 @@ 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), END_OF_TESTCASES }; |