From owner-svn-src-stable-12@freebsd.org Thu May 28 01:53:36 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9EF122F8037; Thu, 28 May 2020 01:53:36 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49XW283hkGz4ZG8; Thu, 28 May 2020 01:53:36 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 79CE81E478; Thu, 28 May 2020 01:53:36 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04S1raRV039400; Thu, 28 May 2020 01:53:36 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04S1rZBq039396; Thu, 28 May 2020 01:53:35 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202005280153.04S1rZBq039396@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 28 May 2020 01:53:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r361569 - in stable/12: include lib/libc/gen X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/12: include lib/libc/gen X-SVN-Commit-Revision: 361569 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2020 01:53:36 -0000 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 +__FBSDID("$FreeBSD$"); + +#include +#include + +void * +memalign(size_t align, size_t size) +{ + return (aligned_alloc(align, roundup(size, align))); +}