[FL-2274] Inventing streams and moving FFF to them (#981)
* Streams: string stream * String stream: updated insert/delete api * Streams: generic stream interface and string stream implementation * Streams: helpers for insert and delete_and_insert * FFF: now compatible with streams * MinUnit: introduced tests with arguments * FFF: stream access violation * Streams: copy data between streams * Streams: file stream * FFF: documentation * FFStream: documentation * FFF: alloc as file * MinUnit: support for nested tests * Streams: changed delete_and_insert, now it returns success flag. Added ability dump stream inner parameters and data to cout. * FFF: simplified file open function * Streams: unit tests * FFF: tests * Streams: declare cache_size constant as define, to allow variable modified arrays * FFF: lib moved to a separate folder * iButton: new FFF * RFID: new FFF * Animations: new FFF * IR: new FFF * NFC: new FFF * Flipper file format: delete lib * U2F: new FFF * Subghz: new FFF and streams * Streams: read line * Streams: split * FuriCore: implement memset with extra asserts * FuriCore: implement extra heap asserts without inventing memset * Scene manager: protected access to the scene id stack with a size check * NFC worker: dirty fix for issue where hal_nfc was busy on app start * Furi: update allocator to erase memory on allocation. Replace furi_alloc with malloc. * FuriCore: cleanup memmgr code. * Furi HAL: furi_hal_init is split into critical and non-critical parts. The critical part is currently clock and console. * Memmgr: added ability to track allocations and deallocations through console. * FFStream: some speedup * Streams, FF: minor fixes * Tests: restore * File stream: a slightly more thread-safe version of file_stream_delete_and_insert Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
@@ -20,26 +20,17 @@ void* realloc(void* ptr, size_t size) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void* p;
|
||||
p = pvPortMalloc(size);
|
||||
if(p) {
|
||||
// TODO implement secure realloc
|
||||
// insecure, but will do job in our case
|
||||
if(ptr != NULL) {
|
||||
memcpy(p, ptr, size);
|
||||
vPortFree(ptr);
|
||||
}
|
||||
void* p = pvPortMalloc(size);
|
||||
if(ptr != NULL) {
|
||||
memcpy(p, ptr, size);
|
||||
vPortFree(ptr);
|
||||
}
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
void* calloc(size_t count, size_t size) {
|
||||
void* ptr = pvPortMalloc(count * size);
|
||||
if(ptr) {
|
||||
// zero the memory
|
||||
memset(ptr, 0, count * size);
|
||||
}
|
||||
return ptr;
|
||||
return pvPortMalloc(count * size);
|
||||
}
|
||||
|
||||
char* strdup(const char* s) {
|
||||
@@ -49,13 +40,8 @@ char* strdup(const char* s) {
|
||||
}
|
||||
|
||||
size_t siz = strlen(s) + 1;
|
||||
char* y = malloc(siz);
|
||||
|
||||
if(y != NULL) {
|
||||
memcpy(y, s, siz);
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
char* y = pvPortMalloc(siz);
|
||||
memcpy(y, s, siz);
|
||||
|
||||
return y;
|
||||
}
|
||||
@@ -68,27 +54,18 @@ size_t memmgr_get_minimum_free_heap(void) {
|
||||
return xPortGetMinimumEverFreeHeapSize();
|
||||
}
|
||||
|
||||
void* furi_alloc(size_t size) {
|
||||
void* p = malloc(size);
|
||||
furi_check(p);
|
||||
return memset(p, 0, size);
|
||||
}
|
||||
|
||||
void* __wrap__malloc_r(struct _reent* r, size_t size) {
|
||||
void* pointer = malloc(size);
|
||||
return pointer;
|
||||
return pvPortMalloc(size);
|
||||
}
|
||||
|
||||
void __wrap__free_r(struct _reent* r, void* ptr) {
|
||||
free(ptr);
|
||||
vPortFree(ptr);
|
||||
}
|
||||
|
||||
void* __wrap__calloc_r(struct _reent* r, size_t count, size_t size) {
|
||||
void* pointer = calloc(count, size);
|
||||
return pointer;
|
||||
return calloc(count, size);
|
||||
}
|
||||
|
||||
void* __wrap__realloc_r(struct _reent* r, void* ptr, size_t size) {
|
||||
void* pointer = realloc(ptr, size);
|
||||
return pointer;
|
||||
}
|
||||
return realloc(ptr, size);
|
||||
}
|
||||
|
Reference in New Issue
Block a user