GeezerVison

Copy link

Copy Markdown

Collaborator

Riksu9000, minacode, FintasticMan, and Tiggilyboo reacted with thumbs up emoji

Riksu9000 reviewed Mar 26, 2023

View reviewed changes

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

FintasticMan reviewed Mar 26, 2023

View reviewed changes

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

FintasticMan reviewed Apr 9, 2023

View reviewed changes

…InfiniTime#1709).

Since FreeRTOS.h, portmacro_cmsis.h and task.h are now built in C (by lv_mem.c), I had to change some includes and declarations to make them compatible with a C compiler.

Integrating the new memory management from InfiniTime in InfiniSim is not easy because InfiniSim does not include the whole FreeRTOS. Which means that, for example, pvPortMalloc() and vPortFree() are not accessible from InfiniSim.
As a first step, I provided custom implementations for pvPortMalloc(), vPortFree() which are based on ... malloc(). These function keep track of the memory that is currently allocated so that xPortGetFreeHeapSize(), xPortGetMinimumEverFreeHeapSize() return something.

Not that this implementation do not keep track of all the memory allocations done in InfiniTime. It can only "see" those done via pvPortMalloc(). It means that the available memory displayed by InfiniSim will probably be very optimistic.

FintasticMan approved these changes Apr 10, 2023

View reviewed changes

Riksu9000 approved these changes Apr 11, 2023

View reviewed changes

…InfiniTime#1709).

Since FreeRTOS.h, portmacro_cmsis.h and task.h are now built in C (by lv_mem.c), I had to change some includes and declarations to make them compatible with a C compiler.

Integrating the new memory management from InfiniTime in InfiniSim is not easy because InfiniSim does not include the whole FreeRTOS. Which means that, for example, pvPortMalloc() and vPortFree() are not accessible from InfiniSim.
As a first step, I provided custom implementations for pvPortMalloc(), vPortFree() which are based on ... malloc(). These function keep track of the memory that is currently allocated so that xPortGetFreeHeapSize(), xPortGetMinimumEverFreeHeapSize() return something.

Not that this implementation do not keep track of all the memory allocations done in InfiniTime. It can only "see" those done via pvPortMalloc(). It means that the available memory displayed by InfiniSim will probably be very optimistic.

…InfiniTime#1709).

Since FreeRTOS.h, portmacro_cmsis.h and task.h are now built in C (by lv_mem.c), I had to change some includes and declarations to make them compatible with a C compiler.

Integrating the new memory management from InfiniTime in InfiniSim is not easy because InfiniSim does not include the whole FreeRTOS. Which means that, for example, pvPortMalloc() and vPortFree() are not accessible from InfiniSim.
As a first step, I provided custom implementations for pvPortMalloc(), vPortFree() which are based on ... malloc(). These function keep track of the memory that is currently allocated so that xPortGetFreeHeapSize(), xPortGetMinimumEverFreeHeapSize() return something.

Not that this implementation do not keep track of all the memory allocations done in InfiniTime. It can only "see" those done via pvPortMalloc(). It means that the available memory displayed by InfiniSim will probably be very optimistic.

commit ec1eef8
Author: Jean-François Milants <[email protected]>
Date:   Sun Apr 9 10:46:55 2023 +0200

    Fix code formatting

commit e278a58
Author: Jean-François Milants <[email protected]>
Date:   Sat Apr 8 15:30:14 2023 +0200

    Refactor pvPortRealloc() to improve readability.

commit 98dc772
Merge: 87e8c9b 0a4f015
Author: Riku Isokoski <[email protected]>
Date:   Sun Mar 26 20:00:48 2023 +0300

    Merge branch 'main' into heap-unification

commit 87e8c9b
Author: Jean-François Milants <[email protected]>
Date:   Sun Mar 26 14:53:34 2023 +0200

    Enable malloc error and stack overflow error detection in FreeRTOS. Count them and display them in the SystemInfo app.

commit 36b69de
Author: Jean-François Milants <[email protected]>
Date:   Sun Mar 26 14:49:03 2023 +0200

    Unify all heaps (stdlib + LVGL + FreeRTOS) into a single heap managed by FreeRTOS and heap_4_infinitime.c.

    LVGL supports custom implementation of malloc() and free() so using pvPortMalloc() and vPortFree() is just a matter of setting the right variables.

    Other libraries (NimBLE, LittleFS) and InfiniTime code (new) call malloc() and free() from stdlib. InfiniTime now provides the file stdlib.c that provides a custom implementation for malloc(), free(), calloc() and realloc(). This ensures that all calls to the standard allocator are redirected to the FreeRTOS memory manager.

    Note that realloc() is needed by NimBLE.

commit 2edd2f8
Author: Jean-François Milants <[email protected]>
Date:   Sun Mar 26 14:31:59 2023 +0200

    Add pvPortRealloc() in heap_4_infinitime.c. An implementation of realloc() is needed by NimBLE.

commit 561ee75
Author: Jean-François Milants <[email protected]>
Date:   Sun Mar 26 14:21:35 2023 +0200

    Copy the memory manager heap_4.c from the FreeRTOS distribution to the InfiniTime project codebase. This will allow to implement custom functionalities that are not available in the original implementation.

FintasticMan deleted the heap-unification branch August 3, 2023 11:29