[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
#include "../storage-settings.h"
|
|
|
|
|
|
|
|
#define BENCH_DATA_SIZE 4096
|
|
|
|
#define BENCH_COUNT 6
|
|
|
|
#define BENCH_REPEATS 4
|
|
|
|
#define BENCH_FILE "/ext/rwfiletest.bin"
|
|
|
|
|
|
|
|
static void
|
|
|
|
storage_settings_scene_benchmark_dialog_callback(DialogExResult result, void* context) {
|
|
|
|
StorageSettings* app = context;
|
|
|
|
|
|
|
|
view_dispatcher_send_custom_event(app->view_dispatcher, result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_settings_bench_write(
|
|
|
|
Storage* api,
|
|
|
|
uint16_t size,
|
|
|
|
const uint8_t* data,
|
|
|
|
uint32_t* speed) {
|
|
|
|
File* file = storage_file_alloc(api);
|
|
|
|
bool result = true;
|
|
|
|
if(storage_file_open(file, BENCH_FILE, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
|
|
|
|
uint32_t ticks;
|
|
|
|
ticks = osKernelGetTickCount();
|
|
|
|
|
|
|
|
for(size_t repeat = 0; repeat < BENCH_REPEATS; repeat++) {
|
|
|
|
for(size_t i = 0; i < BENCH_DATA_SIZE / size; i++) {
|
|
|
|
if(storage_file_write(file, (data + i * size), size) != size) {
|
|
|
|
result = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ticks = osKernelGetTickCount() - ticks;
|
|
|
|
*speed = BENCH_DATA_SIZE * osKernelGetTickFreq() * BENCH_REPEATS;
|
|
|
|
*speed /= ticks;
|
|
|
|
*speed /= 1024;
|
|
|
|
}
|
|
|
|
storage_file_close(file);
|
|
|
|
storage_file_free(file);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
storage_settings_bench_read(Storage* api, uint16_t size, uint8_t* data, uint32_t* speed) {
|
|
|
|
File* file = storage_file_alloc(api);
|
|
|
|
bool result = true;
|
|
|
|
*speed = -1;
|
|
|
|
|
|
|
|
if(storage_file_open(file, BENCH_FILE, FSAM_READ, FSOM_OPEN_EXISTING)) {
|
|
|
|
uint32_t ticks;
|
|
|
|
ticks = osKernelGetTickCount();
|
|
|
|
|
|
|
|
for(size_t repeat = 0; repeat < BENCH_REPEATS; repeat++) {
|
|
|
|
for(size_t i = 0; i < BENCH_DATA_SIZE / size; i++) {
|
|
|
|
if(storage_file_read(file, (data + i * size), size) != size) {
|
|
|
|
result = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ticks = osKernelGetTickCount() - ticks;
|
|
|
|
*speed = BENCH_DATA_SIZE * osKernelGetTickFreq() * BENCH_REPEATS;
|
|
|
|
*speed /= ticks;
|
|
|
|
*speed /= 1024;
|
|
|
|
}
|
|
|
|
storage_file_close(file);
|
|
|
|
storage_file_free(file);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void storage_settings_benchmark(StorageSettings* app) {
|
|
|
|
DialogEx* dialog_ex = app->dialog_ex;
|
|
|
|
uint8_t* bench_data;
|
|
|
|
dialog_ex_set_header(dialog_ex, "Preparing data...", 64, 32, AlignCenter, AlignCenter);
|
|
|
|
|
|
|
|
bench_data = malloc(BENCH_DATA_SIZE);
|
|
|
|
for(size_t i = 0; i < BENCH_DATA_SIZE; i++) {
|
|
|
|
bench_data[i] = (uint8_t)i;
|
|
|
|
}
|
|
|
|
|
2021-08-18 22:06:18 +00:00
|
|
|
uint16_t bench_size[BENCH_COUNT] = {1, 8, 32, 256, 512, 1024};
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
uint32_t bench_w_speed[BENCH_COUNT] = {0, 0, 0, 0, 0, 0};
|
|
|
|
uint32_t bench_r_speed[BENCH_COUNT] = {0, 0, 0, 0, 0, 0};
|
|
|
|
|
|
|
|
dialog_ex_set_header(dialog_ex, "Benchmarking...", 64, 32, AlignCenter, AlignCenter);
|
|
|
|
for(size_t i = 0; i < BENCH_COUNT; i++) {
|
|
|
|
if(!storage_settings_bench_write(app->fs_api, bench_size[i], bench_data, &bench_w_speed[i]))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if(i > 0) string_cat_printf(app->text_string, "\n");
|
|
|
|
string_cat_printf(app->text_string, "%ub : W %luK ", bench_size[i], bench_w_speed[i]);
|
|
|
|
dialog_ex_set_header(dialog_ex, NULL, 0, 0, AlignCenter, AlignCenter);
|
|
|
|
dialog_ex_set_text(
|
|
|
|
dialog_ex, string_get_cstr(app->text_string), 0, 32, AlignLeft, AlignCenter);
|
|
|
|
|
|
|
|
if(!storage_settings_bench_read(app->fs_api, bench_size[i], bench_data, &bench_r_speed[i]))
|
|
|
|
break;
|
|
|
|
|
|
|
|
string_cat_printf(app->text_string, "R %luK", bench_r_speed[i]);
|
|
|
|
dialog_ex_set_text(
|
|
|
|
dialog_ex, string_get_cstr(app->text_string), 0, 32, AlignLeft, AlignCenter);
|
|
|
|
}
|
|
|
|
|
|
|
|
free(bench_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
void storage_settings_scene_benchmark_on_enter(void* context) {
|
|
|
|
StorageSettings* app = context;
|
|
|
|
DialogEx* dialog_ex = app->dialog_ex;
|
|
|
|
|
|
|
|
dialog_ex_set_context(dialog_ex, app);
|
|
|
|
dialog_ex_set_result_callback(dialog_ex, storage_settings_scene_benchmark_dialog_callback);
|
|
|
|
view_dispatcher_switch_to_view(app->view_dispatcher, StorageSettingsViewDialogEx);
|
|
|
|
|
|
|
|
if(storage_sd_status(app->fs_api) != FSE_OK) {
|
|
|
|
dialog_ex_set_header(dialog_ex, "SD card not mounted", 64, 10, AlignCenter, AlignCenter);
|
|
|
|
dialog_ex_set_text(
|
|
|
|
dialog_ex,
|
|
|
|
"If an SD card is inserted,\r\npull it out and reinsert it",
|
|
|
|
64,
|
|
|
|
32,
|
|
|
|
AlignCenter,
|
|
|
|
AlignCenter);
|
|
|
|
dialog_ex_set_left_button_text(dialog_ex, "Back");
|
|
|
|
} else {
|
|
|
|
storage_settings_benchmark(app);
|
|
|
|
notification_message(app->notification, &sequence_blink_green_100);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool storage_settings_scene_benchmark_on_event(void* context, SceneManagerEvent event) {
|
|
|
|
StorageSettings* app = context;
|
|
|
|
bool consumed = false;
|
|
|
|
|
|
|
|
if(event.type == SceneManagerEventTypeCustom) {
|
|
|
|
switch(event.event) {
|
|
|
|
case DialogExResultLeft:
|
|
|
|
consumed = scene_manager_previous_scene(app->scene_manager);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return consumed;
|
|
|
|
}
|
|
|
|
|
|
|
|
void storage_settings_scene_benchmark_on_exit(void* context) {
|
|
|
|
StorageSettings* app = context;
|
|
|
|
DialogEx* dialog_ex = app->dialog_ex;
|
|
|
|
|
|
|
|
dialog_ex_set_header(dialog_ex, NULL, 0, 0, AlignCenter, AlignCenter);
|
|
|
|
dialog_ex_set_text(dialog_ex, NULL, 0, 0, AlignCenter, AlignTop);
|
|
|
|
dialog_ex_set_icon(dialog_ex, 0, 0, NULL);
|
|
|
|
dialog_ex_set_left_button_text(dialog_ex, NULL);
|
|
|
|
dialog_ex_set_right_button_text(dialog_ex, NULL);
|
|
|
|
dialog_ex_set_result_callback(dialog_ex, NULL);
|
|
|
|
dialog_ex_set_context(dialog_ex, NULL);
|
|
|
|
|
|
|
|
string_clean(app->text_string);
|
|
|
|
}
|