fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-06 15:58:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

sd_bench: Add U option for forcing byte aligned

Browse Source 
Co-authored-by: David Sidrane <david.sidrane@nscdg.com>
This commit is contained in:
Peter van der Perk
2024-05-02 12:33:25 -04:00
committed by Daniel Agar
co-authored by David Sidrane
parent c64104e9f1
commit f382e585e8
1 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/sd_bench/sd_bench.cpp
+45 -12
View File
@@ -56,7 +56,7 @@ typedef struct sdb_config {
int num_runs; ///< number of runs
int run_duration; ///< duration of a single run [ms]
bool synchronized; ///< call fsync after each block?
bool aligned;
int unaligned;
unsigned int total_blocks_written;
} sdb_config_t;
@@ -85,6 +85,7 @@ static void usage()
PRINT_MODULE_USAGE_PARAM_FLAG('k', "Keep the test file", true);
PRINT_MODULE_USAGE_PARAM_FLAG('s', "Call fsync after each block (default=at end of each run)", true);
PRINT_MODULE_USAGE_PARAM_FLAG('u', "Test performance with unaligned data", true);
PRINT_MODULE_USAGE_PARAM_FLAG('U', "Test performance with forced byte unaligned data", true);
PRINT_MODULE_USAGE_PARAM_FLAG('v', "Verify data and block number", true);
}
@@ -100,10 +101,11 @@ extern "C" __EXPORT int sd_bench_main(int argc, char *argv[])
cfg.synchronized = false;
cfg.num_runs = 5;
cfg.run_duration = 2000;
cfg.aligned = true;
cfg.unaligned = 0;
uint8_t *block = nullptr;
uint8_t *block_alloc = nullptr;
while ((ch = px4_getopt(argc, argv, "b:r:d:ksuv", &myoptind, &myoptarg)) != EOF) {
while ((ch = px4_getopt(argc, argv, "b:r:d:ksuUv", &myoptind, &myoptarg)) != EOF) {
switch (ch) {
case 'b':
block_size = strtol(myoptarg, nullptr, 0);
@@ -126,7 +128,11 @@ extern "C" __EXPORT int sd_bench_main(int argc, char *argv[])
break;
case 'u':
cfg.aligned = false;
cfg.unaligned = 2;
break;
case 'U':
cfg.unaligned = 1;
break;
case 'v':
@@ -153,11 +159,24 @@ extern "C" __EXPORT int sd_bench_main(int argc, char *argv[])
}
//create some data block
if (cfg.aligned) {
block = (uint8_t *)px4_cache_aligned_alloc(block_size);
if (cfg.unaligned == 0) {
block_alloc = (uint8_t *)px4_cache_aligned_alloc(block_size);
block = block_alloc;
} else {
block = (uint8_t *)malloc(block_size);
block_alloc = (uint8_t *)malloc(block_size + 4);
if (block_alloc) {
// Force odd byte alignment
if (cfg.unaligned == 1 && ((uintptr_t)block_alloc % 0x1) == 0) {
block = block_alloc + 1;
} else {
block = block_alloc;
}
}
printf("Block ptr %p\n", block);
}
if (!block) {
@@ -179,7 +198,7 @@ extern "C" __EXPORT int sd_bench_main(int argc, char *argv[])
read_test(bench_fd, &cfg, block, block_size);
}
free(block);
free(block_alloc);
close(bench_fd);
if (!keep) {
@@ -259,15 +278,29 @@ void write_test(int fd, sdb_config_t *cfg, uint8_t *block, int block_size)
int read_test(int fd, sdb_config_t *cfg, uint8_t *block, int block_size)
{
uint8_t *read_block = nullptr;
uint8_t *block_alloc = nullptr;
PX4_INFO("");
PX4_INFO("Testing Sequential Read Speed of %d blocks", cfg->total_blocks_written);
if (cfg->aligned) {
read_block = (uint8_t *)px4_cache_aligned_alloc(block_size);
if (cfg->unaligned == 0) {
block_alloc = (uint8_t *)px4_cache_aligned_alloc(block_size);
read_block = block_alloc;
} else {
read_block = (uint8_t *)malloc(block_size);
block_alloc = (uint8_t *)malloc(block_size + 4);
if (block_alloc) {
// Force odd byte alignment
if (cfg->unaligned == 1 && ((uintptr_t)block_alloc % 0x1) == 0) {
read_block = block_alloc + 1;
} else {
read_block = block_alloc;
}
}
printf("Read Block ptr %p\n", read_block);
}
if (!read_block) {
@@ -331,6 +364,6 @@ int read_test(int fd, sdb_config_t *cfg, uint8_t *block, int block_size)
PX4_INFO(" Avg : %8.2lf KB/s %d blocks read and verified", (double)block_size * total_blocks / total_elapsed / 1024.,
total_blocks);
free(read_block);
free(block_alloc);
return 0;
}