root/ncdu-zig
1
0
Fork 0
mirror of https://code.blicky.net/yorhel/ncdu.git synced 2026-01-13 01:08:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix use of u64 atomic integers on 32-bit platforms

Browse source
This commit is contained in:
Yorhel 2024-07-18 10:53:27 +02:00
parent b0d4fbe94f
commit a5e57ee5ad
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/sink.zig
View file

@ -437,7 +437,7 @@ pub const Dir = struct {
pub fn addStat(d: *Dir, t: *Thread, name: []const u8, stat: *const Stat) void { pub fn addStat(d: *Dir, t: *Thread, name: []const u8, stat: *const Stat) void {
_ = t.files_seen.fetchAdd(1, .monotonic); _ = t.files_seen.fetchAdd(1, .monotonic);
_ = t.bytes_seen.fetchAdd((stat.blocks *| 512) / @max(1, stat.nlink), .monotonic); _ = t.addBytes((stat.blocks *| 512) / @max(1, stat.nlink));
std.debug.assert(!stat.dir); std.debug.assert(!stat.dir);
switch (d.out) { switch (d.out) {
.mem => |*m| _ = m.addStat(t.arena.allocator(), name, stat), .mem => |*m| _ = m.addStat(t.arena.allocator(), name, stat),
@ -447,7 +447,7 @@ pub const Dir = struct {
pub fn addDir(d: *Dir, t: *Thread, name: []const u8, stat: *const Stat) *Dir { pub fn addDir(d: *Dir, t: *Thread, name: []const u8, stat: *const Stat) *Dir {
_ = t.files_seen.fetchAdd(1, .monotonic); _ = t.files_seen.fetchAdd(1, .monotonic);
_ = t.bytes_seen.fetchAdd(stat.blocks *| 512, .monotonic); _ = t.addBytes(stat.blocks *| 512);
std.debug.assert(stat.dir); std.debug.assert(stat.dir);
const s = main.allocator.create(Dir) catch unreachable; const s = main.allocator.create(Dir) catch unreachable;
@ -521,11 +521,30 @@ pub const Dir = struct {
pub const Thread = struct { pub const Thread = struct {
current_dir: ?*Dir = null, current_dir: ?*Dir = null,
lock: std.Thread.Mutex = .{}, lock: std.Thread.Mutex = .{},
// On 32-bit architectures, bytes_seen is protected by the above mutex instead.
bytes_seen: std.atomic.Value(u64) = std.atomic.Value(u64).init(0), bytes_seen: std.atomic.Value(u64) = std.atomic.Value(u64).init(0),
files_seen: std.atomic.Value(u64) = std.atomic.Value(u64).init(0), files_seen: std.atomic.Value(u32) = std.atomic.Value(u32).init(0),
// Arena allocator for model.Entry structs, these are never freed. // Arena allocator for model.Entry structs, these are never freed.
arena: std.heap.ArenaAllocator = std.heap.ArenaAllocator.init(std.heap.page_allocator), arena: std.heap.ArenaAllocator = std.heap.ArenaAllocator.init(std.heap.page_allocator),
fn addBytes(t: *Thread, bytes: u64) void {
if (@bitSizeOf(usize) >= 64) _ = t.bytes_seen.fetchAdd(bytes, .monotonic)
else {
t.lock.lock();
defer t.lock.unlock();
t.bytes_seen.raw += bytes;
}
}
fn getBytes(t: *Thread) u64 {
if (@bitSizeOf(usize) >= 64) return t.bytes_seen.load(.monotonic)
else {
t.lock.lock();
defer t.lock.unlock();
return t.bytes_seen.raw;
}
}
pub fn setDir(t: *Thread, d: ?*Dir) void { pub fn setDir(t: *Thread, d: ?*Dir) void {
t.lock.lock(); t.lock.lock();
defer t.lock.unlock(); defer t.lock.unlock();
@ -674,7 +693,7 @@ fn drawConsole() void {
var bytes: u64 = 0; var bytes: u64 = 0;
var files: u64 = 0; var files: u64 = 0;
for (state.threads) |*t| { for (state.threads) |*t| {
bytes +|= t.bytes_seen.load(.monotonic); bytes +|= t.getBytes();
files += t.files_seen.load(.monotonic); files += t.files_seen.load(.monotonic);
} }
const r = ui.FmtSize.fmt(bytes); const r = ui.FmtSize.fmt(bytes);
@ -703,7 +722,7 @@ fn drawProgress() void {
var bytes: u64 = 0; var bytes: u64 = 0;
var files: u64 = 0; var files: u64 = 0;
for (state.threads) |*t| { for (state.threads) |*t| {
bytes +|= t.bytes_seen.load(.monotonic); bytes +|= t.getBytes();
files += t.files_seen.load(.monotonic); files += t.files_seen.load(.monotonic);
} }