Added card info to exception messages

sy-c · sy-c · commit e28157282cf0 · 2024-05-28T12:23:47.000+02:00
diff --git a/src/BarInterfaceBase.h b/src/BarInterfaceBase.h
@@ -131,6 +131,11 @@ class BarInterfaceBase : public BarInterface
   /// Convenience function for InfoLogger
   void log(const std::string& logMessage, ILMessageOption = LogInfoDevel);
 
+  /// Get a string descriptor, to be used for logs or exceptions
+  const std::string &getLoggerPrefix() {
+    return mLoggerPrefix;
+  };
+
  private:
   /// Inheriting classes must implement this to check whether a given read is safe.
   /// If it is not safe, it should throw an UnsafeReadAccess exception
diff --git a/src/Crorc/CrorcBar.cxx b/src/Crorc/CrorcBar.cxx
@@ -191,7 +191,7 @@ void CrorcBar::assertLinkUp()
   }
 
   if (!checkLinkUp()) {
-    BOOST_THROW_EXCEPTION(CrorcCheckLinkException() << ErrorInfo::Message("Link was not up"));
+    BOOST_THROW_EXCEPTION(CrorcCheckLinkException() << ErrorInfo::Message(getLoggerPrefix() + "Link was not up"));
   }
 }
 
@@ -238,7 +238,7 @@ bool CrorcBar::getDynamicOffsetEnabled()
 void CrorcBar::setTimeFrameLength(uint16_t timeFrameLength)
 {
   if (timeFrameLength > 256) {
-    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("BAD TF LENGTH, should be less or equal to 256") << ErrorInfo::ConfigValue(timeFrameLength));
+    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "BAD TF LENGTH, should be less or equal to 256") << ErrorInfo::ConfigValue(timeFrameLength));
   }
   modifyRegister(Crorc::Registers::CFG_CONTROL_B.index, 0, 11, timeFrameLength);
 }
@@ -299,7 +299,7 @@ void CrorcBar::sendDdlCommand(uint32_t address, uint32_t command)
   while ((std::chrono::steady_clock::now() < timeOut) && !checkFifoEmpty()) {
   }
   if (!checkFifoEmpty()) {
-    BOOST_THROW_EXCEPTION(CrorcCheckLinkException() << ErrorInfo::Message("Link was not up"));
+    BOOST_THROW_EXCEPTION(CrorcCheckLinkException() << ErrorInfo::Message(getLoggerPrefix() + "Link was not up"));
   } else {
     readRegister(Crorc::Registers::DDL_STATUS.index);
   }
