From a5240b23abba2724073f79b79648bf4afb38f70a Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Wed, 25 Sep 2024 23:57:46 +0200 Subject: libstore: make non-cache goal pointers strong without circular references we do not need weak goal pointers except for caches, which should not prevent goal destructors running. caches though cannot create circular references even when they keep strong references. if we removed goals from caches when their work() is fully finished, not when their destructors are run, we could keep strong pointers in caches. since we do not gain much from this we keep those pointers weak for now. Change-Id: I1d4a6850ff5e264443c90eb4531da89f5e97a3a0 --- src/libstore/build/worker.hh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/libstore/build/worker.hh') diff --git a/src/libstore/build/worker.hh b/src/libstore/build/worker.hh index 46adaa145..097e73cf7 100644 --- a/src/libstore/build/worker.hh +++ b/src/libstore/build/worker.hh @@ -84,9 +84,6 @@ private: bool running = false; - /* Note: the worker should only have strong pointers to the - top-level goals. */ - /** * The top-level goals of the worker. */ @@ -95,7 +92,7 @@ private: /** * Goals that are ready to do some work. */ - WeakGoals awake; + Goals awake; template struct CachedGoal -- cgit v1.2.3