Merge tag '1.4' into since

Version 1.4

1 files changed, 75 insertions, 0 deletions

diff --git a/pvalloczn.c b/pvalloczn.c
new file mode 100644
index 0000000..b586863
--- /dev/null
+++ b/pvalloczn.c
@@ -0,0 +1,75 @@
+/* See LICENSE file for copyright and license details. */
+#include "common.h"
+#ifndef TEST
+
+
+extern inline void *libsimple_pvalloczn(int, size_t, ...);
+
+
+#else
+#include "test.h"
+
+int
+main(void)
+{
+	struct allocinfo *volatile info;
+	void *ptr;
+	DEFINE_PAGESIZE;
+	DEFINE_CACHELINE;
+
+	assert((ptr = libsimple_pvalloczn(1, 3 * pagesize - 1, 2, 0)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 6 * pagesize);
+		ASSERT_ALIGNMENT(info, pagesize);
+		assert(info->zeroed == 6 * pagesize);
+		assert(!((uintptr_t)ptr % (uintptr_t)info->alignment));
+	}
+	free(ptr);
+	ptr = NULL;
+
+	assert((ptr = libsimple_pvalloczn(0, 4 * pagesize - 1, 2, 0)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 8 * pagesize);
+		ASSERT_ALIGNMENT(info, pagesize);
+		assert(!info->zeroed);
+		assert(!((uintptr_t)ptr % (uintptr_t)info->alignment));
+	}
+	free(ptr);
+	ptr = NULL;
+
+	assert(!libsimple_pvalloczn(0, 0) && errno == EINVAL);
+	errno = 0;
+	assert(!libsimple_pvalloczn(1, 0) && errno == EINVAL);
+	errno = 0;
+
+	assert(!libsimple_pvalloczn(0, SIZE_MAX, 2, 0) && errno == ENOMEM);
+	errno = 0;
+	assert(!libsimple_pvalloczn(1, SIZE_MAX, 2, 0) && errno == ENOMEM);
+	errno = 0;
+
+	assert((ptr = libsimple_pvalloczn(0, 9, 9, pagesize - 1, 0)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 81 * pagesize);
+		ASSERT_ALIGNMENT(info, pagesize);
+		assert(!info->zeroed);
+		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
+	}
+	free(ptr);
+
+	assert((ptr = libsimple_pvalloczn(1, 9, 8, pagesize - 2, 0)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(ptr)));
+		assert(info->size == 72 * pagesize);
+		ASSERT_ALIGNMENT(info, pagesize);
+		assert(info->zeroed == info->size);
+		assert(!((uintptr_t)ptr % (uintptr_t)(info->alignment)));
+	}
+	free(ptr);
+
+	return 0;
+}
+
+#endif