Present max_cache_size in bytes

Author: jpnurmi

examples/example.c

@@ -505,7 +505,7 @@ main(int argc, char **argv)
     }
     if (has_arg(argc, argv, "cache-keep")) {
         sentry_options_set_cache_keep(options, true);
-        sentry_options_set_cache_max_size(options, 1000 * 8);
+        sentry_options_set_cache_max_size(options, 4 * 1024 * 1024);
         sentry_options_set_cache_max_age(options, 5 * 24 * 60 * 60);
     }
 

include/sentry.h

@@ -1382,7 +1382,7 @@ SENTRY_API int sentry_options_get_symbolize_stacktraces(
 SENTRY_API void sentry_options_set_cache_keep(
     sentry_options_t *opts, int enabled);
 /**
- * Sets the maximum size (kb) for the cache folder.
+ * Sets the maximum size (in bytes) for the cache folder.
  * On startup, we check new->old entries, and remove those that go over either
  * boundary.
  */

src/backends/sentry_backend_crashpad.cpp

@@ -749,7 +749,8 @@ crashpad_backend_prune_database(sentry_backend_t *backend)
         data->db->CleanDatabase(options->cache_max_age);
         crashpad::BinaryPruneCondition condition(
             crashpad::BinaryPruneCondition::OR,
-            new crashpad::DatabaseSizePruneCondition(options->cache_max_size),
+            new crashpad::DatabaseSizePruneCondition(
+                options->cache_max_size / 1024),
             new crashpad::AgePruneCondition(
                 options->cache_max_age / (24 * 60 * 60)));
         crashpad::PruneCrashReportDatabase(data->db, &condition);

src/sentry_database.c

@@ -323,17 +323,9 @@ sentry__process_old_runs(const sentry_options_t *options, uint64_t last_crash)
 typedef struct {
     sentry_path_t *path;
     time_t mtime;
-    size_t size_in_kb;
+    size_t size;
 } cache_entry_t;
 
-static size_t
-get_file_size_in_kb(const sentry_path_t *path)
-{
-    size_t bytes = sentry__path_get_size(path);
-    // Round up to next KB boundary
-    return (bytes + 1023) / 1024;
-}
-
 /**
  * Comparison function to sort cache entries by mtime, newest first.
  */
@@ -398,7 +390,7 @@ sentry__cleanup_cache(const sentry_options_t *options)
 
         entries[entries_count].path = sentry__path_clone(entry);
         entries[entries_count].mtime = sentry__path_get_mtime(entry);
-        entries[entries_count].size_in_kb = get_file_size_in_kb(entry);
+        entries[entries_count].size = sentry__path_get_size(entry);
         entries_count++;
     }
     sentry__pathiter_free(iter);
@@ -414,7 +406,7 @@ sentry__cleanup_cache(const sentry_options_t *options)
 
     // Prune entries: iterate newest-to-oldest, accumulating size
     // Remove if: too old OR accumulated size exceeds limit
-    size_t accumulated_size_kb = 0;
+    size_t accumulated_size = 0;
     for (size_t i = 0; i < entries_count; i++) {
         bool should_prune = false;
 
@@ -424,9 +416,9 @@ sentry__cleanup_cache(const sentry_options_t *options)
         }
 
         // Size-based pruning (accumulate size as we go, like crashpad)
-        accumulated_size_kb += entries[i].size_in_kb;
+        accumulated_size += entries[i].size;
         if (options->cache_max_size > 0
-            && accumulated_size_kb > (size_t)options->cache_max_size) {
+            && accumulated_size > options->cache_max_size) {
             should_prune = true;
         }
 

src/sentry_options.c

@@ -55,7 +55,7 @@ sentry_options_new(void)
     opts->crashpad_limit_stack_capture_to_sp = false;
     opts->cache_keep = false;
     opts->cache_max_age = 2 * 24 * 60 * 60;
-    opts->cache_max_size = 1024 * 8;
+    opts->cache_max_size = 8 * 1024 * 1024;
     opts->symbolize_stacktraces =
     // AIX doesn't have reliable debug IDs for server-side symbolication,
     // and the diversity of Android makes it infeasible to have access to debug

src/sentry_options.h

@@ -48,7 +48,7 @@ struct sentry_options_s {
     bool cache_keep;
 
     uint64_t cache_max_age;
-    size_t cache_max_size; // TODO in kb?
+    size_t cache_max_size;
 
     sentry_attachment_t *attachments;
     sentry_run_t *run;

tests/test_integration_cache.py

@@ -79,19 +79,19 @@ def test_cache_max_size(cmake, backend):
             cache_files = list(cache_dir.glob("*.envelope"))
             for f in cache_files:
                 with open(f, "r+b") as file:
-                    file.truncate(2048 * 1000)
+                    file.truncate(2 * 1024 * 1024)
 
     run(
         tmp_path,
         "sentry_example",
         ["log", "cache-keep", "no-setup"],
     )
 
-    # max 8mb
+    # max 4mb
     assert cache_dir.exists()
     cache_files = list(cache_dir.glob("*.envelope"))
-    assert len(cache_files) <= 4
-    assert sum(f.stat().st_size for f in cache_files) <= 8 * 1000 * 1024
+    assert len(cache_files) <= 2
+    assert sum(f.stat().st_size for f in cache_files) <= 4 * 1024 * 1024
 
 
 @pytest.mark.parametrize(

tests/unit/test_cache.c

@@ -87,7 +87,7 @@ SENTRY_TEST(cache_max_size)
     SENTRY_TEST_OPTIONS_NEW(options);
     sentry_options_set_dsn(options, "https://[email protected]/42");
     sentry_options_set_cache_keep(options, true);
-    sentry_options_set_cache_max_size(options, 10); // 10 kb
+    sentry_options_set_cache_max_size(options, 10 * 1024); // 10 kb
     sentry_init(options);
 
     sentry_path_t *cache_path