refactor: acquireAsync will dispatch the job, not the other way around

XRPLF · Feb 27, 2025 · 0d68766 · 0d68766
1 parent 15e4475
commit 0d68766
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 32 deletions.
diff --git a/src/test/app/LedgerReplay_test.cpp b/src/test/app/LedgerReplay_test.cpp
@@ -108,6 +108,8 @@ class MagicInboundLedgers : public InboundLedgers
 
     virtual void
     acquireAsync(
+        JobType type,
+        std::string const& name,
         uint256 const& hash,
         std::uint32_t seq,
         InboundLedger::Reason reason) override

diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp
@@ -135,15 +135,12 @@ RCLConsensus::Adaptor::acquireLedger(LedgerHash const& hash)
             // Tell the ledger acquire system that we need the consensus ledger
             acquiringLedger_ = hash;
 
-            app_.getJobQueue().addJob(
+            app_.getInboundLedgers().acquireAsync(
                 jtADVANCE,
                 "getConsensusLedger1",
-                [id = hash, &app = app_, this]() {
-                    JLOG(j_.debug())
-                        << "JOB advanceLedger getConsensusLedger1 started";
-                    app.getInboundLedgers().acquireAsync(
-                        id, 0, InboundLedger::Reason::CONSENSUS);
-                });
+                hash,
+                0,
+                InboundLedger::Reason::CONSENSUS);
         }
         return std::nullopt;
     }

diff --git a/src/xrpld/app/consensus/RCLValidations.cpp b/src/xrpld/app/consensus/RCLValidations.cpp
@@ -142,15 +142,12 @@ RCLValidationsAdaptor::acquire(LedgerHash const& hash)
         JLOG(j_.debug())
             << "Need validated ledger for preferred ledger analysis " << hash;
 
-        Application* pApp = &app_;
-
-        app_.getJobQueue().addJob(
-            jtADVANCE, "getConsensusLedger2", [pApp, hash, this]() {
-                JLOG(j_.debug())
-                    << "JOB advanceLedger getConsensusLedger2 started";
-                pApp->getInboundLedgers().acquireAsync(
-                    hash, 0, InboundLedger::Reason::CONSENSUS);
-            });
+        app_.getInboundLedgers().acquireAsync(
+            jtADVANCE,
+            "getConsensusLedger2",
+            hash,
+            0,
+            InboundLedger::Reason::CONSENSUS);
         return std::nullopt;
     }
 

diff --git a/src/xrpld/app/ledger/InboundLedgers.h b/src/xrpld/app/ledger/InboundLedgers.h
@@ -48,6 +48,8 @@ class InboundLedgers
     // instead. Inbound ledger acquisition is asynchronous anyway.
     virtual void
     acquireAsync(
+        JobType type,
+        std::string const& name,
         uint256 const& hash,
         std::uint32_t seq,
         InboundLedger::Reason reason) = 0;

diff --git a/src/xrpld/app/ledger/detail/InboundLedgers.cpp b/src/xrpld/app/ledger/detail/InboundLedgers.cpp
@@ -214,28 +214,38 @@ class InboundLedgersImp : public InboundLedgers
 
     void
     acquireAsync(
+        JobType type,
+        std::string const& name,
         uint256 const& hash,
         std::uint32_t seq,
         InboundLedger::Reason reason) override
     {
         if (CanProcess const check{acquiresMutex_, pendingAcquires_, hash})
         {
-            try
-            {
-                acquire(hash, seq, reason);
-            }
-            catch (std::exception const& e)
-            {
-                JLOG(j_.warn())
-                    << "Exception thrown for acquiring new inbound ledger "
-                    << hash << ": " << e.what();
-            }
-            catch (...)
-            {
-                JLOG(j_.warn()) << "Unknown exception thrown for acquiring new "
-                                   "inbound ledger "
-                                << hash;
-            }
+            app_.getJobQueue().addJob(
+                type,
+                name,
+                [check = std::move(check), name, hash, seq, reason, this]() {
+                    JLOG(j_.debug())
+                        << "JOB acquireAsync " << name << " started ";
+                    try
+                    {
+                        acquire(hash, seq, reason);
+                    }
+                    catch (std::exception const& e)
+                    {
+                        JLOG(j_.warn()) << "Exception thrown for acquiring new "
+                                           "inbound ledger "
+                                        << hash << ": " << e.what();
+                    }
+                    catch (...)
+                    {
+                        JLOG(j_.warn())
+                            << "Unknown exception thrown for acquiring new "
+                               "inbound ledger "
+                            << hash;
+                    }
+                });
         }
     }