Merge pull request #1110 from Ryan-CW-Code/perf_gc

perf: gc might try to populate the lookahead buffer each time
Merge pull request #1109 from Ryan-CW-Code/never_read
2025-06-30 11:39:17 -05:00 · 2025-06-30 11:39:05 -05:00 · 2025-06-30 11:38:56 -05:00 · 2025-06-03 09:46:59 +08:00 · 2025-05-28 10:23:47 +08:00 · 2025-05-27 20:00:29 +08:00
2 changed files with 4 additions and 4 deletions
--- a/1
+++ b/1
@@ -475,6 +475,7 @@ benchmarks-diff: $(BENCH_CSV)
 # rules
 -include $(DEP)
 -include $(TEST_DEP)
+-include $(BENCH_DEP)
 .SUFFIXES:
 .SECONDARY:

--- a/lfs.c
+++ b/lfs.c
@@ -828,9 +828,6 @@ static int lfs_dir_getread(lfs_t *lfs, const lfs_mdir_t *dir,
                size -= diff;
                continue;
            }
-
-            // rcache takes priority
-            diff = lfs_min(diff, rcache->off-off);
        }

        // load to cache, first condition can no longer fail
@@ -5225,7 +5222,9 @@ static int lfs_fs_gc_(lfs_t *lfs) {
    }

    // try to populate the lookahead buffer, unless it's already full
-    if (lfs->lookahead.size < 8*lfs->cfg->lookahead_size) {
+    if (lfs->lookahead.size < lfs_min(
+            8 * lfs->cfg->lookahead_size,
+            lfs->block_count)) {
        err = lfs_alloc_scan(lfs);
        if (err) {
            return err;
Author	SHA1	Message	Date
Christopher Haster	8e251dd675	Merge pull request #1110 from Ryan-CW-Code/perf_gc perf: gc might try to populate the lookahead buffer each time	2025-06-30 11:39:17 -05:00
Christopher Haster	25b9a4af85	Merge pull request #1109 from Ryan-CW-Code/never_read refactor: value stored to 'diff' is never read	2025-06-30 11:39:05 -05:00
Christopher Haster	2acf939a00	Merge pull request #1106 from littlefs-project/fix-make-build-dep make: Add missing BUILD_DEP include	2025-06-30 11:38:56 -05:00
ryancw	d5a86fd28d	style: format code, limit to 80 columns.	2025-06-03 09:46:59 +08:00
ryancw	2349ac8c96	perf: gc might try to populate the lookahead buffer each time	2025-05-28 10:23:47 +08:00
ryancw	0755b00c21	refactor: value stored to 'diff' is never read	2025-05-27 20:00:29 +08:00
Christopher Haster	8365bbb7a2	make: Added missing BUILD_DEP include This was preventing bench modifications from triggering relevant bench-runner rebuilds.	2025-05-15 13:38:31 -05:00