mirror of
https://github.com/apache/nuttx.git
synced 2026-06-05 07:12:54 +08:00
Move aligned_alloc, posix_memalign and valloc from mm/umm to libs/libc/stdlib
since the similar functions(e.g. strdup/strndup) put into libs/libc/string Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com> Change-Id: Ifb2c0c51298b09014748e5ee8275db51213d6911
This commit is contained in:
committed by
David Sidrane
parent
1d0ade6fa2
commit
187538c0b9
@@ -20,10 +20,9 @@
|
||||
|
||||
# User heap allocator
|
||||
|
||||
CSRCS += umm_initialize.c umm_addregion.c
|
||||
CSRCS += umm_globals.c umm_initialize.c umm_addregion.c
|
||||
CSRCS += umm_brkaddr.c umm_calloc.c umm_extend.c umm_free.c umm_mallinfo.c
|
||||
CSRCS += umm_malloc.c umm_memalign.c umm_realloc.c umm_zalloc.c umm_heapmember.c
|
||||
CSRCS += umm_globals.c umm_valloc.c umm_aligned_alloc.c umm_posix_memalign.c
|
||||
|
||||
ifeq ($(CONFIG_BUILD_KERNEL),y)
|
||||
CSRCS += umm_sbrk.c
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
/****************************************************************************
|
||||
* mm/umm_heap/umm_aligned_alloc.c
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership. The
|
||||
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance with the
|
||||
* License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
FAR void *aligned_alloc(size_t align, size_t size)
|
||||
{
|
||||
return memalign(align, size);
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
/****************************************************************************
|
||||
* mm/umm_heap/umm_posix_memalign.c
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership. The
|
||||
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance with the
|
||||
* License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
int posix_memalign(FAR void **mem, size_t align, size_t size)
|
||||
{
|
||||
*mem = memalign(align, size);
|
||||
return *mem ? OK : ENOMEM;
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
/****************************************************************************
|
||||
* mm/umm_heap/umm_valloc.c
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership. The
|
||||
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance with the
|
||||
* License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: valloc
|
||||
*
|
||||
* Description:
|
||||
* valloc - page-aligned memory allocator (OBSOLETE/LEGACY)
|
||||
*
|
||||
* valloc has the same effect as malloc(), except that the allocated
|
||||
* memory is aligned to a page boundary.
|
||||
*
|
||||
* Input Parameters:
|
||||
* size - Specifies the size (in bytes) of the allocated block of memory.
|
||||
* If size is zero, a unique pointer to the heap is returned.
|
||||
*
|
||||
* Returned Value:
|
||||
* The address of the allocated memory (NULL on failure to allocate)
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
FAR void *valloc(size_t size)
|
||||
{
|
||||
return memalign(sysconf(_SC_PAGESIZE), size);
|
||||
}
|
||||
Reference in New Issue
Block a user