提交 9c071083 编写于 作者: Z zgq-0218

disable musl test switch

Issue: #I692AU
Test: Build & Boot devices
Signed-off-by: Nzgq-0218 <zhaoguoqiang8@huawei.com>
上级 f967a815
import("../../test_template.gni") import("../../test_template.gni")
import("test_src_functional.gni") import("test_src_functional.gni")
if (is_standard_system) { if (is_standard_system && musl_iterate_and_stats_api) {
functional_list += malloc_stats_list functional_list += malloc_stats_list
} }
......
...@@ -60,7 +60,7 @@ declare_args() { ...@@ -60,7 +60,7 @@ declare_args() {
if (!is_standard_system) { if (!is_standard_system) {
enable_musl_log = false enable_musl_log = false
} }
musl_iterate_and_stats_api = true musl_iterate_and_stats_api = false
musl_secure_level = 1 musl_secure_level = 1
} }
......
...@@ -10,10 +10,12 @@ hidden void __malloc_donate(char *, char *); ...@@ -10,10 +10,12 @@ hidden void __malloc_donate(char *, char *);
hidden void *__memalign(size_t, size_t); hidden void *__memalign(size_t, size_t);
#ifdef MUSL_ITERATE_AND_STATS_API
typedef struct occupied_bin_s { typedef struct occupied_bin_s {
struct chunk *head, *tail; struct chunk *head, *tail;
volatile int lock[2]; volatile int lock[2];
} occupied_bin_t; } occupied_bin_t;
#endif
struct chunk { struct chunk {
size_t psize, csize; size_t psize, csize;
...@@ -60,6 +62,7 @@ hidden size_t __get_total_heap_space(void); ...@@ -60,6 +62,7 @@ hidden size_t __get_total_heap_space(void);
#define ITERATE_AND_STATS_OVERHEAD (0) #define ITERATE_AND_STATS_OVERHEAD (0)
#endif #endif
#ifdef MUSL_ITERATE_AND_STATS_API
#ifndef MALLOC_RED_ZONE #ifndef MALLOC_RED_ZONE
#define SIZE_ALIGN (8*sizeof(size_t)) #define SIZE_ALIGN (8*sizeof(size_t))
#define OVERHEAD (2*sizeof(size_t) + ITERATE_AND_STATS_OVERHEAD) #define OVERHEAD (2*sizeof(size_t) + ITERATE_AND_STATS_OVERHEAD)
...@@ -67,12 +70,24 @@ hidden size_t __get_total_heap_space(void); ...@@ -67,12 +70,24 @@ hidden size_t __get_total_heap_space(void);
#define SIZE_ALIGN (16*sizeof(size_t)) #define SIZE_ALIGN (16*sizeof(size_t))
#define OVERHEAD (4*sizeof(size_t) + ITERATE_AND_STATS_OVERHEAD) #define OVERHEAD (4*sizeof(size_t) + ITERATE_AND_STATS_OVERHEAD)
#endif #endif
#else
#ifndef MALLOC_RED_ZONE
#define SIZE_ALIGN (4*sizeof(size_t))
#define OVERHEAD (2*sizeof(size_t))
#else
#define SIZE_ALIGN (8*sizeof(size_t))
#define OVERHEAD (4*sizeof(size_t))
#endif
#endif
#define MMAP_THRESHOLD (0x1c00*SIZE_ALIGN) #define MMAP_THRESHOLD (0x1c00*SIZE_ALIGN)
#ifndef MALLOC_RED_ZONE #ifndef MALLOC_RED_ZONE
#ifdef MUSL_ITERATE_AND_STATS_API
#define DONTCARE OVERHEAD #define DONTCARE OVERHEAD
#else #else
#define DONTCARE 16
#endif
#else
#define DONTCARE OVERHEAD #define DONTCARE OVERHEAD
#define POINTER_USAGE (2*sizeof(void *)) #define POINTER_USAGE (2*sizeof(void *))
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册