Add method to unset actor request ref tracker

cloudflare · Apr 21, 2023 · 2d0c3d9 · 2d0c3d9
1 parent 58930e1
commit 2d0c3d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/workerd/io/request-tracker.h b/src/workerd/io/request-tracker.h
@@ -29,7 +29,6 @@ class RequestTracker {
 
   public:
     ActiveRequest(ActiveRequest&& other) = default;
-    ActiveRequest& operator=(ActiveRequest&& other) = default;
     ~ActiveRequest();
 
   private:

diff --git a/src/workerd/io/worker.h b/src/workerd/io/worker.h
@@ -736,6 +736,11 @@ class Worker::Actor final: public kj::Refcounted {
   // Runs an alarm in this actor. This function will handle deduplicating multiple alarms. If this
   // isn't a duplicate alarm, func will be called to run the alarm.
 
+  void unsetRequestTracker() {
+    // Unsets the RequestTracker if we're shutting down.
+    tracker = nullptr;
+  }
+
   kj::Own<Worker::Actor> addRef() {
     KJ_IF_MAYBE(t, tracker) {
       return kj::addRef(*this).attach(t->startRequest());
@@ -745,8 +750,6 @@ class Worker::Actor final: public kj::Refcounted {
   }
 private:
   kj::Own<const Worker> worker;
-
-  // TODO(soon): Provide a RequestTracker in workerd so this can no longer be a Maybe
   kj::Maybe<RequestTracker&> tracker;
   struct Impl;
   kj::Own<Impl> impl;