[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:
@@ -9,6 +9,7 @@ extern "C" {
|
||||
typedef enum {
|
||||
FSAM_READ = (1 << 0), /**< Read access */
|
||||
FSAM_WRITE = (1 << 1), /**< Write access */
|
||||
FSAM_READ_WRITE = FSAM_READ | FSAM_WRITE, /**< Read and write access */
|
||||
} FS_AccessMode;
|
||||
|
||||
/** Open mode flags */
|
||||
|
@@ -143,7 +143,7 @@ static void storage_cli_read(Cli* cli, string_t path) {
|
||||
if(storage_file_open(file, string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
|
||||
const uint16_t read_size = 128;
|
||||
uint16_t readed_size = 0;
|
||||
uint8_t* data = furi_alloc(read_size);
|
||||
uint8_t* data = malloc(read_size);
|
||||
|
||||
printf("Size: %lu\r\n", (uint32_t)storage_file_size(file));
|
||||
|
||||
@@ -171,7 +171,7 @@ static void storage_cli_write(Cli* cli, string_t path) {
|
||||
File* file = storage_file_alloc(api);
|
||||
|
||||
const uint16_t buffer_size = 512;
|
||||
uint8_t* buffer = furi_alloc(buffer_size);
|
||||
uint8_t* buffer = malloc(buffer_size);
|
||||
|
||||
if(storage_file_open(file, string_get_cstr(path), FSAM_WRITE, FSOM_OPEN_APPEND)) {
|
||||
printf("Just write your text data. New line by Ctrl+Enter, exit by Ctrl+C.\r\n");
|
||||
@@ -230,7 +230,7 @@ static void storage_cli_read_chunks(Cli* cli, string_t path, string_t args) {
|
||||
if(parsed_count == EOF || parsed_count != 1) {
|
||||
storage_cli_print_usage();
|
||||
} else if(storage_file_open(file, string_get_cstr(path), FSAM_READ, FSOM_OPEN_EXISTING)) {
|
||||
uint8_t* data = furi_alloc(buffer_size);
|
||||
uint8_t* data = malloc(buffer_size);
|
||||
uint64_t file_size = storage_file_size(file);
|
||||
|
||||
printf("Size: %lu\r\n", (uint32_t)file_size);
|
||||
@@ -271,7 +271,7 @@ static void storage_cli_write_chunk(Cli* cli, string_t path, string_t args) {
|
||||
if(storage_file_open(file, string_get_cstr(path), FSAM_WRITE, FSOM_OPEN_APPEND)) {
|
||||
printf("Ready\r\n");
|
||||
|
||||
uint8_t* buffer = furi_alloc(buffer_size);
|
||||
uint8_t* buffer = malloc(buffer_size);
|
||||
|
||||
for(uint32_t i = 0; i < buffer_size; i++) {
|
||||
buffer[i] = cli_getc(cli);
|
||||
|
@@ -372,7 +372,7 @@ FS_Error storage_sd_status(Storage* storage) {
|
||||
}
|
||||
|
||||
File* storage_file_alloc(Storage* storage) {
|
||||
File* file = furi_alloc(sizeof(File));
|
||||
File* file = malloc(sizeof(File));
|
||||
file->file_id = FILE_CLOSED;
|
||||
file->storage = storage;
|
||||
|
||||
@@ -407,7 +407,7 @@ bool storage_simply_remove_recursive(Storage* storage, const char* path) {
|
||||
return true;
|
||||
}
|
||||
|
||||
char* name = furi_alloc(MAX_NAME_LENGTH + 1);
|
||||
char* name = malloc(MAX_NAME_LENGTH + 1);
|
||||
File* dir = storage_file_alloc(storage);
|
||||
string_init_set_str(cur_dir, path);
|
||||
bool go_deeper = false;
|
||||
|
@@ -338,4 +338,4 @@ int32_t storage_test_app(void* p) {
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
@@ -512,7 +512,7 @@ static FS_Error storage_ext_common_fs_info(
|
||||
/******************* Init Storage *******************/
|
||||
|
||||
void storage_ext_init(StorageData* storage) {
|
||||
SDData* sd_data = furi_alloc(sizeof(SDData));
|
||||
SDData* sd_data = malloc(sizeof(SDData));
|
||||
sd_data->fs = &USERFatFS;
|
||||
sd_data->path = "0:/";
|
||||
sd_data->sd_was_present = true;
|
||||
|
@@ -18,14 +18,14 @@ typedef struct {
|
||||
} LFSHandle;
|
||||
|
||||
static LFSHandle* lfs_handle_alloc_file() {
|
||||
LFSHandle* handle = furi_alloc(sizeof(LFSHandle));
|
||||
handle->data = furi_alloc(sizeof(lfs_file_t));
|
||||
LFSHandle* handle = malloc(sizeof(LFSHandle));
|
||||
handle->data = malloc(sizeof(lfs_file_t));
|
||||
return handle;
|
||||
}
|
||||
|
||||
static LFSHandle* lfs_handle_alloc_dir() {
|
||||
LFSHandle* handle = furi_alloc(sizeof(LFSHandle));
|
||||
handle->data = furi_alloc(sizeof(lfs_dir_t));
|
||||
LFSHandle* handle = malloc(sizeof(LFSHandle));
|
||||
handle->data = malloc(sizeof(lfs_dir_t));
|
||||
return handle;
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ static int storage_int_device_sync(const struct lfs_config* c) {
|
||||
}
|
||||
|
||||
static LFSData* storage_int_lfs_data_alloc() {
|
||||
LFSData* lfs_data = furi_alloc(sizeof(LFSData));
|
||||
LFSData* lfs_data = malloc(sizeof(LFSData));
|
||||
|
||||
// Internal storage start address
|
||||
*(size_t*)(&lfs_data->start_address) = furi_hal_flash_get_free_page_start_address();
|
||||
|
Reference in New Issue
Block a user