diff --git a/src/Crorc/CrorcDmaChannel.cxx b/src/Crorc/CrorcDmaChannel.cxx
@@ -41,13 +41,13 @@ CrorcDmaChannel::CrorcDmaChannel(const Parameters& parameters)
 {
   // Check that the DMA page is valid
   if (mPageSize != DMA_PAGE_SIZE) {
-    BOOST_THROW_EXCEPTION(CrorcException() << ErrorInfo::Message("CRORC only supports 8KiB DMA page size")
+    BOOST_THROW_EXCEPTION(CrorcException() << ErrorInfo::Message(getLoggerPrefix() + "CRORC only supports 8KiB DMA page size")
                                            << ErrorInfo::DmaPageSize(mPageSize));
   }
 
   // Check that the data source is valid. If not throw
   if (mDataSource == DataSource::Ddg) {
-    BOOST_THROW_EXCEPTION(CruException() << ErrorInfo::Message("CRORC does not support specified data source")
+    BOOST_THROW_EXCEPTION(CruException() << ErrorInfo::Message(getLoggerPrefix() + "CRORC does not support specified data source")
                                          << ErrorInfo::DataSource(mDataSource));
   }
 
@@ -76,7 +76,7 @@ CrorcDmaChannel::CrorcDmaChannel(const Parameters& parameters)
     if (entry.size < kSuperpageInfoSize) {
       // Something must've failed at some point
       BOOST_THROW_EXCEPTION(Exception()
-                            << ErrorInfo::Message("Scatter gather list entry for Superpage info buffer was too small")
+                            << ErrorInfo::Message(getLoggerPrefix() + "Scatter gather list entry for Superpage info buffer was too small")
                             << ErrorInfo::ScatterGatherEntrySize(entry.size)
                             << ErrorInfo::SuperpageInfoSize(kSuperpageInfoSize));
     }
@@ -220,7 +220,7 @@ int CrorcDmaChannel::getReadyQueueSize()
 auto CrorcDmaChannel::getSuperpage() -> Superpage
 {
   if (mReadyQueue.isEmpty()) {
-    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not get superpage, ready queue was empty"));
+    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not get superpage, ready queue was empty"));
   }
   return *mReadyQueue.frontPtr();
 }
@@ -234,7 +234,7 @@ bool CrorcDmaChannel::pushSuperpage(Superpage superpage)
   checkSuperpage(superpage);
 
   if (mTransferQueue.sizeGuess() >= TRANSFER_QUEUE_CAPACITY) {
-    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not push superpage, transfer queue was full"));
+    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not push superpage, transfer queue was full"));
   }
 
   mTransferQueue.write(superpage);
@@ -245,7 +245,7 @@ bool CrorcDmaChannel::pushSuperpage(Superpage superpage)
 auto CrorcDmaChannel::popSuperpage() -> Superpage
 {
   if (mReadyQueue.isEmpty()) {
-    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not pop superpage, ready queue was empty"));
+    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not pop superpage, ready queue was empty"));
   }
   auto superpage = mReadyQueue.frontPtr();
   mReadyQueue.popFront();
diff --git a/src/Cru/CruBar.cxx b/src/Cru/CruBar.cxx
@@ -176,7 +176,7 @@ uint32_t CruBar::getSuperpageSize(uint32_t link)
 uint32_t CruBar::getSuperpageFifoEmptyCounter(uint32_t link)
 {
   if (link >= Cru::MAX_LINKS) {
-    BOOST_THROW_EXCEPTION(InvalidLinkId() << ErrorInfo::Message("Link ID out of range") << ErrorInfo::LinkId(link));
+    BOOST_THROW_EXCEPTION(InvalidLinkId() << ErrorInfo::Message(getLoggerPrefix() + "Link ID out of range") << ErrorInfo::LinkId(link));
   }
   return readRegister(Cru::Registers::LINK_SUPERPAGE_FIFO_EMPTY.get(link).index);
 }
@@ -720,7 +720,7 @@ Cru::TriggerMonitoringInfo CruBar::monitorTriggers(bool updateable)
 void CruBar::checkConfigParameters()
 {
   if (mUserAndCommonLogicEnabled && !mUserLogicEnabled) {
-    BOOST_THROW_EXCEPTION(ParameterException() << ErrorInfo::Message("User and Common logic switch invalid when User logic disabled"));
+    BOOST_THROW_EXCEPTION(ParameterException() << ErrorInfo::Message(getLoggerPrefix() + "User and Common logic switch invalid when User logic disabled"));
   }
 }
 
diff --git a/src/Cru/CruDmaChannel.cxx b/src/Cru/CruDmaChannel.cxx
@@ -40,13 +40,13 @@ CruDmaChannel::CruDmaChannel(const Parameters& parameters)
     if (pageSize.get() != Cru::DMA_PAGE_SIZE) {
       log("DMA page size not default; Behaviour undefined", LogWarningDevel_(4250));
       /*BOOST_THROW_EXCEPTION(CruException()
-          << ErrorInfo::Message("CRU only supports an 8KiB page size")
+          << ErrorInfo::Message(getLoggerPrefix() + "CRU only supports an 8KiB page size")
           << ErrorInfo::DmaPageSize(pageSize.get()));*/
     }
   }
 
   if (mDataSource == DataSource::Diu || mDataSource == DataSource::Siu) {
-    BOOST_THROW_EXCEPTION(CruException() << ErrorInfo::Message("CRU does not support specified data source")
+    BOOST_THROW_EXCEPTION(CruException() << ErrorInfo::Message(getLoggerPrefix() + "CRU does not support specified data source")
                                          << ErrorInfo::DataSource(mDataSource));
   }
 
@@ -99,7 +99,7 @@ CruDmaChannel::CruDmaChannel(const Parameters& parameters)
     log(stream.str(), LogInfoDevel_(4252));
 
     if (mLinks.empty()) {
-      BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("No links are enabled. Check with roc-status. Configure with roc-config."));
+      BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "No links are enabled. Check with roc-status. Configure with roc-config."));
     }
 
     mReadyQueue = std::make_unique<SuperpageQueue>(mReadyQueueCapacity + 1); // folly queue needs + 1
@@ -214,7 +214,7 @@ void CruDmaChannel::deviceResetChannel(ResetLevel::type resetLevel)
   if (resetLevel == ResetLevel::Nothing) {
     return;
   } else if (resetLevel != ResetLevel::Internal) {
-    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("The CRU can only be reset internally"));
+    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "The CRU can only be reset internally"));
   }
   resetCru();
 }
