Deserialize LinuxPerf.Counter correctly and add methods for comparing deserialization with original value

Author: Zentrik

src/serialization.jl

@@ -45,7 +45,7 @@ function Base.convert(::Type{LinuxPerf.EventType}, d::Dict{String})
 end
 function Base.convert(::Type{LinuxPerf.Counter}, d::Dict{String})
     return LinuxPerf.Counter(
-        convert(LinuxPerf.EventType, d["event"]), d["running"], d["enabled"], d["value"]
+        convert(LinuxPerf.EventType, d["event"]), d["value"], d["enabled"], d["running"]
     )
 end
 
@@ -185,7 +185,7 @@ function load(io::IO, args...)
             ),
         )
     end
-    parsed = JSON.parse(io)
+    parsed = JSON.parse(io; dicttype=Dict)
     if !isa(parsed, Vector) ||
         length(parsed) != 2 ||
         !isa(parsed[1], Dict) ||

test/SerializationTests.jl

@@ -1,11 +1,20 @@
 module SerializationTests
 
-using BenchmarkTools
+using BenchmarkTools, LinuxPerf
 using Test
 
 function eq(x::T, y::T) where {T<:Union{values(BenchmarkTools.SUPPORTED_TYPES)...}}
     return all(i -> eq(getfield(x, i), getfield(y, i)), 1:fieldcount(T))
 end
+function eq(x::@NamedTuple{events::Expr, spaces::Expr, threads::Bool}, y::@NamedTuple{events::Expr, spaces::Expr, threads::Bool})
+    x == y
+end
+function eq(x::LinuxPerf.Stats, y::LinuxPerf.Stats)
+    all(a->eq(a[1], a[2]), zip(x.threads, y.threads))
+end
+function eq(x::LinuxPerf.ThreadStats, y::LinuxPerf.ThreadStats)
+    x.pid == y.pid && x.groups == y.groups
+end
 eq(x::T, y::T) where {T} = isapprox(x, y)
 
 function withtempdir(f::Function)