#include "timings.h"\r
\r
/**@brief Block size.*/\r
-#define SDC_BLOCK_SIZE 512\r
+#define SDC_BLOCK_SIZE 512\r
\r
/**@brief MBR_block ID*/\r
-#define MBR_BLOCK_ID 0\r
-#define MBR_PART_TABLE_OFF 446\r
-\r
-struct part_tab_entry {\r
- uint8_t status;\r
- uint8_t chs1[3];\r
- uint8_t type;\r
- uint8_t chs2[3];\r
+#define MBR_BLOCK_ID 0\r
+#define MBR_PART_TABLE_OFF 446\r
+\r
+struct part_tab_entry\r
+{\r
+ uint8_t status;\r
+ uint8_t chs1[3];\r
+ uint8_t type;\r
+ uint8_t chs2[3];\r
uint32_t first_lba;\r
uint32_t sectors;\r
-}__attribute__((packed));\r
+} __attribute__((packed));\r
\r
/**@brief Partition block offset*/\r
static uint32_t part_offset;\r
\r
/**@brief IO timings*/\r
-struct sdc_io_timings {\r
+struct sdc_io_timings\r
+{\r
uint64_t acc_bread;\r
uint64_t acc_bwrite;\r
\r
memset(&io_timings, 0, sizeof(struct sdc_io_timings));\r
}\r
\r
-const struct ext4_io_stats * io_timings_get(uint32_t time_sum_ms)\r
+const struct ext4_io_stats *io_timings_get(uint32_t time_sum_ms)\r
{\r
static struct ext4_io_stats s;\r
\r
s.io_read = (((float)io_timings.acc_bread * 100.0) / time_sum_ms);\r
s.io_read /= 1000.0;\r
\r
- s.io_write= (((float)io_timings.acc_bwrite * 100.0) / time_sum_ms);\r
+ s.io_write = (((float)io_timings.acc_bwrite * 100.0) / time_sum_ms);\r
s.io_write /= 1000.0;\r
\r
s.cpu = 100.0 - s.io_read - s.io_write;\r
return &s;\r
}\r
\r
-\r
/**********************BLOCKDEV INTERFACE**************************************/\r
static int sdc_open(struct ext4_blockdev *bdev);\r
static int sdc_bread(struct ext4_blockdev *bdev, void *buf, uint64_t blk_id,\r
- uint32_t blk_cnt);\r
+ uint32_t blk_cnt);\r
static int sdc_bwrite(struct ext4_blockdev *bdev, const void *buf,\r
- uint64_t blk_id, uint32_t blk_cnt);\r
-static int sdc_close(struct ext4_blockdev *bdev);\r
-\r
+ uint64_t blk_id, uint32_t blk_cnt);\r
+static int sdc_close(struct ext4_blockdev *bdev);\r
\r
/******************************************************************************/\r
-EXT4_BLOCKDEV_STATIC_INSTANCE(\r
- _sdc,\r
- SDC_BLOCK_SIZE,\r
- 0,\r
- sdc_open,\r
- sdc_bread,\r
- sdc_bwrite,\r
- sdc_close\r
-);\r
+EXT4_BLOCKDEV_STATIC_INSTANCE(_sdc, SDC_BLOCK_SIZE, 0, sdc_open, sdc_bread,\r
+ sdc_bwrite, sdc_close);\r
\r
/******************************************************************************/\r
-EXT4_BCACHE_STATIC_INSTANCE(_sdc_cache, CONFIG_BLOCK_DEV_CACHE_SIZE, EXT_LOGICAL_BLOCK_SIZE);\r
+EXT4_BCACHE_STATIC_INSTANCE(_sdc_cache, CONFIG_BLOCK_DEV_CACHE_SIZE,\r
+ EXT_LOGICAL_BLOCK_SIZE);\r
\r
/******************************************************************************/\r
\r
if (sdcConnect(&SDCD1) != HAL_SUCCESS)\r
return EIO;\r
\r
-\r
if (sdcRead(&SDCD1, 0, mbr, 1) != HAL_SUCCESS)\r
return EIO;\r
\r
part0 = (struct part_tab_entry *)(mbr + MBR_PART_TABLE_OFF);\r
\r
-\r
part_offset = part0->first_lba;\r
_sdc.ph_bcnt = SDCD1.capacity * SDC_BLOCK_SIZE;\r
\r
}\r
\r
static int sdc_bread(struct ext4_blockdev *bdev, void *buf, uint64_t blk_id,\r
- uint32_t blk_cnt)\r
+ uint32_t blk_cnt)\r
{\r
(void)bdev;\r
bool status;\r
uint64_t v = tim_get_us();\r
\r
status = sdcRead(&SDCD1, blk_id, buf, blk_cnt);\r
- if(status != HAL_SUCCESS)\r
+ if (status != HAL_SUCCESS)\r
return EIO;\r
\r
io_timings.acc_bread += tim_get_us() - v;\r
io_timings.av_bread = io_timings.acc_bread / io_timings.cnt_bread;\r
\r
return EOK;\r
-\r
}\r
\r
static int sdc_bwrite(struct ext4_blockdev *bdev, const void *buf,\r
- uint64_t blk_id, uint32_t blk_cnt)\r
+ uint64_t blk_id, uint32_t blk_cnt)\r
{\r
(void)bdev;\r
bool status;\r
uint64_t v = tim_get_us();\r
\r
status = sdcWrite(&SDCD1, blk_id, buf, blk_cnt);\r
- if(status != HAL_SUCCESS)\r
+ if (status != HAL_SUCCESS)\r
return EIO;\r
\r
io_timings.acc_bwrite += tim_get_us() - v;\r
return EOK;\r
}\r
\r
-static int sdc_close(struct ext4_blockdev *bdev)\r
+static int sdc_close(struct ext4_blockdev *bdev)\r
{\r
(void)bdev;\r
return EOK;\r
\r
/******************************************************************************/\r
\r
-struct ext4_bcache* sdc_cache_get(void)\r
-{\r
- return &_sdc_cache;\r
-}\r
-\r
-\r
-struct ext4_blockdev* sdc_bdev_get(void)\r
-{\r
- return &_sdc;\r
-}\r
+struct ext4_bcache *sdc_cache_get(void) { return &_sdc_cache; }\r
\r
+struct ext4_blockdev *sdc_bdev_get(void) { return &_sdc; }\r
#include <stdbool.h>\r
\r
/**@brief SDC cache get.*/\r
-struct ext4_bcache* sdc_cache_get(void);\r
+struct ext4_bcache *sdc_cache_get(void);\r
\r
/**@brief SDC blockdev get.*/\r
-struct ext4_blockdev* sdc_bdev_get(void);\r
+struct ext4_blockdev *sdc_bdev_get(void);\r
\r
-struct ext4_io_stats {\r
+struct ext4_io_stats\r
+{\r
float io_read;\r
float io_write;\r
float cpu;\r
};\r
\r
void io_timings_clear(void);\r
-const struct ext4_io_stats * io_timings_get(uint32_t time_sum_ms);\r
+const struct ext4_io_stats *io_timings_get(uint32_t time_sum_ms);\r
\r
#endif /* CHIBI_SDC_LWEXT4_H_ */\r
#endif
/**@brief Block size.*/
-#define SPI_BLOCK_SIZE 512
+#define SPI_BLOCK_SIZE 512
/**@brief MBR_block ID*/
-#define MBR_BLOCK_ID 0
-#define MBR_PART_TABLE_OFF 446
-
-struct part_tab_entry {
- uint8_t status;
- uint8_t chs1[3];
- uint8_t type;
- uint8_t chs2[3];
+#define MBR_BLOCK_ID 0
+#define MBR_PART_TABLE_OFF 446
+
+struct part_tab_entry
+{
+ uint8_t status;
+ uint8_t chs1[3];
+ uint8_t type;
+ uint8_t chs2[3];
uint32_t first_lba;
uint32_t sectors;
-}__attribute__((packed));
+} __attribute__((packed));
/**@brief Partition block offset*/
static uint32_t part_offset;
/**@brief IO timings*/
-struct spi_io_timings {
+struct spi_io_timings
+{
uint64_t acc_bread;
uint64_t acc_bwrite;
memset(&io_timings, 0, sizeof(struct spi_io_timings));
}
-const struct ext4_io_stats * io_timings_get(uint32_t time_sum_ms)
+const struct ext4_io_stats *io_timings_get(uint32_t time_sum_ms)
{
static struct ext4_io_stats s;
s.io_read = (((float)io_timings.acc_bread * 100.0) / time_sum_ms);
s.io_read /= 1000.0;
- s.io_write= (((float)io_timings.acc_bwrite * 100.0) / time_sum_ms);
+ s.io_write = (((float)io_timings.acc_bwrite * 100.0) / time_sum_ms);
s.io_write /= 1000.0;
s.cpu = 100.0 - s.io_read - s.io_write;
return &s;
}
-
/**********************BLOCKDEV INTERFACE**************************************/
static int spi_open(struct ext4_blockdev *bdev);
static int spi_bread(struct ext4_blockdev *bdev, void *buf, uint64_t blk_id,
- uint32_t blk_cnt);
+ uint32_t blk_cnt);
static int spi_bwrite(struct ext4_blockdev *bdev, const void *buf,
- uint64_t blk_id, uint32_t blk_cnt);
-static int spi_close(struct ext4_blockdev *bdev);
-
+ uint64_t blk_id, uint32_t blk_cnt);
+static int spi_close(struct ext4_blockdev *bdev);
/******************************************************************************/
-EXT4_BLOCKDEV_STATIC_INSTANCE(
- _spi,
- SPI_BLOCK_SIZE,
- 0,
- spi_open,
- spi_bread,
- spi_bwrite,
- spi_close
-);
+EXT4_BLOCKDEV_STATIC_INSTANCE(_spi, SPI_BLOCK_SIZE, 0, spi_open, spi_bread,
+ spi_bwrite, spi_close);
/******************************************************************************/
-EXT4_BCACHE_STATIC_INSTANCE(_spi_cache, CONFIG_BLOCK_DEV_CACHE_SIZE, EXT_LOGICAL_BLOCK_SIZE);
+EXT4_BCACHE_STATIC_INSTANCE(_spi_cache, CONFIG_BLOCK_DEV_CACHE_SIZE,
+ EXT_LOGICAL_BLOCK_SIZE);
/******************************************************************************/
static int spi_open(struct ext4_blockdev *bdev)
{
-
-
(void)bdev;
static uint8_t mbr[512];
part0 = (struct part_tab_entry *)(mbr + MBR_PART_TABLE_OFF);
-
part_offset = part0->first_lba;
_spi.ph_bcnt = MMCD1.capacity * SPI_BLOCK_SIZE;
}
static int spi_bread(struct ext4_blockdev *bdev, void *buf, uint64_t blk_id,
- uint32_t blk_cnt)
+ uint32_t blk_cnt)
{
(void)bdev;
uint64_t v = tim_get_us();
if (mmcStartSequentialRead(&MMCD1, blk_id) != HAL_SUCCESS)
return EIO;
- while(blk_cnt){
+ while (blk_cnt) {
if (mmcSequentialRead(&MMCD1, buf) != HAL_SUCCESS)
return EIO;
io_timings.av_bread = io_timings.acc_bread / io_timings.cnt_bread;
return EOK;
-
}
static int spi_bwrite(struct ext4_blockdev *bdev, const void *buf,
- uint64_t blk_id, uint32_t blk_cnt)
+ uint64_t blk_id, uint32_t blk_cnt)
{
(void)bdev;
uint64_t v = tim_get_us();
if (mmcStartSequentialWrite(&MMCD1, blk_id) != HAL_SUCCESS)
return EIO;
- while(blk_cnt){
+ while (blk_cnt) {
if (mmcSequentialWrite(&MMCD1, buf) != HAL_SUCCESS)
return EIO;
return EOK;
}
-static int spi_close(struct ext4_blockdev *bdev)
+static int spi_close(struct ext4_blockdev *bdev)
{
(void)bdev;
return EOK;
/******************************************************************************/
-struct ext4_bcache* spi_cache_get(void)
-{
- return &_spi_cache;
-}
-
-
-struct ext4_blockdev* spi_bdev_get(void)
-{
- return &_spi;
-}
+struct ext4_bcache *spi_cache_get(void) { return &_spi_cache; }
+struct ext4_blockdev *spi_bdev_get(void) { return &_spi; }
#include <stdbool.h>
/**@brief SPI cache get.*/
-struct ext4_bcache* spi_cache_get(void);
+struct ext4_bcache *spi_cache_get(void);
/**@brief SPI blockdev get.*/
-struct ext4_blockdev* spi_bdev_get(void);
+struct ext4_blockdev *spi_bdev_get(void);
-struct ext4_io_stats {
+struct ext4_io_stats
+{
float io_read;
float io_write;
float cpu;
};
void io_timings_clear(void);
-const struct ext4_io_stats * io_timings_get(uint32_t time_sum_ms);
-
+const struct ext4_io_stats *io_timings_get(uint32_t time_sum_ms);
#endif /* SPI_LWEXT4_H_ */
#include "timings.h"
#include "test_lwext4.h"
-
/**@brief Read-write size*/
#define READ_MAX_WRITE_SZIZE 1024 * 8
static struct ext4_blockdev *bd;
/**@brief Block cache handle.*/
-static struct ext4_bcache *bc;
-
+static struct ext4_bcache *bc;
-static char* entry_to_str(uint8_t type)
+static char *entry_to_str(uint8_t type)
{
- switch(type){
+ switch (type) {
case EXT4_DIRENTRY_UNKNOWN:
return "[unk] ";
case EXT4_DIRENTRY_REG_FILE:
return "[???]";
}
-static clock_t get_ms(void)
-{
- return tim_get_ms();
-}
+static clock_t get_ms(void) { return tim_get_ms(); }
static void printf_io_timings(clock_t diff)
{
ext4_dir_open(&d, path);
de = ext4_dir_entry_next(&d);
- while(de){
+ while (de) {
memcpy(sss, de->name, de->name_length);
sss[de->name_length] = 0;
printf(" %s%s\n", entry_to_str(de->inode_type), sss);
printf("********************\n");
printf("ext4_mount_point_stats\n");
- printf("inodes_count = %"PRIu32"\n", stats.inodes_count);
- printf("free_inodes_count = %"PRIu32"\n", stats.free_inodes_count);
- printf("blocks_count = %"PRIu32"\n", (uint32_t)stats.blocks_count);
- printf("free_blocks_count = %"PRIu32"\n", (uint32_t)stats.free_blocks_count);
- printf("block_size = %"PRIu32"\n", stats.block_size);
- printf("block_group_count = %"PRIu32"\n", stats.block_group_count);
- printf("blocks_per_group= %"PRIu32"\n", stats.blocks_per_group);
- printf("inodes_per_group = %"PRIu32"\n", stats.inodes_per_group);
+ printf("inodes_count = %" PRIu32 "\n", stats.inodes_count);
+ printf("free_inodes_count = %" PRIu32 "\n", stats.free_inodes_count);
+ printf("blocks_count = %" PRIu32 "\n", (uint32_t)stats.blocks_count);
+ printf("free_blocks_count = %" PRIu32 "\n",
+ (uint32_t)stats.free_blocks_count);
+ printf("block_size = %" PRIu32 "\n", stats.block_size);
+ printf("block_group_count = %" PRIu32 "\n", stats.block_group_count);
+ printf("blocks_per_group= %" PRIu32 "\n", stats.blocks_per_group);
+ printf("inodes_per_group = %" PRIu32 "\n", stats.inodes_per_group);
printf("volume_name = %s\n", stats.volume_name);
printf("********************\n");
}
void test_lwext4_block_stats(void)
{
- if(!bd)
+ if (!bd)
return;
printf("********************\n");
printf("ext4 blockdev stats\n");
- printf("bdev->bread_ctr = %"PRIu32"\n", bd->bread_ctr);
- printf("bdev->bwrite_ctr = %"PRIu32"\n", bd->bwrite_ctr);
+ printf("bdev->bread_ctr = %" PRIu32 "\n", bd->bread_ctr);
+ printf("bdev->bwrite_ctr = %" PRIu32 "\n", bd->bwrite_ctr);
- printf("bcache->ref_blocks = %"PRIu32"\n", bc->ref_blocks);
- printf("bcache->max_ref_blocks = %"PRIu32"\n", bc->max_ref_blocks);
- printf("bcache->lru_ctr = %"PRIu32"\n", bc->lru_ctr);
+ printf("bcache->ref_blocks = %" PRIu32 "\n", bc->ref_blocks);
+ printf("bcache->max_ref_blocks = %" PRIu32 "\n", bc->max_ref_blocks);
+ printf("bcache->lru_ctr = %" PRIu32 "\n", bc->lru_ctr);
printf("\n");
uint32_t i;
for (i = 0; i < bc->cnt; ++i) {
- printf("bcache->refctr[%"PRIu32"]= %"PRIu32"\n",
- i, bc->refctr[i]);
+ printf("bcache->refctr[%" PRIu32 "]= %" PRIu32 "\n", i, bc->refctr[i]);
}
printf("\n");
for (i = 0; i < bc->cnt; ++i) {
- printf("bcache->lru_id[%"PRIu32"] = %"PRIu32"\n",
- i, bc->lru_id[i]);
+ printf("bcache->lru_id[%" PRIu32 "] = %" PRIu32 "\n", i, bc->lru_id[i]);
}
printf("\n");
for (i = 0; i < bc->cnt; ++i) {
- printf("bcache->free_delay[%"PRIu32"] = %d\n",
- i, bc->free_delay[i]);
+ printf("bcache->free_delay[%" PRIu32 "] = %d\n", i, bc->free_delay[i]);
}
printf("\n");
for (i = 0; i < bc->cnt; ++i) {
- printf("bcache->lba[%"PRIu32"] = %"PRIu32"\n", i, (uint32_t)bc->lba[i]);
+ printf("bcache->lba[%" PRIu32 "] = %" PRIu32 "\n", i,
+ (uint32_t)bc->lba[i]);
}
printf("********************\n");
bool test_lwext4_dir_test(int len)
{
ext4_file f;
- int r;
- int i;
+ int r;
+ int i;
char path[64];
clock_t diff;
clock_t stop;
printf("directory create: /mp/dir1\n");
r = ext4_dir_mk("/mp/dir1");
- if(r != EOK){
+ if (r != EOK) {
printf("ext4_dir_mk: rc = %d\n", r);
return false;
}
for (i = 0; i < len; ++i) {
sprintf(path, "/mp/dir1/f%d", i);
r = ext4_fopen(&f, path, "wb");
- if(r != EOK){
+ if (r != EOK) {
printf("ext4_fopen: rc = %d\n", r);
return false;
}
}
- stop = get_ms();
+ stop = get_ms();
diff = stop - start;
test_lwext4_dir_ls("/mp/dir1");
printf("test_lwext4_dir_test: time: %d ms\n", (int)diff);
return true;
}
-static int verify_buf(const unsigned char *b, size_t len,
- unsigned char c)
+static int verify_buf(const unsigned char *b, size_t len, unsigned char c)
{
size_t i;
for (i = 0; i < len; ++i) {
- if(b[i] != c)
+ if (b[i] != c)
return c - b[i];
}
bool test_lwext4_file_test(uint32_t rw_szie, uint32_t rw_count)
{
int r;
- uint32_t size;
+ uint32_t size;
uint32_t i;
clock_t start;
clock_t stop;
ext4_file f;
printf("file_test:\n");
- printf(" rw size: %"PRIu32"\n", rw_szie);
- printf(" rw count: %"PRIu32"\n", rw_count);
+ printf(" rw size: %" PRIu32 "\n", rw_szie);
+ printf(" rw count: %" PRIu32 "\n", rw_count);
/*Add hello world file.*/
r = ext4_fopen(&f, "/mp/hello.txt", "wb");
r = ext4_fwrite(&f, "Hello World !\n", strlen("Hello World !\n"), 0);
r = ext4_fclose(&f);
-
io_timings_clear();
start = get_ms();
r = ext4_fopen(&f, "/mp/test1", "wb");
- if(r != EOK){
+ if (r != EOK) {
printf("ext4_fopen ERROR = %d\n", r);
return false;
}
- printf("ext4_write: %"PRIu32" * %"PRIu32" ...\n" , rw_szie, rw_count);
+ printf("ext4_write: %" PRIu32 " * %" PRIu32 " ...\n", rw_szie, rw_count);
for (i = 0; i < rw_count; ++i) {
memset(rw_buff, i % 10 + '0', rw_szie);
r = ext4_fwrite(&f, rw_buff, rw_szie, &size);
- if((r != EOK) || (size != rw_szie))
+ if ((r != EOK) || (size != rw_szie))
break;
}
- if(i != rw_count){
- printf(" file_test: rw_count = %"PRIu32"\n", i);
+ if (i != rw_count) {
+ printf(" file_test: rw_count = %" PRIu32 "\n", i);
return false;
}
size_bytes = (size_bytes * 1000) / 1024;
kbps = (size_bytes) / (diff + 1);
printf(" write time: %d ms\n", (int)diff);
- printf(" write speed: %"PRIu32" KB/s\n", kbps);
+ printf(" write speed: %" PRIu32 " KB/s\n", kbps);
printf_io_timings(diff);
r = ext4_fclose(&f);
-
io_timings_clear();
start = get_ms();
r = ext4_fopen(&f, "/mp/test1", "r+");
- if(r != EOK){
+ if (r != EOK) {
printf("ext4_fopen ERROR = %d\n", r);
return false;
}
- printf("ext4_read: %"PRIu32" * %"PRIu32" ...\n" , rw_szie, rw_count);
+ printf("ext4_read: %" PRIu32 " * %" PRIu32 " ...\n", rw_szie, rw_count);
for (i = 0; i < rw_count; ++i) {
r = ext4_fread(&f, rw_buff, rw_szie, &size);
- if((r != EOK) || (size != rw_szie))
+ if ((r != EOK) || (size != rw_szie))
break;
- if(verify_buf(rw_buff, rw_szie, i % 10 + '0'))
+ if (verify_buf(rw_buff, rw_szie, i % 10 + '0'))
break;
}
- if(i != rw_count){
- printf(" file_test: rw_count = %"PRIu32"\n", i);
+ if (i != rw_count) {
+ printf(" file_test: rw_count = %" PRIu32 "\n", i);
return false;
}
r = ext4_fclose(&f);
return true;
-
}
void test_lwext4_cleanup(void)
{
printf("remove /mp/test1\n");
ext4_fremove("/mp/test1");
-
printf("remove /mp/dir1\n");
io_timings_clear();
start = get_ms();
printf_io_timings(diff);
}
-
-bool test_lwext4_mount(struct ext4_blockdev *bdev,
- struct ext4_bcache *bcache)
+bool test_lwext4_mount(struct ext4_blockdev *bdev, struct ext4_bcache *bcache)
{
int r;
bc = bcache;
bd = bdev;
- if(!bd){
+ if (!bd) {
printf("test_lwext4_mount: no block device\n");
return false;
}
ext4_dmask_set(EXT4_DEBUG_ALL);
r = ext4_device_register(bd, bc ? bc : 0, "ext4_fs");
- if(r != EOK){
+ if (r != EOK) {
printf("ext4_device_register: rc = %d\n", r);
return false;
}
r = ext4_mount("ext4_fs", "/mp/");
- if(r != EOK){
+ if (r != EOK) {
printf("ext4_mount: rc = %d\n", r);
return false;
}
{
ext4_cache_write_back("/mp/", 0);
int r = ext4_umount("/mp/");
- if(r != EOK){
+ if (r != EOK) {
printf("ext4_umount: fail %d", r);
return false;
}
return true;
}
-
-
-
bool test_lwext4_file_test(uint32_t rw_szie, uint32_t rw_count);
void test_lwext4_cleanup(void);
-bool test_lwext4_mount(struct ext4_blockdev *bdev,
- struct ext4_bcache *bcache);
+bool test_lwext4_mount(struct ext4_blockdev *bdev, struct ext4_bcache *bcache);
bool test_lwext4_umount(void);
-
#endif /* TEST_LWEXT4_H_ */
#include "timings.h"
-
-void tim_wait_ms(uint32_t v)
-{
- chThdSleepMilliseconds(v);
-}
+void tim_wait_ms(uint32_t v) { chThdSleepMilliseconds(v); }
uint64_t tim_get_us(void)
{
uint32_t v = chVTGetSystemTimeX();
return ST2MS(v);
}
-
-
uint32_t tim_get_ms(void);
uint64_t tim_get_us(void);
-
#endif /* TIMINGS_H_ */
projects / lwext4.git / commitdiff