Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

umm_heap/valloc: support valloc (LEGACY) #2906

Merged
merged 2 commits into from Feb 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions include/stdlib.h
Expand Up @@ -200,6 +200,7 @@ size_t wcstombs(FAR char *dst, FAR const wchar_t *src, size_t len);
/* Memory Management */

FAR void *malloc(size_t);
FAR void *valloc(size_t);
void free(FAR void *);
FAR void *realloc(FAR void *, size_t);
FAR void *memalign(size_t, size_t);
Expand Down
4 changes: 2 additions & 2 deletions libs/libc/stdlib/Make.defs
Expand Up @@ -20,10 +20,10 @@

# Add the stdlib C files to the build

CSRCS += lib_abs.c lib_abort.c lib_aligned_alloc.c lib_atof.c lib_atoi.c
CSRCS += lib_abs.c lib_abort.c lib_atof.c lib_atoi.c
CSRCS += lib_atol.c lib_atoll.c lib_div.c lib_ldiv.c lib_lldiv.c lib_Exit.c
CSRCS += lib_itoa.c lib_labs.c lib_llabs.c lib_realpath.c lib_bsearch.c
CSRCS += lib_rand.c lib_posix_memalign.c lib_qsort.c lib_srand.c lib_strtol.c
CSRCS += lib_rand.c lib_qsort.c lib_srand.c lib_strtol.c
CSRCS += lib_strtoll.c lib_strtoul.c lib_strtoull.c lib_strtod.c lib_strtof.c
CSRCS += lib_strtold.c lib_checkbase.c lib_mktemp.c lib_mkstemp.c lib_mkdtemp.c

Expand Down
2 changes: 1 addition & 1 deletion mm/umm_heap/Make.defs
Expand Up @@ -23,7 +23,7 @@
CSRCS += umm_initialize.c umm_addregion.c umm_sem.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
CSRCS += umm_globals.c umm_valloc.c umm_aligned_alloc.c umm_posix_memalign.c

ifeq ($(CONFIG_BUILD_KERNEL),y)
CSRCS += umm_sbrk.c
Expand Down
@@ -1,5 +1,5 @@
/****************************************************************************
* libs/libc/stdlib/lib_aligned_alloc.c
* 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
Expand All @@ -22,13 +22,13 @@
* Included Files
****************************************************************************/

#include <libc.h>
#include <stdlib.h>

/****************************************************************************
* Public Functions
****************************************************************************/

FAR void *aligned_alloc(size_t align, size_t size)
{
return lib_memalign(align, size);
return memalign(align, size);
}
@@ -1,5 +1,5 @@
/****************************************************************************
* libs/libc/stdlib/lib_posix_memalign.c
* 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
Expand Down
53 changes: 53 additions & 0 deletions mm/umm_heap/umm_valloc.c
@@ -0,0 +1,53 @@
/****************************************************************************
* 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);
}