Move at-dagdebug into utils

Author: jpsamaroo

src/Dagger.jl

@@ -25,6 +25,7 @@ include("options.jl")
 include("processor.jl")
 include("scopes.jl")
 include("thunk.jl")
+include("utils/dagdebug.jl")
 include("chunks.jl")
 
 # Task scheduling

src/sch/util.jl

@@ -1,37 +1,3 @@
-const DAGDEBUG_CATEGORIES = Symbol[:global, :submit, :schedule, :scope,
-                                   :take, :execute, :move, :processor]
-macro dagdebug(thunk, category, msg, args...)
-    cat_sym = category.value
-    @gensym id
-    debug_ex_id = :(@debug "[$($id)] ($($(repr(cat_sym)))) $($msg)" _module=Dagger _file=$(string(__source__.file)) _line=$(__source__.line))
-    append!(debug_ex_id.args, args)
-    debug_ex_noid = :(@debug "($($(repr(cat_sym)))) $($msg)" _module=Dagger _file=$(string(__source__.file)) _line=$(__source__.line))
-    append!(debug_ex_noid.args, args)
-    esc(quote
-        let $id = -1
-            if $thunk isa Integer
-                $id = Int($thunk)
-            elseif $thunk isa Thunk
-                $id = $thunk.id
-            elseif $thunk === nothing
-                $id = 0
-            else
-                @warn "Unsupported thunk argument to @dagdebug: $(typeof($thunk))"
-                $id = -1
-            end
-            if $id > 0
-                if $(QuoteNode(cat_sym)) in $DAGDEBUG_CATEGORIES
-                    $debug_ex_id
-                end
-            elseif $id == 0
-                if $(QuoteNode(cat_sym)) in $DAGDEBUG_CATEGORIES
-                    $debug_ex_noid
-                end
-            end
-        end
-    end)
-end
-
 """
     unwrap_nested_exception(err::Exception) -> Bool
 

src/utils/dagdebug.jl

@@ -0,0 +1,33 @@
+const DAGDEBUG_CATEGORIES = Symbol[:global, :submit, :schedule, :scope,
+                                   :take, :execute, :move, :processor]
+macro dagdebug(thunk, category, msg, args...)
+    cat_sym = category.value
+    @gensym id
+    debug_ex_id = :(@debug "[$($id)] ($($(repr(cat_sym)))) $($msg)" _module=Dagger _file=$(string(__source__.file)) _line=$(__source__.line))
+    append!(debug_ex_id.args, args)
+    debug_ex_noid = :(@debug "($($(repr(cat_sym)))) $($msg)" _module=Dagger _file=$(string(__source__.file)) _line=$(__source__.line))
+    append!(debug_ex_noid.args, args)
+    esc(quote
+        let $id = -1
+            if $thunk isa Integer
+                $id = Int($thunk)
+            elseif $thunk isa Thunk
+                $id = $thunk.id
+            elseif $thunk === nothing
+                $id = 0
+            else
+                @warn "Unsupported thunk argument to @dagdebug: $(typeof($thunk))"
+                $id = -1
+            end
+            if $id > 0
+                if $(QuoteNode(cat_sym)) in $DAGDEBUG_CATEGORIES
+                    $debug_ex_id
+                end
+            elseif $id == 0
+                if $(QuoteNode(cat_sym)) in $DAGDEBUG_CATEGORIES
+                    $debug_ex_noid
+                end
+            end
+        end
+    end)
+end