Added opt_abort_conf: abort on invalid config options.
This commit is contained in:
parent
57aaa53f2b
commit
b86d271cbf
@ -874,7 +874,25 @@ mallctl("arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".decay",
|
|||||||
<literal>r-</literal>
|
<literal>r-</literal>
|
||||||
</term>
|
</term>
|
||||||
<listitem><para>Abort-on-warning enabled/disabled. If true, most
|
<listitem><para>Abort-on-warning enabled/disabled. If true, most
|
||||||
warnings are fatal. The process will call
|
warnings are fatal. Note that runtime option warnings are not included
|
||||||
|
(see <link
|
||||||
|
linkend="opt.abort_conf"><mallctl>opt.abort_conf</mallctl></link> for
|
||||||
|
that). The process will call
|
||||||
|
<citerefentry><refentrytitle>abort</refentrytitle>
|
||||||
|
<manvolnum>3</manvolnum></citerefentry> in these cases. This option is
|
||||||
|
disabled by default unless <option>--enable-debug</option> is
|
||||||
|
specified during configuration, in which case it is enabled by default.
|
||||||
|
</para></listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry id="opt.abort_conf">
|
||||||
|
<term>
|
||||||
|
<mallctl>opt.abort_conf</mallctl>
|
||||||
|
(<type>bool</type>)
|
||||||
|
<literal>r-</literal>
|
||||||
|
</term>
|
||||||
|
<listitem><para>Abort-on-invalid-configuration enabled/disabled. If
|
||||||
|
true, invalid runtime options are fatal. The process will call
|
||||||
<citerefentry><refentrytitle>abort</refentrytitle>
|
<citerefentry><refentrytitle>abort</refentrytitle>
|
||||||
<manvolnum>3</manvolnum></citerefentry> in these cases. This option is
|
<manvolnum>3</manvolnum></citerefentry> in these cases. This option is
|
||||||
disabled by default unless <option>--enable-debug</option> is
|
disabled by default unless <option>--enable-debug</option> is
|
||||||
|
@ -6,23 +6,24 @@
|
|||||||
#include "jemalloc/internal/tsd_types.h"
|
#include "jemalloc/internal/tsd_types.h"
|
||||||
|
|
||||||
/* TSD checks this to set thread local slow state accordingly. */
|
/* TSD checks this to set thread local slow state accordingly. */
|
||||||
extern bool malloc_slow;
|
extern bool malloc_slow;
|
||||||
|
|
||||||
/* Run-time options. */
|
/* Run-time options. */
|
||||||
extern bool opt_abort;
|
extern bool opt_abort;
|
||||||
extern const char *opt_junk;
|
extern bool opt_abort_conf;
|
||||||
extern bool opt_junk_alloc;
|
extern const char *opt_junk;
|
||||||
extern bool opt_junk_free;
|
extern bool opt_junk_alloc;
|
||||||
extern bool opt_utrace;
|
extern bool opt_junk_free;
|
||||||
extern bool opt_xmalloc;
|
extern bool opt_utrace;
|
||||||
extern bool opt_zero;
|
extern bool opt_xmalloc;
|
||||||
extern unsigned opt_narenas;
|
extern bool opt_zero;
|
||||||
|
extern unsigned opt_narenas;
|
||||||
|
|
||||||
/* Number of CPUs. */
|
/* Number of CPUs. */
|
||||||
extern unsigned ncpus;
|
extern unsigned ncpus;
|
||||||
|
|
||||||
/* Number of arenas used for automatic multiplexing of threads and arenas. */
|
/* Number of arenas used for automatic multiplexing of threads and arenas. */
|
||||||
extern unsigned narenas_auto;
|
extern unsigned narenas_auto;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Arenas that are used to service external requests. Not all elements of the
|
* Arenas that are used to service external requests. Not all elements of the
|
||||||
@ -34,18 +35,18 @@ extern atomic_p_t arenas[];
|
|||||||
* pind2sz_tab encodes the same information as could be computed by
|
* pind2sz_tab encodes the same information as could be computed by
|
||||||
* pind2sz_compute().
|
* pind2sz_compute().
|
||||||
*/
|
*/
|
||||||
extern size_t const pind2sz_tab[NPSIZES+1];
|
extern size_t const pind2sz_tab[NPSIZES+1];
|
||||||
/*
|
/*
|
||||||
* index2size_tab encodes the same information as could be computed (at
|
* index2size_tab encodes the same information as could be computed (at
|
||||||
* unacceptable cost in some code paths) by index2size_compute().
|
* unacceptable cost in some code paths) by index2size_compute().
|
||||||
*/
|
*/
|
||||||
extern size_t const index2size_tab[NSIZES];
|
extern size_t const index2size_tab[NSIZES];
|
||||||
/*
|
/*
|
||||||
* size2index_tab is a compact lookup table that rounds request sizes up to
|
* size2index_tab is a compact lookup table that rounds request sizes up to
|
||||||
* size classes. In order to reduce cache footprint, the table is compressed,
|
* size classes. In order to reduce cache footprint, the table is compressed,
|
||||||
* and all accesses are via size2index().
|
* and all accesses are via size2index().
|
||||||
*/
|
*/
|
||||||
extern uint8_t const size2index_tab[];
|
extern uint8_t const size2index_tab[];
|
||||||
|
|
||||||
void *a0malloc(size_t size);
|
void *a0malloc(size_t size);
|
||||||
void a0dalloc(void *ptr);
|
void a0dalloc(void *ptr);
|
||||||
|
@ -76,6 +76,7 @@ CTL_PROTO(config_stats)
|
|||||||
CTL_PROTO(config_utrace)
|
CTL_PROTO(config_utrace)
|
||||||
CTL_PROTO(config_xmalloc)
|
CTL_PROTO(config_xmalloc)
|
||||||
CTL_PROTO(opt_abort)
|
CTL_PROTO(opt_abort)
|
||||||
|
CTL_PROTO(opt_abort_conf)
|
||||||
CTL_PROTO(opt_retain)
|
CTL_PROTO(opt_retain)
|
||||||
CTL_PROTO(opt_dss)
|
CTL_PROTO(opt_dss)
|
||||||
CTL_PROTO(opt_narenas)
|
CTL_PROTO(opt_narenas)
|
||||||
@ -267,6 +268,7 @@ static const ctl_named_node_t config_node[] = {
|
|||||||
|
|
||||||
static const ctl_named_node_t opt_node[] = {
|
static const ctl_named_node_t opt_node[] = {
|
||||||
{NAME("abort"), CTL(opt_abort)},
|
{NAME("abort"), CTL(opt_abort)},
|
||||||
|
{NAME("abort_conf"), CTL(opt_abort_conf)},
|
||||||
{NAME("retain"), CTL(opt_retain)},
|
{NAME("retain"), CTL(opt_retain)},
|
||||||
{NAME("dss"), CTL(opt_dss)},
|
{NAME("dss"), CTL(opt_dss)},
|
||||||
{NAME("narenas"), CTL(opt_narenas)},
|
{NAME("narenas"), CTL(opt_narenas)},
|
||||||
@ -1546,6 +1548,7 @@ CTL_RO_CONFIG_GEN(config_xmalloc, bool)
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
CTL_RO_NL_GEN(opt_abort, opt_abort, bool)
|
CTL_RO_NL_GEN(opt_abort, opt_abort, bool)
|
||||||
|
CTL_RO_NL_GEN(opt_abort_conf, opt_abort_conf, bool)
|
||||||
CTL_RO_NL_GEN(opt_retain, opt_retain, bool)
|
CTL_RO_NL_GEN(opt_retain, opt_retain, bool)
|
||||||
CTL_RO_NL_GEN(opt_dss, opt_dss, const char *)
|
CTL_RO_NL_GEN(opt_dss, opt_dss, const char *)
|
||||||
CTL_RO_NL_GEN(opt_narenas, opt_narenas, unsigned)
|
CTL_RO_NL_GEN(opt_narenas, opt_narenas, unsigned)
|
||||||
|
@ -23,6 +23,13 @@ const char *je_malloc_conf
|
|||||||
#endif
|
#endif
|
||||||
;
|
;
|
||||||
bool opt_abort =
|
bool opt_abort =
|
||||||
|
#ifdef JEMALLOC_DEBUG
|
||||||
|
true
|
||||||
|
#else
|
||||||
|
false
|
||||||
|
#endif
|
||||||
|
;
|
||||||
|
bool opt_abort_conf =
|
||||||
#ifdef JEMALLOC_DEBUG
|
#ifdef JEMALLOC_DEBUG
|
||||||
true
|
true
|
||||||
#else
|
#else
|
||||||
@ -274,6 +281,9 @@ typedef struct {
|
|||||||
# define UTRACE(a, b, c)
|
# define UTRACE(a, b, c)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Whether encountered any invalid config options. */
|
||||||
|
static bool had_conf_error = false;
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
/*
|
/*
|
||||||
* Function prototypes for static functions that are referenced prior to
|
* Function prototypes for static functions that are referenced prior to
|
||||||
@ -847,6 +857,10 @@ malloc_conf_error(const char *msg, const char *k, size_t klen, const char *v,
|
|||||||
size_t vlen) {
|
size_t vlen) {
|
||||||
malloc_printf("<jemalloc>: %s: %.*s:%.*s\n", msg, (int)klen, k,
|
malloc_printf("<jemalloc>: %s: %.*s:%.*s\n", msg, (int)klen, k,
|
||||||
(int)vlen, v);
|
(int)vlen, v);
|
||||||
|
had_conf_error = true;
|
||||||
|
if (opt_abort_conf) {
|
||||||
|
abort();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -1045,6 +1059,10 @@ malloc_conf_init(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CONF_HANDLE_BOOL(opt_abort, "abort")
|
CONF_HANDLE_BOOL(opt_abort, "abort")
|
||||||
|
CONF_HANDLE_BOOL(opt_abort_conf, "abort_conf")
|
||||||
|
if (opt_abort_conf && had_conf_error) {
|
||||||
|
abort();
|
||||||
|
}
|
||||||
CONF_HANDLE_BOOL(opt_retain, "retain")
|
CONF_HANDLE_BOOL(opt_retain, "retain")
|
||||||
if (strncmp("dss", k, klen) == 0) {
|
if (strncmp("dss", k, klen) == 0) {
|
||||||
int i;
|
int i;
|
||||||
|
@ -813,6 +813,7 @@ stats_general_print(void (*write_cb)(void *, const char *), void *cbopaque,
|
|||||||
"Run-time option settings:\n");
|
"Run-time option settings:\n");
|
||||||
}
|
}
|
||||||
OPT_WRITE_BOOL(abort, ",")
|
OPT_WRITE_BOOL(abort, ",")
|
||||||
|
OPT_WRITE_BOOL(abort_conf, ",")
|
||||||
OPT_WRITE_BOOL(retain, ",")
|
OPT_WRITE_BOOL(retain, ",")
|
||||||
OPT_WRITE_CHAR_P(dss, ",")
|
OPT_WRITE_CHAR_P(dss, ",")
|
||||||
OPT_WRITE_UNSIGNED(narenas, ",")
|
OPT_WRITE_UNSIGNED(narenas, ",")
|
||||||
|
Loading…
Reference in New Issue
Block a user