@@ -260,7 +260,7 @@ bool CruDmaChannel::pushSuperpage(Superpage superpage)
   if (mLinkQueuesTotalAvailable == 0) {
     // Note: the transfer queue refers to the firmware, not the mLinkIndexQueue which contains the LinkIds for links
     // that can still be pushed into (essentially the opposite of the firmware's queue).
-    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not push superpage, transfer queue was full"));
+    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not push superpage, transfer queue was full"));
   }
 
   // Get the next link to push
@@ -269,7 +269,7 @@ bool CruDmaChannel::pushSuperpage(Superpage superpage)
   if (link.queue->sizeGuess() >= mLinkQueueCapacity) {
     // Is the link's FIFO out of space?
     // This should never happen
-    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not push superpage, link queue was full"));
+    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not push superpage, link queue was full"));
   }
 
   // Once we've confirmed the link has a slot available, we push the superpage
@@ -286,15 +286,15 @@ bool CruDmaChannel::pushSuperpage(Superpage superpage)
 auto CruDmaChannel::getSuperpage() -> Superpage
 {
   if (mReadyQueue->isEmpty()) {
-    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not get superpage, ready queue was empty"));
+    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not get superpage, ready queue was empty"));
   }
   return *mReadyQueue->frontPtr();
 }
 
 auto CruDmaChannel::popSuperpage() -> Superpage
 {
   if (mReadyQueue->isEmpty()) {
-    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not pop superpage, ready queue was empty"));
+    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not pop superpage, ready queue was empty"));
   }
   auto superpage = *mReadyQueue->frontPtr();
   mReadyQueue->popFront();
@@ -311,7 +311,7 @@ void CruDmaChannel::pushSuperpageToLink(Link& link, const Superpage& superpage)
 void CruDmaChannel::transferSuperpageFromLinkToReady(Link& link, bool reclaim)
 {
   if (link.queue->isEmpty()) {
-    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not transfer Superpage from link to ready queue, link queue is empty"));
+    BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not transfer Superpage from link to ready queue, link queue is empty"));
   }
 
   if (!reclaim) {
@@ -353,7 +353,7 @@ void CruDmaChannel::fillSuperpages()
              << superpageCount << " pushed according to firmware";
       log(stream.str(), LogErrorDevel_(4256));
       BOOST_THROW_EXCEPTION(Exception()
-                            << ErrorInfo::Message("FATAL: Firmware reported more superpages available than should be present in FIFO"));
+                            << ErrorInfo::Message(getLoggerPrefix() + "FATAL: Firmware reported more superpages available than should be present in FIFO"));
     }
 
     while (amountAvailable) {
diff --git a/src/DmaChannelBase.h b/src/DmaChannelBase.h
@@ -129,6 +129,12 @@ class DmaChannelBase : public DmaChannelInterface
 
   protected:
   std::string mLoggerPrefix;
+
+  /// Get a string descriptor, to be used for logs or exceptions
+  const std::string &getLoggerPrefix() {
+    return mLoggerPrefix;
+  };
+
 };
 
 } // namespace roc

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ void CrorcBar::assertLinkUp()`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`if (!checkLinkUp()) {`
`194`		`- BOOST_THROW_EXCEPTION(CrorcCheckLinkException() << ErrorInfo::Message("Link was not up"));`
	`194`	`+ BOOST_THROW_EXCEPTION(CrorcCheckLinkException() << ErrorInfo::Message(getLoggerPrefix() + "Link was not up"));`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`
`@@ -238,7 +238,7 @@ bool CrorcBar::getDynamicOffsetEnabled()`
`238`	`238`	`void CrorcBar::setTimeFrameLength(uint16_t timeFrameLength)`
`239`	`239`	`{`
`240`	`240`	`if (timeFrameLength > 256) {`
`241`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("BAD TF LENGTH, should be less or equal to 256") << ErrorInfo::ConfigValue(timeFrameLength));`
	`241`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "BAD TF LENGTH, should be less or equal to 256") << ErrorInfo::ConfigValue(timeFrameLength));`
