gbmap: Tried to adopt the gbmap name more consistently

Having gbmap/bmap used in different places for the same thing was
confusing. Preferring gbmap as it is consistent with other gstate (grm
queue, gcksums), even if it is a bit noisy.

It's interesting to note what didn't change:

- The BM* range tags: LFS3_TAG_BMFREE, etc. These already differs from
  the GBMAP* prefix enough, and adopting GBM* would risk confusion for
  actual gstate.

- The gbmap revdbg string: "bb~r". We don't have enough characters for
  anything else!

- dbgbmap.py/dbgbmapsvg.py. These aren't actually related to the gbmap,
  so the name difference is a good thing.
This commit is contained in:
Christopher Haster
2025-10-06 14:05:31 -05:00
parent 9d322741ca
commit 9b4ee982bc
14 changed files with 488 additions and 487 deletions
+8 -8
View File
@@ -7,9 +7,9 @@
# since you can usually ignore allocator issues temporarily by making the test
# device really big
#
after = ['test_mtree', 'test_bmap', 'test_dirs', 'test_files']
after = ['test_mtree', 'test_gbmap', 'test_dirs', 'test_files']
defines.INIT_BLOCKS = 'LFS3_IFDEF_BMAP(3, 2)'
defines.INIT_BLOCKS = 'LFS3_IFDEF_GBMAP(3, 2)'
# test that we can alloc
[cases.test_alloc_alloc]
@@ -49,9 +49,9 @@ code = '''
}
// excluding our mroot, we should have allocated exactly
// block_count-2 blocks (this gets more complicated with a bmap)
// block_count-2 blocks (this gets more complicated with a gbmap)
printf("alloced %d/%d blocks\n", alloced, (lfs3_block_t)COUNT);
#ifndef LFS3_BMAP
#ifndef LFS3_GBMAP
assert(alloced == COUNT-2);
#endif
@@ -96,9 +96,9 @@ code = '''
}
// excluding our mroot, we should have allocated exactly
// block_count-2 blocks (this gets more complicated with a bmap)
// block_count-2 blocks (this gets more complicated with a gbmap)
printf("alloced %d/%d blocks\n", alloced, (lfs3_block_t)COUNT);
#ifndef LFS3_BMAP
#ifndef LFS3_GBMAP
assert(alloced == COUNT-2);
#endif
@@ -119,9 +119,9 @@ code = '''
}
// excluding our mroot, we should have allocated exactly
// block_count-2 blocks (this gets more complicated with a bmap)
// block_count-2 blocks (this gets more complicated with a gbmap)
printf("alloced %d/%d blocks\n", alloced, (lfs3_block_t)COUNT);
#ifndef LFS3_BMAP
#ifndef LFS3_GBMAP
assert(alloced == COUNT-2);
#endif