Reorganize heap context related elements #2500
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Moved global context's `JMEM_HEAP_SIZE` to jcontext.h as external context's heap size is declared there, too. - Moved the assert on `jmem_heap_t` vs `JMEM_HEAP_SIZE` to jcontext.c, as both entities are declared in the corresponding header. - Removed superfluous checks on `JMEM_HEAP_SIZE` as it is not a publicly configurable macro (opposed to `CONFIG_MEM_HEAP_AREA_SIZE`). - Ensured that all definitions of and references to `jmem_heap_t`, `JERRY_HEAP_CONTEXT`, `JERRY_HEAP_SIZE`, and `JERRY_HEAP_AREA_SIZE` are guarded by `#ifndef JERRY_SYSTEM_ALLOCATOR`, as they are meaningless if the system allocator is used. The commit also contains some stylistic changes in jcontext.h JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
|
Part of the context rework PR series, follow-up to #2498. |
zherczeg
approved these changes
Aug 31, 2018
| * Check size of heap is corresponding to configuration | ||
| */ | ||
| JERRY_STATIC_ASSERT (sizeof (jmem_heap_t) <= JMEM_HEAP_SIZE, | ||
| size_of_mem_heap_must_be_less_than_or_equal_to_JMEM_HEAP_SIZE); |
There was a problem hiding this comment.
I think we use lowercase everywhere.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JMEM_HEAP_SIZEto jcontext.h as externalcontext's heap size is declared there, too.
jmem_heap_tvsJMEM_HEAP_SIZEto jcontext.c,as both entities are declared in the corresponding header.
JMEM_HEAP_SIZEas it is not apublicly configurable macro (opposed to
CONFIG_MEM_HEAP_AREA_SIZE).jmem_heap_t,JERRY_HEAP_CONTEXT,JERRY_HEAP_SIZE, andJERRY_HEAP_AREA_SIZEare guarded by
#ifndef JERRY_SYSTEM_ALLOCATOR, as they aremeaningless if the system allocator is used.
The commit also contains some stylistic changes in jcontext.h
JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu