andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Bi formatting in debug allocator instead of our own bad solution now that PR has been merged in zig

Browse Source
This commit is contained in:
Alexandros Naskos 2020-06-12 21:33:40 +03:00
parent 04638a6d4d
commit 5c78e88b19
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/debug_allocator.zig
View File

@ -4,13 +4,6 @@ const std = @import("std");
const DebugAllocator = @This(); const DebugAllocator = @This();
fn toMB(value: var) f64 {
return switch (@TypeOf(value)) {
f64 => value / (1024 * 1024),
else => @intToFloat(f64, value) / (1024 * 1024),
};
}
const Stats = struct { const Stats = struct {
mean: f64 = 0, mean: f64 = 0,
mean_of_squares: f64 = 0, mean_of_squares: f64 = 0,
@ -52,33 +45,32 @@ pub const AllocationInfo = struct {
) !void { ) !void {
@setEvalBranchQuota(2000); @setEvalBranchQuota(2000);
// TODO Fix these to use `Bi` and remove toMB once `https://github.com/ziglang/zig/pull/5592` is accepted
return std.fmt.format( return std.fmt.format(
out_stream, out_stream,
\\------------------------------------------ Allocation info ------------------------------------------ \\------------------------------------------ Allocation info ------------------------------------------
\\{} total allocations (total: {d:.2} MB, mean: {d:.2} MB, std. dev: {d:.2} MB), {} deallocations \\{} total allocations (total: {Bi:.2}, mean: {Bi:.2}, std. dev: {Bi:.2} MB), {} deallocations
\\{} current allocations ({d:.2} MB), peak mem usage: {d:.2} MB \\{} current allocations ({Bi:.2}), peak mem usage: {Bi:.2}
\\{} reallocations (total: {d:.2} MB, mean: {d:.2} MB, std. dev: {d:.2} MB) \\{} reallocations (total: {Bi:.2}, mean: {Bi:.2}, std. dev: {Bi:.2})
\\{} shrinks (total: {d:.2} MB, mean: {d:.2} MB, std. dev: {d:.2} MB) \\{} shrinks (total: {Bi:.2}, mean: {Bi:.2}, std. dev: {Bi:.2})
\\----------------------------------------------------------------------------------------------------- \\-----------------------------------------------------------------------------------------------------
, ,
.{ .{
self.allocation_stats.count, self.allocation_stats.count,
toMB(self.allocation_stats.total), self.allocation_stats.total,
toMB(self.allocation_stats.mean), self.allocation_stats.mean,
toMB(self.allocation_stats.stdDev()), self.allocation_stats.stdDev(),
self.deallocation_count, self.deallocation_count,
self.allocation_stats.count - self.deallocation_count, self.allocation_stats.count - self.deallocation_count,
toMB(self.currentlyAllocated()), self.currentlyAllocated(),
toMB(self.peak_allocated), self.peak_allocated,
self.reallocation_stats.count, self.reallocation_stats.count,
toMB(self.reallocation_stats.total), self.reallocation_stats.total,
toMB(self.reallocation_stats.mean), self.reallocation_stats.mean,
toMB(self.reallocation_stats.stdDev()), self.reallocation_stats.stdDev(),
self.shrink_stats.count, self.shrink_stats.count,
toMB(self.shrink_stats.total), self.shrink_stats.total,
toMB(self.shrink_stats.mean), self.shrink_stats.mean,
toMB(self.shrink_stats.stdDev()), self.shrink_stats.stdDev(),
}, },
); );
} }