Module heap api #10141
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,22 +110,22 @@ int module_init(struct processing_module *mod) | |
| return 0; | ||
| } | ||
|
|
||
| void *mod_alloc(struct processing_module *mod, uint32_t size, uint32_t alignment) | ||
| { | ||
| struct comp_dev *dev = mod->dev; | ||
| struct module_memory *container; | ||
| void *ptr; | ||
|
|
||
| if (!size) { | ||
| comp_err(dev, "mod_alloc: requested allocation of 0 bytes."); | ||
|
Collaborator
There was a problem hiding this comment. Do we really need to include the function name in the error message? Zephyr automatically prefixes log entries with the function name.
Contributor
Author
There was a problem hiding this comment. No, but I do not want to mess with this commit that is strictly replace-string operation on the source tree. Maybe I should go through all our modules in another commit, in the next PR.
Member
There was a problem hiding this comment. actually, now that we are Zephyr only, we should use
Collaborator
There was a problem hiding this comment. @lgirdwood didn't we already conclude that no, we want to keep audio specific macros for audio codes that add audio topology information (component and pipe ids) to the log messages. For generic code outside modules, using plain Zephyr LOG is then ok (when not in module context). |
||
| return NULL; | ||
| } | ||
|
|
||
| /* Allocate memory container */ | ||
| container = rzalloc(SOF_MEM_FLAG_USER, | ||
| sizeof(struct module_memory)); | ||
| if (!container) { | ||
| comp_err(dev, "mod_alloc: failed to allocate memory container."); | ||
| return NULL; | ||
| } | ||
|
|
||
|
|
@@ -136,7 +136,7 @@ void *module_allocate_memory(struct processing_module *mod, uint32_t size, uint3 | |
| ptr = rballoc(SOF_MEM_FLAG_USER, size); | ||
|
|
||
| if (!ptr) { | ||
| comp_err(dev, "mod_alloc: failed to allocate memory for comp %x.", | ||
| dev_comp_id(dev)); | ||
|
jsarha marked this conversation as resolved.
|
||
| return NULL; | ||
| } | ||
|
|
@@ -146,8 +146,9 @@ void *module_allocate_memory(struct processing_module *mod, uint32_t size, uint3 | |
|
|
||
| return ptr; | ||
| } | ||
| EXPORT_SYMBOL(mod_alloc); | ||
|
|
||
| int mod_free(struct processing_module *mod, void *ptr) | ||
| { | ||
| struct module_memory *mem; | ||
| struct list_item *mem_list; | ||
|
|
@@ -167,11 +168,12 @@ int module_free_memory(struct processing_module *mod, void *ptr) | |
| } | ||
| } | ||
|
|
||
| comp_err(mod->dev, "mod_free: error: could not find memory pointed by %p", | ||
| ptr); | ||
|
|
||
| return -EINVAL; | ||
| } | ||
| EXPORT_SYMBOL(mod_free); | ||
|
|
||
| int module_prepare(struct processing_module *mod, | ||
| struct sof_source **sources, int num_of_sources, | ||
|
|
||
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
commit doesn't say why these are renamed. Just to make them shorter?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, simply to make the names shorter and not to trigger line wrapping storm all around the place when all modules are changed to use module API for memory allocations.