Merge tag '1.4' into since

Version 1.4

1 files changed, 59 insertions, 0 deletions

diff --git a/enpvallocz.c b/enpvallocz.c
new file mode 100644
index 0000000..40661cc
--- /dev/null
+++ b/enpvallocz.c
@@ -0,0 +1,59 @@
+/* See LICENSE file for copyright and license details. */
+#include "common.h"
+#ifndef TEST
+
+
+extern inline void *libsimple_enpvallocz(int, int, size_t);
+
+
+#else
+#include "test.h"
+
+int
+main(void)
+{
+	struct allocinfo *volatile info;
+	void *ptr;
+	DEFINE_PAGESIZE;
+	DEFINE_CACHELINE;
+
+	assert((ptr = libsimple_enpvallocz(1, 1, 5 * pagesize - 1)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 5 * pagesize);
+		ASSERT_ALIGNMENT(info, pagesize);
+		assert(info->zeroed == info->size);
+		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
+	}
+	free(ptr);
+	ptr = NULL;
+
+	assert((ptr = libsimple_enpvallocz(1, 0, pagesize - 1)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == pagesize);
+		ASSERT_ALIGNMENT(info, pagesize);
+		assert(!info->zeroed);
+		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
+	}
+	free(ptr);
+	ptr = NULL;
+
+	if (have_custom_malloc()) {
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_enpvallocz(3, 1, 4));
+		assert(exit_status == 3);
+		assert_stderr("%s: libsimple_vmemalloc: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_enpvallocz(5, 0, 4));
+		assert(exit_status == 5);
+		assert_stderr("%s: libsimple_vmemalloc: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+	}
+
+	return 0;
+}
+
+#endif