DTask: Combine UID and TID

Author: jpsamaroo

src/dtask.jl

@@ -107,18 +107,14 @@ function Base.show(io::IO, t::DTask)
 end
 istask(t::DTask) = true
 function Base.convert(::Type{ThunkSyncdep}, task::Dagger.DTask)
-    tid = lock(Sch.EAGER_ID_MAP) do id_map
-        id_map[task.uid]
-    end
-    ThunkSyncdep(ThunkID(tid, task.thunk_ref))
+    return ThunkSyncdep(ThunkID(task.uid, isdefined(task, :thunk_ref) ? task.thunk_ref : nothing))
 end
 ThunkSyncdep(task::DTask) = convert(ThunkSyncdep, task)
 
-const EAGER_ID_COUNTER = Threads.Atomic{UInt64}(1)
 function eager_next_id()
     if myid() == 1
-        Threads.atomic_add!(EAGER_ID_COUNTER, one(UInt64))
+        return UInt64(next_id())
     else
-        remotecall_fetch(eager_next_id, 1)
+        return remotecall_fetch(eager_next_id, 1)::UInt64
     end
 end

src/submission.jl

@@ -74,7 +74,7 @@ const UID_TO_TID_CACHE = TaskLocalValue{ReusableCache{Dict{UInt64,Int},Nothing}}
         uid, future = payload.uid, payload.future
         fargs, options, reschedule = payload.fargs, payload.options, payload.reschedule
 
-        id = next_id()
+        id = Int(uid)
 
         @maybelog ctx timespan_start(ctx, :add_thunk, (;thunk_id=id), (;f=fargs[1], args=fargs[2:end], options, uid))