SharedPtr refactoring

Author: lalinsky

src/Index.zig

@@ -23,7 +23,7 @@ const FileSegment = @import("FileSegment.zig");
 const FileSegmentList = SegmentList(FileSegment);
 const FileSegmentNode = FileSegmentList.Node;
 
-const SharedPtr = @import("utils/smartptr.zig").SharedPtr;
+const SharedPtr = @import("utils/shared_ptr.zig").SharedPtr;
 
 const SegmentMerger = @import("segment_merger.zig").SegmentMerger;
 

src/segment_list.zig

@@ -9,7 +9,7 @@ const SegmentInfo = @import("segment.zig").SegmentInfo;
 
 const Deadline = @import("utils/Deadline.zig");
 
-const SharedPtr = @import("utils/smartptr.zig").SharedPtr;
+const SharedPtr = @import("utils/shared_ptr.zig").SharedPtr;
 const TieredMergePolicy = @import("segment_merge_policy.zig").TieredMergePolicy;
 const SegmentMerger = @import("segment_merger.zig").SegmentMerger;
 
@@ -51,7 +51,7 @@ pub fn SegmentList(Segment: type) type {
 
         pub fn deinit(self: *Self, allocator: Allocator, delete_files: KeepOrDelete) void {
             for (self.nodes.items) |*node| {
-                node.release(allocator, .{delete_files});
+                node.release(allocator, Segment.deinit, .{delete_files});
             }
             self.nodes.deinit(allocator);
         }
@@ -61,11 +61,11 @@ pub fn SegmentList(Segment: type) type {
         }
 
         pub fn destroySegment(allocator: Allocator, segment: *Node) void {
-            segment.release(allocator, .{.delete});
+            segment.release(allocator, Segment.deinit, .{.delete});
         }
 
         pub fn destroySegments(allocator: Allocator, segments: *SharedPtr(Self)) void {
-            segments.release(allocator, .{ allocator, .delete });
+            segments.release(allocator, Self.deinit, .{ allocator, .delete });
         }
 
         pub fn appendSegmentInto(self: Self, copy: *Self, node: Node) void {
@@ -173,7 +173,7 @@ pub fn SegmentListManager(Segment: type) type {
         }
 
         pub fn deinit(self: *Self, allocator: Allocator, delete_files: KeepOrDelete) void {
-            self.segments.release(allocator, .{ allocator, delete_files });
+            self.segments.release(allocator, List.deinit, .{ allocator, delete_files });
         }
 
         pub fn count(self: Self) usize {

src/segment_merge_policy.zig

@@ -1,7 +1,7 @@
 const std = @import("std");
 const log = std.log.scoped(.segment_merge_policy);
 
-const SharedPtr = @import("utils/smartptr.zig").SharedPtr;
+const SharedPtr = @import("utils/shared_ptr.zig").SharedPtr;
 
 // This code is largely based on Michael McCandless' TieredMergePolicy from Lucene:
 //   https://issues.apache.org/jira/browse/LUCENE-854

src/segment_merger.zig

@@ -4,7 +4,7 @@ const common = @import("common.zig");
 const Item = common.Item;
 const SegmentInfo = @import("segment.zig").SegmentInfo;
 
-const SharedPtr = @import("utils/smartptr.zig").SharedPtr;
+const SharedPtr = @import("utils/shared_ptr.zig").SharedPtr;
 const SegmentList = @import("segment_list.zig").SegmentList;
 
 pub const MergedSegmentInfo = struct {

src/utils/smartptr.zig src/utils/shared_ptr.zig

@@ -14,11 +14,13 @@ pub fn RefCounter(comptime T: type) type {
             };
         }
 
+        // Increases the reference count.
         pub fn incr(self: *Self) void {
             const prev_ref_count = self.refs.fetchAdd(1, .monotonic);
             std.debug.assert(prev_ref_count > 0);
         }
 
+        // Decreases the reference count and returns true if it reached zero.
         pub fn decr(self: *Self) bool {
             const prev_ref_count = self.refs.fetchSub(1, .monotonic);
             if (prev_ref_count == 1) {
@@ -60,21 +62,10 @@ pub fn SharedPtr(comptime T: type) type {
             return .{ .value = &inner_ptr.value };
         }
 
-        pub fn release(self: *Self, allocator: Allocator, deinit_args: anytype) void {
+        pub fn release(self: *Self, allocator: Allocator, cleanupFn: anytype, cleanup_args: anytype) void {
             const inner_ptr = self.getInnerPtr();
             if (inner_ptr.refs.decr()) {
-                if (std.meta.hasMethod(T, "deinit")) {
-                    @call(.auto, T.deinit, .{&inner_ptr.value} ++ deinit_args);
-                }
-                allocator.destroy(inner_ptr);
-                self.value = undefined;
-            }
-        }
-
-        pub fn releaseWithCleanup(self: *Self, allocator: Allocator, cleanupFn: anytype, extra_args: anytype) void {
-            const inner_ptr = self.getInnerPtr();
-            if (inner_ptr.refs.decr()) {
-                @call(.auto, cleanupFn, .{&inner_ptr.value} ++ extra_args);
+                @call(.auto, cleanupFn, .{&inner_ptr.value} ++ cleanup_args);
                 allocator.destroy(inner_ptr);
                 self.value = undefined;
             }