From 90848840bb6ea0a5b5b50e589a312268d3ce2307 Mon Sep 17 00:00:00 2001
From: Valentin Churavy <v.churavy@gmail.com>
Date: Mon, 9 Mar 2020 12:48:15 -0400
Subject: [PATCH 1/3] make push!, pop! threadsafe

---
 Project.toml       |  2 +-
 src/TimerOutput.jl | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Project.toml b/Project.toml
index 2b15b36..cc28dc9 100644
--- a/Project.toml
+++ b/Project.toml
@@ -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"
diff --git a/src/TimerOutput.jl b/src/TimerOutput.jl
index a0ee5b8..878a43b 100644
--- a/src/TimerOutput.jl
+++ b/src/TimerOutput.jl
@@ -28,6 +28,7 @@ mutable struct TimerOutput
     flattened::Bool
     totmeasured::Tuple{Int64,Int64}
     prev_timer_label::String
+    lock::ReentrantLock
     prev_timer::TimerOutput
 
     function TimerOutput(label::String = "root")
@@ -35,24 +36,25 @@ mutable struct TimerOutput
         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
@@ -78,10 +80,11 @@ function Base.push!(to::TimerOutput, label::String)
     to.prev_timer = timer
 
     push!(to.timer_stack, timer)
+    unlock(lock)
     return timer.accumulated_data
 end
 
-Base.pop!(to::TimerOutput) = pop!(to.timer_stack)
+Base.pop!(to::TimerOutput) = lock(()->to.timer_stack, to.lock)
 
 # Only sum the highest parents
 function totmeasured(to::TimerOutput)
@@ -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
@@ -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

From 17f12e995809911a55b1d491dac2f55e157466d7 Mon Sep 17 00:00:00 2001
From: Valentin Churavy <v.churavy@gmail.com>
Date: Mon, 9 Mar 2020 12:59:42 -0400
Subject: [PATCH 2/3] fixup! make push!, pop! threadsafe

---
 src/TimerOutput.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TimerOutput.jl b/src/TimerOutput.jl
index 878a43b..ae3c002 100644
--- a/src/TimerOutput.jl
+++ b/src/TimerOutput.jl
@@ -80,7 +80,7 @@ function Base.push!(to::TimerOutput, label::String)
     to.prev_timer = timer
 
     push!(to.timer_stack, timer)
-    unlock(lock)
+    unlock(to.lock)
     return timer.accumulated_data
 end
 

From 4747ca22d2a95c18d981fc9da48bd74983513e42 Mon Sep 17 00:00:00 2001
From: Valentin Churavy <vchuravy@users.noreply.github.com>
Date: Mon, 9 Mar 2020 14:27:35 -0400
Subject: [PATCH 3/3] fixup

---
 src/TimerOutput.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TimerOutput.jl b/src/TimerOutput.jl
index ae3c002..fd259e8 100644
--- a/src/TimerOutput.jl
+++ b/src/TimerOutput.jl
@@ -84,7 +84,7 @@ function Base.push!(to::TimerOutput, label::String)
     return timer.accumulated_data
 end
 
-Base.pop!(to::TimerOutput) = lock(()->to.timer_stack, to.lock)
+Base.pop!(to::TimerOutput) = lock(()->pop!(to.timer_stack), to.lock)
 
 # Only sum the highest parents
 function totmeasured(to::TimerOutput)