diff options
| author | Jason Evans <je@fb.com> | 2016-02-24 19:03:40 (GMT) |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2016-02-24 21:03:48 (GMT) |
| commit | 8f683b94a751c65af8f9fa25970ccf2917b96bb8 (patch) | |
| tree | b1478482428322b8fd9b3aef7c6e0b845c22cc69 /src/jemalloc.c | |
| parent | 603b3bd413d670909811ce49d28a8b0a4ae3ba6b (diff) | |
| download | jemalloc-8f683b94a751c65af8f9fa25970ccf2917b96bb8.zip jemalloc-8f683b94a751c65af8f9fa25970ccf2917b96bb8.tar.gz jemalloc-8f683b94a751c65af8f9fa25970ccf2917b96bb8.tar.bz2 | |
Make opt_narenas unsigned rather than size_t.
Diffstat (limited to 'src/jemalloc.c')
| -rw-r--r-- | src/jemalloc.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index 76b4f15..3d356c3 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -40,7 +40,7 @@ bool opt_redzone = false; bool opt_utrace = false; bool opt_xmalloc = false; bool opt_zero = false; -size_t opt_narenas = 0; +unsigned opt_narenas = 0; /* Initialized to true if the process is running inside Valgrind. */ bool in_valgrind; @@ -1031,7 +1031,7 @@ malloc_conf_init(void) if (cont) \ continue; \ } -#define CONF_HANDLE_SIZE_T(o, n, min, max, clip) \ +#define CONF_HANDLE_T_U(t, o, n, min, max, clip) \ if (CONF_MATCH(n)) { \ uintmax_t um; \ char *end; \ @@ -1045,11 +1045,11 @@ malloc_conf_init(void) k, klen, v, vlen); \ } else if (clip) { \ if ((min) != 0 && um < (min)) \ - o = (min); \ + o = (t)(min); \ else if (um > (max)) \ - o = (max); \ + o = (t)(max); \ else \ - o = um; \ + o = (t)um; \ } else { \ if (((min) != 0 && um < (min)) \ || um > (max)) { \ @@ -1058,10 +1058,14 @@ malloc_conf_init(void) "conf value", \ k, klen, v, vlen); \ } else \ - o = um; \ + o = (t)um; \ } \ continue; \ } +#define CONF_HANDLE_UNSIGNED(o, n, min, max, clip) \ + CONF_HANDLE_T_U(unsigned, o, n, min, max, clip) +#define CONF_HANDLE_SIZE_T(o, n, min, max, clip) \ + CONF_HANDLE_T_U(size_t, o, n, min, max, clip) #define CONF_HANDLE_SSIZE_T(o, n, min, max) \ if (CONF_MATCH(n)) { \ long l; \ @@ -1129,8 +1133,8 @@ malloc_conf_init(void) } continue; } - CONF_HANDLE_SIZE_T(opt_narenas, "narenas", 1, - SIZE_T_MAX, false) + CONF_HANDLE_UNSIGNED(opt_narenas, "narenas", 1, + UINT_MAX, false) if (strncmp("purge", k, klen) == 0) { int i; bool match = false; |