@@ -224,7 +224,7 @@ static int iter_all_kv(fdb_kvdb_t db, struct test_kv *kv_tbl)
224
224
return index ;
225
225
}
226
226
227
- static void test_fdb_by_kvs (struct test_kv * kv_tbl , size_t len )
227
+ static void test_fdb_by_kvs (const struct test_kv * kv_tbl , size_t len )
228
228
{
229
229
struct fdb_blob blob_obj , * blob = & blob_obj ;
230
230
static struct test_kv saved_kv_tbl [TEST_KV_NUM ] = { 0 };
@@ -274,16 +274,15 @@ static void test_fdb_gc(void)
274
274
* | | | | |
275
275
* +---------------------------------------------------------+
276
276
*/
277
- struct test_kv kv_tbl [TEST_KV_NUM ] = {
277
+ const struct test_kv kv_tbl [] = {
278
278
{"kv0" , "0" , 0 , 0 , 1 },
279
279
{"kv1" , "1" , 0 , 0 , 1 },
280
280
{"kv2" , "2" , 0 , 0 , 1 },
281
281
{"kv3" , "3" , 1 , 0 , 1 },
282
282
};
283
283
284
- test_fdb_by_kvs (kv_tbl , sizeof (kv_tbl )/ sizeof (kv_tbl [0 ]));
284
+ test_fdb_by_kvs (kv_tbl , sizeof (kv_tbl ) / sizeof (kv_tbl [0 ]));
285
285
uassert_true (RT_ALIGN_DOWN (test_kvdb .parent .oldest_addr , TEST_KVDB_SECTOR_SIZE ) == TEST_KVDB_SECTOR_SIZE * 0 );
286
-
287
286
}
288
287
289
288
{
@@ -309,7 +308,7 @@ static void test_fdb_gc(void)
309
308
* | | | | |
310
309
* +--------------+-------------+--------------+-------------+
311
310
*/
312
- struct test_kv kv_tbl [TEST_KV_NUM ] = {
311
+ const struct test_kv kv_tbl [] = {
313
312
{"kv1" , "1" , 0 , 0 , 0 },
314
313
{"kv2" , "2" , 0 , 0 , 0 },
315
314
{"kv0" , "00" , 1 , 0 , 1 },
@@ -345,7 +344,7 @@ static void test_fdb_gc(void)
345
344
* +--------------+-------------+--------------+-------------+
346
345
*
347
346
* step2.1: change kv3, start GC, only GC 1 sector on FlashDB V1.2
348
- *
347
+ *
349
348
* +--------------+-------------+--------------+-------------+
350
349
* | sector0 | sector1 | sector2 | sector3 |
351
350
* | empty | using | using | empty |
@@ -364,9 +363,9 @@ static void test_fdb_gc(void)
364
363
* | +----------------------------+ |
365
364
* | | | | |
366
365
* +--------------+-------------+--------------+-------------+
367
- *
366
+ *
368
367
* step2.2: change kv3
369
- *
368
+ *
370
369
* +--------------+-------------+--------------+-------------+
371
370
* | sector0 | sector1 | sector2 | sector3 |
372
371
* | empty | using | using | using |
@@ -387,7 +386,7 @@ static void test_fdb_gc(void)
387
386
* +--------------+-------------+--------------+-------------+
388
387
*
389
388
*/
390
- struct test_kv kv_tbl [TEST_KV_NUM ] = {
389
+ const struct test_kv kv_tbl [] = {
391
390
{"kv0" , "000" , 2 , 0 , 1 },
392
391
{"kv1" , "111" , 2 , 0 , 1 },
393
392
{"kv2" , "222" , 2 , 0 , 1 },
@@ -485,7 +484,7 @@ static void test_fdb_gc(void)
485
484
* | | | | |
486
485
* +--------------+-------------+--------------+-------------+
487
486
*/
488
- struct test_kv kv_tbl [TEST_KV_NUM ] = {
487
+ const struct test_kv kv_tbl [] = {
489
488
{"kv0" , "0000" , 3 , 0 , 1 },
490
489
{"kv1" , "1111" , 3 , 0 , 1 },
491
490
{"kv2" , "2222" , 0 , 0 , 1 },
@@ -496,14 +495,12 @@ static void test_fdb_gc(void)
496
495
uassert_true (RT_ALIGN_DOWN (test_kvdb .parent .oldest_addr , TEST_KVDB_SECTOR_SIZE ) == TEST_KVDB_SECTOR_SIZE * 2 );
497
496
}
498
497
499
- {
500
- /* check the oldest address is already right when kvdb reinit */
501
- extern void test_fdb_kvdb_deinit (void );
502
- test_fdb_kvdb_deinit ();
503
- test_fdb_kvdb_init ();
498
+ /* check the oldest address is already right when kvdb reinit */
499
+ extern void test_fdb_kvdb_deinit (void );
500
+ test_fdb_kvdb_deinit ();
501
+ test_fdb_kvdb_init ();
504
502
505
- uassert_true (RT_ALIGN_DOWN (test_kvdb .parent .oldest_addr , TEST_KVDB_SECTOR_SIZE ) == TEST_KVDB_SECTOR_SIZE * 2 );
506
- }
503
+ uassert_true (RT_ALIGN_DOWN (test_kvdb .parent .oldest_addr , TEST_KVDB_SECTOR_SIZE ) == TEST_KVDB_SECTOR_SIZE * 2 );
507
504
}
508
505
509
506
static void test_fdb_kvdb_set_default (void )
0 commit comments