`242`	`242`	`}`
`243`	`243`	`modifyRegister(Crorc::Registers::CFG_CONTROL_B.index, 0, 11, timeFrameLength);`
`244`	`244`	`}`
`@@ -299,7 +299,7 @@ void CrorcBar::sendDdlCommand(uint32_t address, uint32_t command)`
`299`	`299`	`while ((std::chrono::steady_clock::now() < timeOut) && !checkFifoEmpty()) {`
`300`	`300`	`}`
`301`	`301`	`if (!checkFifoEmpty()) {`
`302`		`- BOOST_THROW_EXCEPTION(CrorcCheckLinkException() << ErrorInfo::Message("Link was not up"));`
	`302`	`+ BOOST_THROW_EXCEPTION(CrorcCheckLinkException() << ErrorInfo::Message(getLoggerPrefix() + "Link was not up"));`
`303`	`303`	`} else {`
`304`	`304`	`readRegister(Crorc::Registers::DDL_STATUS.index);`
`305`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,13 @@ CrorcDmaChannel::CrorcDmaChannel(const Parameters& parameters)`
`41`	`41`	`{`
`42`	`42`	`// Check that the DMA page is valid`
`43`	`43`	`if (mPageSize != DMA_PAGE_SIZE) {`
`44`		`- BOOST_THROW_EXCEPTION(CrorcException() << ErrorInfo::Message("CRORC only supports 8KiB DMA page size")`
	`44`	`+ BOOST_THROW_EXCEPTION(CrorcException() << ErrorInfo::Message(getLoggerPrefix() + "CRORC only supports 8KiB DMA page size")`
`45`	`45`	`<< ErrorInfo::DmaPageSize(mPageSize));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`// Check that the data source is valid. If not throw`
`49`	`49`	`if (mDataSource == DataSource::Ddg) {`
`50`		`- BOOST_THROW_EXCEPTION(CruException() << ErrorInfo::Message("CRORC does not support specified data source")`
	`50`	`+ BOOST_THROW_EXCEPTION(CruException() << ErrorInfo::Message(getLoggerPrefix() + "CRORC does not support specified data source")`
`51`	`51`	`<< ErrorInfo::DataSource(mDataSource));`
`52`	`52`	`}`
`53`	`53`
`@@ -76,7 +76,7 @@ CrorcDmaChannel::CrorcDmaChannel(const Parameters& parameters)`
`76`	`76`	`if (entry.size < kSuperpageInfoSize) {`
`77`	`77`	`// Something must've failed at some point`
`78`	`78`	`BOOST_THROW_EXCEPTION(Exception()`
`79`		`- << ErrorInfo::Message("Scatter gather list entry for Superpage info buffer was too small")`
	`79`	`+ << ErrorInfo::Message(getLoggerPrefix() + "Scatter gather list entry for Superpage info buffer was too small")`
`80`	`80`	`<< ErrorInfo::ScatterGatherEntrySize(entry.size)`
`81`	`81`	`<< ErrorInfo::SuperpageInfoSize(kSuperpageInfoSize));`
`82`	`82`	`}`
`@@ -220,7 +220,7 @@ int CrorcDmaChannel::getReadyQueueSize()`
`220`	`220`	`auto CrorcDmaChannel::getSuperpage() -> Superpage`
`221`	`221`	`{`
`222`	`222`	`if (mReadyQueue.isEmpty()) {`
`223`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not get superpage, ready queue was empty"));`
	`223`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not get superpage, ready queue was empty"));`
`224`	`224`	`}`
`225`	`225`	`return *mReadyQueue.frontPtr();`
`226`	`226`	`}`
`@@ -234,7 +234,7 @@ bool CrorcDmaChannel::pushSuperpage(Superpage superpage)`
`234`	`234`	`checkSuperpage(superpage);`
`235`	`235`
`236`	`236`	`if (mTransferQueue.sizeGuess() >= TRANSFER_QUEUE_CAPACITY) {`
`237`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not push superpage, transfer queue was full"));`
	`237`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not push superpage, transfer queue was full"));`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`mTransferQueue.write(superpage);`
`@@ -245,7 +245,7 @@ bool CrorcDmaChannel::pushSuperpage(Superpage superpage)`
`245`	`245`	`auto CrorcDmaChannel::popSuperpage() -> Superpage`
`246`	`246`	`{`
`247`	`247`	`if (mReadyQueue.isEmpty()) {`
`248`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not pop superpage, ready queue was empty"));`
	`248`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not pop superpage, ready queue was empty"));`
`249`	`249`	`}`
`250`	`250`	`auto superpage = mReadyQueue.frontPtr();`
`251`	`251`	`mReadyQueue.popFront();`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ uint32_t CruBar::getSuperpageSize(uint32_t link)`
`176`	`176`	`uint32_t CruBar::getSuperpageFifoEmptyCounter(uint32_t link)`
`177`	`177`	`{`
`178`	`178`	`if (link >= Cru::MAX_LINKS) {`
`179`		`- BOOST_THROW_EXCEPTION(InvalidLinkId() << ErrorInfo::Message("Link ID out of range") << ErrorInfo::LinkId(link));`
	`179`	`+ BOOST_THROW_EXCEPTION(InvalidLinkId() << ErrorInfo::Message(getLoggerPrefix() + "Link ID out of range") << ErrorInfo::LinkId(link));`
`180`	`180`	`}`
`181`	`181`	`return readRegister(Cru::Registers::LINK_SUPERPAGE_FIFO_EMPTY.get(link).index);`
`182`	`182`	`}`
`@@ -720,7 +720,7 @@ Cru::TriggerMonitoringInfo CruBar::monitorTriggers(bool updateable)`
`720`	`720`	`void CruBar::checkConfigParameters()`
`721`	`721`	`{`
`722`	`722`	`if (mUserAndCommonLogicEnabled && !mUserLogicEnabled) {`
`723`		`- BOOST_THROW_EXCEPTION(ParameterException() << ErrorInfo::Message("User and Common logic switch invalid when User logic disabled"));`
	`723`	`+ BOOST_THROW_EXCEPTION(ParameterException() << ErrorInfo::Message(getLoggerPrefix() + "User and Common logic switch invalid when User logic disabled"));`
`724`	`724`	`}`
`725`	`725`	`}`
`726`	`726`
Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,13 @@ CruDmaChannel::CruDmaChannel(const Parameters& parameters)`
`40`	`40`	`if (pageSize.get() != Cru::DMA_PAGE_SIZE) {`
`41`	`41`	`log("DMA page size not default; Behaviour undefined", LogWarningDevel_(4250));`
`42`	`42`	`/*BOOST_THROW_EXCEPTION(CruException()`
`43`		`- << ErrorInfo::Message("CRU only supports an 8KiB page size")`
	`43`	`+ << ErrorInfo::Message(getLoggerPrefix() + "CRU only supports an 8KiB page size")`
`44`	`44`	`<< ErrorInfo::DmaPageSize(pageSize.get()));*/`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`if (mDataSource == DataSource::Diu \|\| mDataSource == DataSource::Siu) {`
`49`		`- BOOST_THROW_EXCEPTION(CruException() << ErrorInfo::Message("CRU does not support specified data source")`
	`49`	`+ BOOST_THROW_EXCEPTION(CruException() << ErrorInfo::Message(getLoggerPrefix() + "CRU does not support specified data source")`
`50`	`50`	`<< ErrorInfo::DataSource(mDataSource));`
`51`	`51`	`}`
`52`	`52`
`@@ -99,7 +99,7 @@ CruDmaChannel::CruDmaChannel(const Parameters& parameters)`
`99`	`99`	`log(stream.str(), LogInfoDevel_(4252));`
`100`	`100`
`101`	`101`	`if (mLinks.empty()) {`
`102`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("No links are enabled. Check with roc-status. Configure with roc-config."));`
	`102`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "No links are enabled. Check with roc-status. Configure with roc-config."));`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`mReadyQueue = std::make_unique<SuperpageQueue>(mReadyQueueCapacity + 1); // folly queue needs + 1`
