Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-03-10 12:09:33 -08:00
parent c7c19c1259 c557557e4a
commit 20894b4487
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/libspl/include/umem.h
View File

@ -37,6 +37,7 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -82,9 +83,30 @@ umem_alloc(size_t size, int flags)
{ {
void *ptr; void *ptr;
ptr = malloc(size); do {
while (ptr == NULL && (flags & UMEM_NOFAIL))
ptr = malloc(size); ptr = malloc(size);
} while (ptr == NULL && (flags & UMEM_NOFAIL));
return ptr;
}
static inline void *
umem_alloc_aligned(size_t size, size_t align, int flags)
{
void *ptr;
int rc;
do {
rc = posix_memalign(&ptr, align, size);
} while (rc == ENOMEM && (flags & UMEM_NOFAIL));
if (rc == EINVAL) {
fprintf(stderr, "%s: invalid memory alignment (%zd)\n",
__func__, align);
if (flags & UMEM_NOFAIL)
abort();
return NULL;
}
return ptr; return ptr;
} }
@ -146,7 +168,11 @@ umem_cache_alloc(umem_cache_t *cp, int flags)
{ {
void *ptr; void *ptr;
ptr = umem_alloc(cp->cache_bufsize, flags); if (cp->cache_align != 0)
ptr = umem_alloc_aligned(cp->cache_bufsize, cp->cache_align, flags);
else
ptr = umem_alloc(cp->cache_bufsize, flags);
if (ptr && cp->cache_constructor) if (ptr && cp->cache_constructor)
cp->cache_constructor(ptr, cp->cache_private, UMEM_DEFAULT); cp->cache_constructor(ptr, cp->cache_private, UMEM_DEFAULT);