svn commit: r361569 - in stable/12: include lib/libc/gen
Konstantin Belousov
kib at FreeBSD.org
Thu May 28 01:53:36 UTC 2020
Author: kib
Date: Thu May 28 01:53:35 2020
New Revision: 361569
URL: https://svnweb.freebsd.org/changeset/base/361569
Log:
MFC r361060:
Add memalign(3).
Added:
stable/12/lib/libc/gen/memalign.c
- copied unchanged from r361060, head/lib/libc/gen/memalign.c
Modified:
stable/12/include/malloc_np.h
stable/12/lib/libc/gen/Makefile.inc
stable/12/lib/libc/gen/Symbol.map
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/include/malloc_np.h
==============================================================================
--- stable/12/include/malloc_np.h Thu May 28 00:49:02 2020 (r361568)
+++ stable/12/include/malloc_np.h Thu May 28 01:53:35 2020 (r361569)
@@ -122,6 +122,9 @@ size_t __sallocx(const void *ptr, int flags);
void __dallocx(void *ptr, int flags);
void __sdallocx(void *ptr, size_t size, int flags);
size_t __nallocx(size_t size, int flags);
+
+void *memalign(size_t, size_t) __malloc_like __alloc_align(1)
+ __alloc_size(2);
__END_DECLS
#undef __MyBool
Modified: stable/12/lib/libc/gen/Makefile.inc
==============================================================================
--- stable/12/lib/libc/gen/Makefile.inc Thu May 28 00:49:02 2020 (r361568)
+++ stable/12/lib/libc/gen/Makefile.inc Thu May 28 01:53:35 2020 (r361569)
@@ -90,6 +90,7 @@ SRCS+= __getosreldate.c \
libc_dlopen.c \
lockf.c \
lrand48.c \
+ memalign.c \
mrand48.c \
nftw.c \
nice.c \
Modified: stable/12/lib/libc/gen/Symbol.map
==============================================================================
--- stable/12/lib/libc/gen/Symbol.map Thu May 28 00:49:02 2020 (r361568)
+++ stable/12/lib/libc/gen/Symbol.map Thu May 28 01:53:35 2020 (r361569)
@@ -423,6 +423,7 @@ FBSD_1.5 {
};
FBSD_1.6 {
+ memalign;
sigandset;
sigisemptyset;
sigorset;
Copied: stable/12/lib/libc/gen/memalign.c (from r361060, head/lib/libc/gen/memalign.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/12/lib/libc/gen/memalign.c Thu May 28 01:53:35 2020 (r361569, copy of r361060, head/lib/libc/gen/memalign.c)
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2020 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Konstantin Belousov
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <stdlib.h>
+
+void *
+memalign(size_t align, size_t size)
+{
+ return (aligned_alloc(align, roundup(size, align)));
+}
More information about the svn-src-stable
mailing list