`@@ -214,7 +214,7 @@ void CruDmaChannel::deviceResetChannel(ResetLevel::type resetLevel)`
`214`	`214`	`if (resetLevel == ResetLevel::Nothing) {`
`215`	`215`	`return;`
`216`	`216`	`} else if (resetLevel != ResetLevel::Internal) {`
`217`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("The CRU can only be reset internally"));`
	`217`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "The CRU can only be reset internally"));`
`218`	`218`	`}`
`219`	`219`	`resetCru();`
`220`	`220`	`}`
`@@ -260,7 +260,7 @@ bool CruDmaChannel::pushSuperpage(Superpage superpage)`
`260`	`260`	`if (mLinkQueuesTotalAvailable == 0) {`
`261`	`261`	`// Note: the transfer queue refers to the firmware, not the mLinkIndexQueue which contains the LinkIds for links`
`262`	`262`	`// that can still be pushed into (essentially the opposite of the firmware's queue).`
`263`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not push superpage, transfer queue was full"));`
	`263`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not push superpage, transfer queue was full"));`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`// Get the next link to push`
`@@ -269,7 +269,7 @@ bool CruDmaChannel::pushSuperpage(Superpage superpage)`
`269`	`269`	`if (link.queue->sizeGuess() >= mLinkQueueCapacity) {`
`270`	`270`	`// Is the link's FIFO out of space?`
`271`	`271`	`// This should never happen`
`272`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not push superpage, link queue was full"));`
	`272`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not push superpage, link queue was full"));`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`// Once we've confirmed the link has a slot available, we push the superpage`
