all tests passing / misc fixes

build.zig

@@ -131,7 +131,6 @@ pub fn build(b: *Build) void {
         .optimize = optimize,
         .filters = filters orelse &.{},
         .sanitize_thread = enable_tsan,
-        .test_runner = b.path("src/test_runner.zig"),
     });
     b.installArtifact(unit_tests_exe);
     unit_tests_exe.root_module.addImport("base58-zig", base58_module);

src/accountsdb/buffer_pool.zig

@@ -263,7 +263,7 @@ pub const BufferPool = struct {
             return error.CannotOverwriteAliveInfo;
         }
 
-        self.frames_metadata.freq[f_idx] = 0;
+        self.frames_metadata.freqSetToZero(f_idx);
         self.frames_metadata.in_queue[f_idx] = .none;
         self.frames_metadata.rc[f_idx].reset();
 
@@ -603,6 +603,8 @@ pub const FramesMetadata = struct {
     }
 
     fn freqDecrement(self: FramesMetadata, index: FrameIndex) void {
+        // note for reviewers: I myself do not trust this code, have a think about it
+
         const old_freq = @atomicRmw(u2, &self.freq[index], .Add, 1, .acq_rel);
         if (old_freq == 3) {
             // we overflowed (0->3), set back to min
@@ -620,6 +622,11 @@ pub const FramesMetadata = struct {
         // note for reviewers: I myself do not trust this code, have a think about it
         @atomicStore(u2, &self.freq[index], 1, .release);
     }
+
+    fn freqSetToZero(self: FramesMetadata, index: FrameIndex) void {
+        // note for reviewers: I myself do not trust this code, have a think about it
+        @atomicStore(u2, &self.freq[index], 0, .release);
+    }
 };
 
 /// This cache is S3-FIFO inspired, with some important modifications to reads

src/accountsdb/db.zig

@@ -267,6 +267,7 @@ pub const AccountsDB = struct {
         {
             const file_map, var file_map_lg = self.file_map.writeWithLock();
             defer file_map_lg.unlock();
+            for (file_map.values()) |v| v.deinit();
             file_map.deinit(self.allocator);
         }
         {
@@ -664,6 +665,9 @@ pub const AccountsDB = struct {
             };
             errdefer accounts_file.deinit();
 
+            const file_id = file_info.id;
+            file_map.putAssumeCapacityNoClobber(file_id, accounts_file);
+
             // index the account file
             var slot_references = std.ArrayListUnmanaged(AccountRef).initBuffer(
                 references_buf[n_accounts_total..],
@@ -705,7 +709,7 @@ pub const AccountsDB = struct {
                 const geyser_writer = self.geyser_writer.?; // SAFE: will always be set if geyser_is_enabled
 
                 // ! reset memory for the next slot
-                defer geyser_storage.reset();
+                defer geyser_storage.reset(self.allocator);
 
                 const data_versioned: sig.geyser.core.VersionedAccountPayload = .{
                     .AccountPayloadV1 = .{
@@ -717,8 +721,6 @@ pub const AccountsDB = struct {
                 try geyser_writer.writePayloadToPipe(data_versioned);
             }
 
-            const file_id = file_info.id;
-            file_map.putAssumeCapacityNoClobber(file_id, accounts_file);
             self.largest_file_id = FileId.max(self.largest_file_id, file_id);
             _ = self.largest_rooted_slot.fetchMax(slot, .release);
             self.largest_flushed_slot.store(self.largest_rooted_slot.load(.acquire), .release);
@@ -1937,7 +1939,9 @@ pub const AccountsDB = struct {
                 accounts_alive_size,
                 slot,
             );
-            defer new_file.close();
+            // don't close file if it ends up in file_map
+            var new_file_in_map = false;
+            defer if (!new_file_in_map) new_file.close();
 
             var file_size: usize = 0;
             account_iter.reset();
@@ -1983,6 +1987,7 @@ pub const AccountsDB = struct {
                 new_account_file.number_of_accounts = accounts_alive_count;
 
                 file_map.putAssumeCapacityNoClobber(new_file_id, new_account_file);
+                new_file_in_map = true;
             }
 
             // update the references
@@ -3199,16 +3204,20 @@ pub const GeyserTmpStorage = struct {
         self.pubkeys.deinit();
     }
 
-    pub fn reset(self: *Self) void {
+    pub fn reset(
+        self: *Self,
+        allocator: std.mem.Allocator,
+    ) void {
+        for (self.accounts.items) |account| account.deinit(allocator);
         self.accounts.clearRetainingCapacity();
         self.pubkeys.clearRetainingCapacity();
     }
 
     pub fn cloneAndTrack(self: *Self, allocator: std.mem.Allocator, account_in_file: AccountInFile) Error!void {
-        // doesn't feel great allocating this?
         const account = try account_in_file.toOwnedAccount(allocator);
         errdefer account.deinit(allocator);
         self.accounts.append(account) catch return Error.OutOfGeyserArrayMemory;
+        errdefer _ = self.accounts.pop();
         self.pubkeys.append(account_in_file.pubkey().*) catch return Error.OutOfGeyserArrayMemory;
     }
 };