Github/littlefs
1
Fork 0
Code Actions Activity

Renamed lower/upper -> lower_rid/upper_rid for consistency/clarity

Browse Source 
The lower/upper names were introduced fairly early. I think before
appendattr bounds included lower_tag/upper_tag? Since then the explicit
lower_rid/upper_rid names have become more common.

Changing for consistency, and because, you know, it's probably a bit
better to indicate what these variables actually are the lower/upper
bounds of...
This commit is contained in:
Christopher Haster
2024-03-30 01:58:06 -05:00
parent 079f4f67fb
commit 0475af0415
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+27 -27
View File
@@ -887,16 +887,16 @@ static inline lfsr_tag_t lfsr_tag_isparallel(lfsr_tag_t a, lfsr_tag_t b) {
static inline bool lfsr_tag_follow( static inline bool lfsr_tag_follow(
lfsr_tag_t alt, lfsr_rid_t weight, lfsr_tag_t alt, lfsr_rid_t weight,
lfsr_srid_t lower, lfsr_srid_t upper, lfsr_srid_t lower_rid, lfsr_srid_t upper_rid,
lfsr_srid_t rid, lfsr_tag_t tag) { lfsr_srid_t rid, lfsr_tag_t tag) {
if (lfsr_tag_isgt(alt)) { if (lfsr_tag_isgt(alt)) {
return rid > upper - (lfsr_srid_t)weight - 1 return rid > upper_rid - (lfsr_srid_t)weight - 1
|| (rid == upper - (lfsr_srid_t)weight - 1 || (rid == upper_rid - (lfsr_srid_t)weight - 1
&& (lfsr_tag_isa(alt) && (lfsr_tag_isa(alt)
|| lfsr_tag_key(tag) > lfsr_tag_key(alt))); || lfsr_tag_key(tag) > lfsr_tag_key(alt)));
} else { } else {
return rid < lower + (lfsr_srid_t)weight - 1 return rid < lower_rid + (lfsr_srid_t)weight - 1
|| (rid == lower + (lfsr_srid_t)weight - 1 || (rid == lower_rid + (lfsr_srid_t)weight - 1
&& (!lfsr_tag_isn(alt) && (!lfsr_tag_isn(alt)
&& lfsr_tag_key(tag) <= lfsr_tag_key(alt))); && lfsr_tag_key(tag) <= lfsr_tag_key(alt)));
} }
@@ -905,31 +905,31 @@ static inline bool lfsr_tag_follow(
static inline bool lfsr_tag_follow2( static inline bool lfsr_tag_follow2(
lfsr_tag_t alt, lfsr_rid_t weight, lfsr_tag_t alt, lfsr_rid_t weight,
lfsr_tag_t alt2, lfsr_rid_t weight2, lfsr_tag_t alt2, lfsr_rid_t weight2,
lfsr_srid_t lower, lfsr_srid_t upper, lfsr_srid_t lower_rid, lfsr_srid_t upper_rid,
lfsr_srid_t rid, lfsr_tag_t tag) { lfsr_srid_t rid, lfsr_tag_t tag) {
if (lfsr_tag_isred(alt2) && lfsr_tag_isparallel(alt, alt2)) { if (lfsr_tag_isred(alt2) && lfsr_tag_isparallel(alt, alt2)) {
weight += weight2; weight += weight2;
} }
return lfsr_tag_follow(alt, weight, lower, upper, rid, tag); return lfsr_tag_follow(alt, weight, lower_rid, upper_rid, rid, tag);
} }
static inline void lfsr_tag_flip( static inline void lfsr_tag_flip(
lfsr_tag_t *alt, lfsr_rid_t *weight, lfsr_tag_t *alt, lfsr_rid_t *weight,
lfsr_srid_t lower, lfsr_srid_t upper) { lfsr_srid_t lower_rid, lfsr_srid_t upper_rid) {
*alt = *alt ^ LFSR_TAG_GT; *alt = *alt ^ LFSR_TAG_GT;
*weight = (upper - lower) - *weight; *weight = (upper_rid - lower_rid) - *weight;
} }
static inline void lfsr_tag_flip2( static inline void lfsr_tag_flip2(
lfsr_tag_t *alt, lfsr_rid_t *weight, lfsr_tag_t *alt, lfsr_rid_t *weight,
lfsr_tag_t alt2, lfsr_rid_t weight2, lfsr_tag_t alt2, lfsr_rid_t weight2,
lfsr_srid_t lower, lfsr_srid_t upper) { lfsr_srid_t lower_rid, lfsr_srid_t upper_rid) {
if (lfsr_tag_isred(alt2)) { if (lfsr_tag_isred(alt2)) {
*weight += weight2; *weight += weight2;
} }
lfsr_tag_flip(alt, weight, lower, upper); lfsr_tag_flip(alt, weight, lower_rid, upper_rid);
} }
static inline void lfsr_tag_trim( static inline void lfsr_tag_trim(
@@ -2417,8 +2417,8 @@ static int lfsr_rbyd_lookupnext(lfs_t *lfs, const lfsr_rbyd_t *rbyd,
// keep track of bounds as we descend down the tree // keep track of bounds as we descend down the tree
lfs_size_t branch = lfsr_rbyd_trunk(rbyd); lfs_size_t branch = lfsr_rbyd_trunk(rbyd);
lfsr_srid_t lower = 0; lfsr_srid_t lower_rid = 0;
lfsr_srid_t upper = rbyd->weight; lfsr_srid_t upper_rid = rbyd->weight;
// descend down tree // descend down tree
while (true) { while (true) {
@@ -2434,19 +2434,19 @@ static int lfsr_rbyd_lookupnext(lfs_t *lfs, const lfsr_rbyd_t *rbyd,
// found an alt? // found an alt?
if (lfsr_tag_isalt(alt)) { if (lfsr_tag_isalt(alt)) {
if (lfsr_tag_follow(alt, weight, lower, upper, rid, tag)) { if (lfsr_tag_follow(alt, weight, lower_rid, upper_rid, rid, tag)) {
lfsr_tag_flip(&alt, &weight, lower, upper); lfsr_tag_flip(&alt, &weight, lower_rid, upper_rid);
lfsr_tag_trim(alt, weight, &lower, &upper, NULL, NULL); lfsr_tag_trim(alt, weight, &lower_rid, &upper_rid, NULL, NULL);
branch = branch - jump; branch = branch - jump;
} else { } else {
lfsr_tag_trim(alt, weight, &lower, &upper, NULL, NULL); lfsr_tag_trim(alt, weight, &lower_rid, &upper_rid, NULL, NULL);
branch = branch + d; branch = branch + d;
} }
// found end of tree? // found end of tree?
} else { } else {
// update the tag rid // update the tag rid
lfsr_srid_t rid__ = upper-1; lfsr_srid_t rid__ = upper_rid-1;
lfsr_tag_t tag__ = lfsr_tag_key(alt); lfsr_tag_t tag__ = lfsr_tag_key(alt);
// not what we're looking for? // not what we're looking for?
@@ -2465,7 +2465,7 @@ static int lfsr_rbyd_lookupnext(lfs_t *lfs, const lfsr_rbyd_t *rbyd,
*tag_ = tag__; *tag_ = tag__;
} }
if (weight_) { if (weight_) {
*weight_ = upper - lower; *weight_ = upper_rid - lower_rid;
} }
if (data_) { if (data_) {
*data_ = LFSR_DATA_DISK(rbyd->blocks[0], branch + d, jump); *data_ = LFSR_DATA_DISK(rbyd->blocks[0], branch + d, jump);
@@ -3865,10 +3865,10 @@ static lfs_scmp_t lfsr_rbyd_namelookup(lfs_t *lfs, const lfsr_rbyd_t *rbyd,
} }
// binary search for our name // binary search for our name
lfsr_srid_t lower = 0; lfsr_srid_t lower_rid = 0;
lfsr_srid_t upper = rbyd->weight; lfsr_srid_t upper_rid = rbyd->weight;
lfs_scmp_t cmp; lfs_scmp_t cmp;
while (lower < upper) { while (lower_rid < upper_rid) {
lfsr_tag_t tag__; lfsr_tag_t tag__;
lfsr_srid_t rid__; lfsr_srid_t rid__;
lfsr_rid_t weight__; lfsr_rid_t weight__;
@@ -3876,7 +3876,7 @@ static lfs_scmp_t lfsr_rbyd_namelookup(lfs_t *lfs, const lfsr_rbyd_t *rbyd,
int err = lfsr_rbyd_lookupnext(lfs, rbyd, int err = lfsr_rbyd_lookupnext(lfs, rbyd,
// lookup ~middle rid, note we may end up in the middle // lookup ~middle rid, note we may end up in the middle
// of a weighted rid with this // of a weighted rid with this
lower + (upper-1-lower)/2, 0, lower_rid + (upper_rid-1-lower_rid)/2, 0,
&rid__, &tag__, &weight__, &data__); &rid__, &tag__, &weight__, &data__);
if (err) { if (err) {
LFS_ASSERT(err != LFS_ERR_NOENT); LFS_ASSERT(err != LFS_ERR_NOENT);
@@ -3898,11 +3898,11 @@ static lfs_scmp_t lfsr_rbyd_namelookup(lfs_t *lfs, const lfsr_rbyd_t *rbyd,
// bisect search space // bisect search space
if (cmp > LFS_CMP_EQ) { if (cmp > LFS_CMP_EQ) {
upper = rid__ - (weight__-1); upper_rid = rid__ - (weight__-1);
// only keep track of best-match rids > our target if we haven't // only keep track of best-match rids > our target if we haven't
// seen an rid < our target // seen an rid < our target
if (lower == 0) { if (lower_rid == 0) {
if (rid_) { if (rid_) {
*rid_ = rid__; *rid_ = rid__;
} }
@@ -3918,7 +3918,7 @@ static lfs_scmp_t lfsr_rbyd_namelookup(lfs_t *lfs, const lfsr_rbyd_t *rbyd,
} }
} else if (cmp < LFS_CMP_EQ) { } else if (cmp < LFS_CMP_EQ) {
lower = rid__ + 1; lower_rid = rid__ + 1;
// keep track of best-matching rid < our target // keep track of best-matching rid < our target
if (rid_) { if (rid_) {
@@ -3955,7 +3955,7 @@ static lfs_scmp_t lfsr_rbyd_namelookup(lfs_t *lfs, const lfsr_rbyd_t *rbyd,
// no match, return if found name was lt/gt expect // no match, return if found name was lt/gt expect
// //
// this will always be lt unless all rids are gt // this will always be lt unless all rids are gt
return (lower == 0) ? LFS_CMP_GT : LFS_CMP_LT; return (lower_rid == 0) ? LFS_CMP_GT : LFS_CMP_LT;
} }