diff options
Diffstat (limited to 'usr/src/lib/libumem/common/umem.c')
| -rw-r--r-- | usr/src/lib/libumem/common/umem.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/lib/libumem/common/umem.c b/usr/src/lib/libumem/common/umem.c index 00028e5f80..dbc738a049 100644 --- a/usr/src/lib/libumem/common/umem.c +++ b/usr/src/lib/libumem/common/umem.c @@ -26,6 +26,7 @@ /* * Copyright (c) 2014 Joyent, Inc. All rights reserved. + * Copyright (c) 2015 by Delphix. All rights reserved. */ /* @@ -1234,6 +1235,9 @@ umem_alloc_retry(umem_cache_t *cp, int umflag) * Initialization failed. Do normal failure processing. */ } + if (umem_flags & UMF_CHECKNULL) { + umem_err_recoverable("umem: out of heap space"); + } if (umflag & UMEM_NOFAIL) { int def_result = UMEM_CALLBACK_EXIT(255); int result = def_result; @@ -1377,7 +1381,7 @@ umem_log_enter(umem_log_header_t *lhp, void *data, size_t size) static void umem_log_event(umem_log_header_t *lp, umem_cache_t *cp, - umem_slab_t *sp, void *addr) + umem_slab_t *sp, void *addr) { umem_bufctl_audit_t *bcp; UMEM_LOCAL_BUFCTL_AUDIT(&bcp); |