Renamed config -> cfg
Note this includes both the lfs3_config -> lfs3_cfg structs as well as the LFS3_CONFIG -> LFS3_CFG include define: - LFS3_CONFIG -> LFS3_CFG - struct lfs3_config -> struct lfs3_cfg - struct lfs3_file_config -> struct lfs3_file_cfg - struct lfs3_*bd_config -> struct lfs3_*bd_cfg - cfg -> cfg We were already using cfg as the variable name everywhere. The fact that these names were different was an inconsistency that should be fixed since we're committing to an API break. LFS3_CFG is already out-of-date from upstream, and there's plans for a config rework, but I figured I'd go ahead and change it as well to lower the chances it gets overlooked. --- Note this does _not_ affect LFS3_TAG_CONFIG. Having the on-disk vs driver-level config take slightly different names is not a bad thing.
This commit is contained in:
@@ -612,12 +612,12 @@ typedef struct bench_record {
|
||||
lfs3_emubd_io_t last_erased;
|
||||
} bench_record_t;
|
||||
|
||||
static struct lfs3_config *bench_cfg = NULL;
|
||||
static struct lfs3_cfg *bench_cfg = NULL;
|
||||
static bench_record_t *bench_records;
|
||||
size_t bench_record_count;
|
||||
size_t bench_record_capacity;
|
||||
|
||||
void bench_reset(struct lfs3_config *cfg) {
|
||||
void bench_reset(struct lfs3_cfg *cfg) {
|
||||
bench_cfg = cfg;
|
||||
bench_record_count = 0;
|
||||
}
|
||||
@@ -1337,7 +1337,7 @@ void perm_run(
|
||||
// create block device and configuration
|
||||
lfs3_emubd_t bd;
|
||||
|
||||
struct lfs3_config cfg = {
|
||||
struct lfs3_cfg cfg = {
|
||||
.context = &bd,
|
||||
.read = lfs3_emubd_read,
|
||||
.prog = lfs3_emubd_prog,
|
||||
@@ -1346,7 +1346,7 @@ void perm_run(
|
||||
BENCH_CFG
|
||||
};
|
||||
|
||||
struct lfs3_emubd_config bdcfg = {
|
||||
struct lfs3_emubd_cfg bdcfg = {
|
||||
.disk_path = bench_disk_path,
|
||||
.read_sleep = bench_read_sleep,
|
||||
.prog_sleep = bench_prog_sleep,
|
||||
|
||||
@@ -45,7 +45,7 @@ void bench_fresult(const char *m, uintmax_t n, double result);
|
||||
|
||||
|
||||
// generated bench configurations
|
||||
struct lfs3_config;
|
||||
struct lfs3_cfg;
|
||||
|
||||
enum bench_flags {
|
||||
BENCH_INTERNAL = 0x1,
|
||||
@@ -69,7 +69,7 @@ struct bench_case {
|
||||
size_t permutations;
|
||||
|
||||
bool (*if_)(void);
|
||||
void (*run)(struct lfs3_config *cfg);
|
||||
void (*run)(struct lfs3_cfg *cfg);
|
||||
};
|
||||
|
||||
struct bench_suite {
|
||||
|
||||
+13
-13
@@ -1301,7 +1301,7 @@ static void run_powerloss_none(
|
||||
// create block device and configuration
|
||||
lfs3_emubd_t bd;
|
||||
|
||||
struct lfs3_config cfg = {
|
||||
struct lfs3_cfg cfg = {
|
||||
.context = &bd,
|
||||
.read = lfs3_emubd_read,
|
||||
.prog = lfs3_emubd_prog,
|
||||
@@ -1310,7 +1310,7 @@ static void run_powerloss_none(
|
||||
TEST_CFG
|
||||
};
|
||||
|
||||
struct lfs3_emubd_config bdcfg = {
|
||||
struct lfs3_emubd_cfg bdcfg = {
|
||||
.disk_path = test_disk_path,
|
||||
.read_sleep = test_read_sleep,
|
||||
.prog_sleep = test_prog_sleep,
|
||||
@@ -1362,7 +1362,7 @@ static void run_powerloss_linear(
|
||||
lfs3_emubd_t bd;
|
||||
jmp_buf powerloss_jmp;
|
||||
|
||||
struct lfs3_config cfg = {
|
||||
struct lfs3_cfg cfg = {
|
||||
.context = &bd,
|
||||
.read = lfs3_emubd_read,
|
||||
.prog = lfs3_emubd_prog,
|
||||
@@ -1371,7 +1371,7 @@ static void run_powerloss_linear(
|
||||
TEST_CFG
|
||||
};
|
||||
|
||||
struct lfs3_emubd_config bdcfg = {
|
||||
struct lfs3_emubd_cfg bdcfg = {
|
||||
.disk_path = test_disk_path,
|
||||
.read_sleep = test_read_sleep,
|
||||
.prog_sleep = test_prog_sleep,
|
||||
@@ -1439,7 +1439,7 @@ static void run_powerloss_log(
|
||||
lfs3_emubd_t bd;
|
||||
jmp_buf powerloss_jmp;
|
||||
|
||||
struct lfs3_config cfg = {
|
||||
struct lfs3_cfg cfg = {
|
||||
.context = &bd,
|
||||
.read = lfs3_emubd_read,
|
||||
.prog = lfs3_emubd_prog,
|
||||
@@ -1448,7 +1448,7 @@ static void run_powerloss_log(
|
||||
TEST_CFG
|
||||
};
|
||||
|
||||
struct lfs3_emubd_config bdcfg = {
|
||||
struct lfs3_emubd_cfg bdcfg = {
|
||||
.disk_path = test_disk_path,
|
||||
.read_sleep = test_read_sleep,
|
||||
.prog_sleep = test_prog_sleep,
|
||||
@@ -1516,7 +1516,7 @@ static void run_powerloss_cycles(
|
||||
lfs3_emubd_t bd;
|
||||
jmp_buf powerloss_jmp;
|
||||
|
||||
struct lfs3_config cfg = {
|
||||
struct lfs3_cfg cfg = {
|
||||
.context = &bd,
|
||||
.read = lfs3_emubd_read,
|
||||
.prog = lfs3_emubd_prog,
|
||||
@@ -1525,7 +1525,7 @@ static void run_powerloss_cycles(
|
||||
TEST_CFG
|
||||
};
|
||||
|
||||
struct lfs3_emubd_config bdcfg = {
|
||||
struct lfs3_emubd_cfg bdcfg = {
|
||||
.disk_path = test_disk_path,
|
||||
.read_sleep = test_read_sleep,
|
||||
.prog_sleep = test_prog_sleep,
|
||||
@@ -1582,7 +1582,7 @@ static void run_powerloss_cycles(
|
||||
}
|
||||
|
||||
struct powerloss_exhaustive_state {
|
||||
struct lfs3_config *cfg;
|
||||
struct lfs3_cfg *cfg;
|
||||
|
||||
lfs3_emubd_t *branches;
|
||||
size_t branch_count;
|
||||
@@ -1623,8 +1623,8 @@ static void run_powerloss_exhaustive_layer(
|
||||
struct powerloss_exhaustive_cycles *cycles,
|
||||
const struct test_suite *suite,
|
||||
const struct test_case *case_,
|
||||
struct lfs3_config *cfg,
|
||||
struct lfs3_emubd_config *bdcfg,
|
||||
struct lfs3_cfg *cfg,
|
||||
struct lfs3_emubd_cfg *bdcfg,
|
||||
size_t depth,
|
||||
size_t pls) {
|
||||
struct powerloss_exhaustive_state state = {
|
||||
@@ -1691,7 +1691,7 @@ static void run_powerloss_exhaustive(
|
||||
// create block device and configuration
|
||||
lfs3_emubd_t bd;
|
||||
|
||||
struct lfs3_config cfg = {
|
||||
struct lfs3_cfg cfg = {
|
||||
.context = &bd,
|
||||
.read = lfs3_emubd_read,
|
||||
.prog = lfs3_emubd_prog,
|
||||
@@ -1700,7 +1700,7 @@ static void run_powerloss_exhaustive(
|
||||
TEST_CFG
|
||||
};
|
||||
|
||||
struct lfs3_emubd_config bdcfg = {
|
||||
struct lfs3_emubd_cfg bdcfg = {
|
||||
.disk_path = test_disk_path,
|
||||
.read_sleep = test_read_sleep,
|
||||
.prog_sleep = test_prog_sleep,
|
||||
|
||||
@@ -30,7 +30,7 @@ void test_trace(const char *fmt, ...);
|
||||
|
||||
|
||||
// generated test configurations
|
||||
struct lfs3_config;
|
||||
struct lfs3_cfg;
|
||||
|
||||
enum test_flags {
|
||||
TEST_INTERNAL = 0x1,
|
||||
@@ -56,7 +56,7 @@ struct test_case {
|
||||
size_t permutations;
|
||||
|
||||
bool (*if_)(void);
|
||||
void (*run)(struct lfs3_config *cfg);
|
||||
void (*run)(struct lfs3_cfg *cfg);
|
||||
};
|
||||
|
||||
struct test_suite {
|
||||
|
||||
Reference in New Issue
Block a user