From c1cc2f108fd6820a9046a397bc6b88731577734d Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Tue, 19 Aug 2025 09:22:36 -0700 Subject: [PATCH] dmclock/src/dmclock_server: template type of cleaning_job We'll want crimson to be able to use seastar task based implementation. Signed-off-by: Samuel Just --- src/dmclock/src/dmclock_server.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/dmclock/src/dmclock_server.h b/src/dmclock/src/dmclock_server.h index 3014199d071..ee737c6186d 100644 --- a/src/dmclock/src/dmclock_server.h +++ b/src/dmclock/src/dmclock_server.h @@ -281,7 +281,8 @@ namespace crimson { // recent values of rho and delta. // U1 determines whether to use client information function dynamically, // B is heap branching factor - template + template class PriorityQueueBase { // we don't want to include gtest.h just for FRIEND_TEST friend class dmclock_server_client_idle_erase_Test; @@ -354,7 +355,7 @@ namespace crimson { // ClientRec could be "protected" with no issue. [See comments // associated with function submit_top_request.] class ClientRec { - friend PriorityQueueBase; + friend PriorityQueueBase; C client; RequestTag prev_tag; @@ -826,7 +827,7 @@ namespace crimson { // NB: All threads declared at end, so they're destructed first! - RunEvery cleaning_job; + BackgroundJob cleaning_job; // helper function to return the value of a variant if it matches the // given type T, or a default value of T otherwise @@ -1190,7 +1191,7 @@ namespace crimson { /* - * This is being called regularly by RunEvery. Every time it's + * This is being called regularly by cleaning_job. Every time it's * called it notes the time and delta counter (mark point) in a * deque. It also looks at the deque to find the most recent * mark point that is older than clean_age. It then walks the @@ -1271,9 +1272,11 @@ namespace crimson { }; // class PriorityQueueBase - template - class PullPriorityQueue : public PriorityQueueBase { - using super = PriorityQueueBase; + template + class PullPriorityQueue : public PriorityQueueBase< + C,R,IsDelayed,U1,B,BackgroundJob> { + using super = PriorityQueueBase; public: -- 2.39.5