diff options
author | Eric B Munson <emunson@mgebm.net> | 2012-12-01 13:44:00 -0500 |
---|---|---|
committer | Eric B Munson <emunson@mgebm.net> | 2012-12-07 18:13:26 -0500 |
commit | 2a478def078d2606a58b75a3c6b6ec28043c8409 (patch) | |
tree | 751fabb558a03840ca12532e4a9d6576a00a80e2 /tests/testutils.c | |
parent | 8c075e336029bad7d4fafd87cd1e47f75ab50073 (diff) | |
download | libhugetlbfs-2a478def078d2606a58b75a3c6b6ec28043c8409.tar.gz |
Revert "exhaust malloc arenas before malloc tests"
This reverts commit cdd2fa336d9980eb268a775b7cf9c49e3b698cd7.
Conflicts:
tests/hugetests.h
tests/testutils.c
With the removal of sscanf from the setup routines, the malloc tests
now pass without having to exhaust small page allocations.
Signed-off-by: Eric B Munson <emunson@mgebm.net>
Cc: Jan Stancek <jstancek@redhat.com>
Cc: Steve Capper <steve.capper@arm.com>
Diffstat (limited to 'tests/testutils.c')
-rw-r--r-- | tests/testutils.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/tests/testutils.c b/tests/testutils.c index 933562f..6298370 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -205,42 +205,6 @@ int range_is_mapped(unsigned long low, unsigned long high) return 0; } -/* malloc memory one byte at a time until: - * - max limit is reached - * - malloc-ed memory is no longer on heap - */ -int consume_heap(long max) -{ - char aname[256]; - int ret; - long consumed = 0; - void *p; - - while (1) { - p = malloc(1); - if (p == NULL) - FAIL("Could not malloc memory"); - - ret = read_maps((unsigned long)p, aname); - if (ret <= 0) - FAIL("read_maps ret <= 0"); - - if (strstr(aname, "heap") == NULL) { - ret = 0; - break; - } - - consumed++; - if (consumed > max) { - verbose_printf("Warning: heap unexpectedly large\n"); - ret = 1; - break; - } - } - verbose_printf("malloc-ed %ld bytes from heap\n", consumed); - return ret; -} - /* * With the inclusion of MAP_HUGETLB it is now possible to have huge pages * without using hugetlbfs, so not all huge page regions will show with the |