Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Thread-safety #80

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Thread-safety #80

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9084884
make push!, pop! threadsafe
vchuravy Mar 9, 2020
17f12e9
fixup! make push!, pop! threadsafe
vchuravy Mar 9, 2020
4747ca2
fixup
vchuravy Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = "0.5.4"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"

[compat]
julia = "1"
julia = "1.3"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
16 changes: 9 additions & 7 deletions src/TimerOutput.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,33 @@ mutable struct TimerOutput
flattened::Bool
totmeasured::Tuple{Int64,Int64}
prev_timer_label::String
lock::ReentrantLock
prev_timer::TimerOutput

function TimerOutput(label::String = "root")
start_data = TimeData(0, time_ns(), gc_bytes())
accumulated_data = TimeData()
inner_timers = Dict{String,TimerOutput}()
timer_stack = TimerOutput[]
timer = new(start_data, accumulated_data, inner_timers, timer_stack, label, false, (0, 0), "")
timer = new(start_data, accumulated_data, inner_timers, timer_stack, label, false, (0, 0), "", ReentrantLock())
timer.prev_timer = timer
end

# Jeez...
TimerOutput(start_data, accumulated_data, inner_timers, timer_stack, name, flattened, totmeasured, prev_timer_label,
prev_timer) = new(start_data, accumulated_data, inner_timers, timer_stack, name, flattened, totmeasured, prev_timer_label,
prev_timer)
ReentrantLock(), prev_timer)

end

Base.copy(to::TimerOutput) = TimerOutput(copy(to.start_data), copy(to.accumulated_data), copy(to.inner_timers),
copy(to.timer_stack), to.name, to.flattened, to.totmeasured, "", to)
copy(to.timer_stack), to.name, to.flattened, to.totmeasured, "", ReentrantLock(), to)

const DEFAULT_TIMER = TimerOutput()

# push! and pop!
function Base.push!(to::TimerOutput, label::String)
lock(to.lock)
if length(to.timer_stack) == 0 # Root section
current_timer = to
else # Not a root section
Expand All @@ -78,10 +80,11 @@ function Base.push!(to::TimerOutput, label::String)
to.prev_timer = timer

push!(to.timer_stack, timer)
unlock(to.lock)
return timer.accumulated_data
end

Base.pop!(to::TimerOutput) = pop!(to.timer_stack)
Base.pop!(to::TimerOutput) = lock(()->to.timer_stack, to.lock)
vchuravy marked this conversation as resolved.
Show resolved Hide resolved

# Only sum the highest parents
function totmeasured(to::TimerOutput)
Expand Down Expand Up @@ -210,6 +213,7 @@ function timer_expr_func(m::Module, is_debug::Bool, to, expr::Expr)
end

function do_accumulate!(accumulated_data, t₀, b₀)
# TODO: Make threadsafe
accumulated_data.time += time_ns() - t₀
accumulated_data.allocs += gc_bytes() - b₀
accumulated_data.ncalls += 1
Expand Down Expand Up @@ -264,9 +268,7 @@ function timeit(f::Function, to::TimerOutput, label::String)
try
val = f()
finally
accumulated_data.time += time_ns() - t₀
accumulated_data.allocs += gc_bytes() - b₀
accumulated_data.ncalls += 1
do_accumulate!(accumulated_data, t₀, b₀)
pop!(to)
end
return val
Expand Down