`@@ -286,15 +286,15 @@ bool CruDmaChannel::pushSuperpage(Superpage superpage)`
`286`	`286`	`auto CruDmaChannel::getSuperpage() -> Superpage`
`287`	`287`	`{`
`288`	`288`	`if (mReadyQueue->isEmpty()) {`
`289`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not get superpage, ready queue was empty"));`
	`289`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not get superpage, ready queue was empty"));`
`290`	`290`	`}`
`291`	`291`	`return *mReadyQueue->frontPtr();`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`auto CruDmaChannel::popSuperpage() -> Superpage`
`295`	`295`	`{`
`296`	`296`	`if (mReadyQueue->isEmpty()) {`
`297`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not pop superpage, ready queue was empty"));`
	`297`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not pop superpage, ready queue was empty"));`
`298`	`298`	`}`
`299`	`299`	`auto superpage = *mReadyQueue->frontPtr();`
`300`	`300`	`mReadyQueue->popFront();`
`@@ -311,7 +311,7 @@ void CruDmaChannel::pushSuperpageToLink(Link& link, const Superpage& superpage)`
`311`	`311`	`void CruDmaChannel::transferSuperpageFromLinkToReady(Link& link, bool reclaim)`
`312`	`312`	`{`
`313`	`313`	`if (link.queue->isEmpty()) {`
`314`		`- BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not transfer Superpage from link to ready queue, link queue is empty"));`
	`314`	`+ BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(getLoggerPrefix() + "Could not transfer Superpage from link to ready queue, link queue is empty"));`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`if (!reclaim) {`
`@@ -353,7 +353,7 @@ void CruDmaChannel::fillSuperpages()`
`353`	`353`	`<< superpageCount << " pushed according to firmware";`
`354`	`354`	`log(stream.str(), LogErrorDevel_(4256));`
`355`	`355`	`BOOST_THROW_EXCEPTION(Exception()`
`356`		`- << ErrorInfo::Message("FATAL: Firmware reported more superpages available than should be present in FIFO"));`
	`356`	`+ << ErrorInfo::Message(getLoggerPrefix() + "FATAL: Firmware reported more superpages available than should be present in FIFO"));`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`while (amountAvailable) {`