Merge pull request #242 from art-daq/eflumerf/StopFix

Make ArtdaqSharedMemoryInterface abort more quickly at EndOfData

Author: eflumerf

artdaq/ArtModules/ArtdaqSharedMemoryService_service.cc

@@ -93,6 +93,7 @@ class ArtdaqSharedMemoryService : public ArtdaqSharedMemoryServiceInterface
 	bool last_read_timeout_{false};
 	bool resume_after_timeout_;
 	bool printed_exit_message_{false};
+	bool end_of_data_received_{false};
 };
 
 DECLARE_ART_SERVICE_INTERFACE_IMPL(ArtdaqSharedMemoryService, ArtdaqSharedMemoryServiceInterface, LEGACY)
@@ -247,15 +248,17 @@ std::shared_ptr<ArtdaqEvent> ArtdaqSharedMemoryService::ReceiveEvent(bool broadc
 
 	while (output_event == nullptr)
 	{
-		// If we experienced a timeout, drain any held Start/End Run/SubRun events
-		if (last_read_timeout_)
+		// If we experienced a timeout, or have an EndOfData event, drain any held Start/End Run/SubRun events
+		if (last_read_timeout_ || end_of_data_received_)
 		{
 			if (event_ordering_.size() > 0)
 			{
 				output_event = event_ordering_.front();
 				event_ordering_.pop_front();
 				break;  // while(output_event == nullptr)
 			}
+			// Don't try to get more data if we have an EndOfData event
+			if (end_of_data_received_) { break; }
 		}
 
 		bool eventInEventOrder = false;
@@ -268,6 +271,10 @@ std::shared_ptr<ArtdaqEvent> ArtdaqSharedMemoryService::ReceiveEvent(bool broadc
 			{
 				continue;  // for (auto it = event_ordering_.begin(); it != event_ordering_.end(); ++it)
 			}
+			if (type == artdaq::Fragment::EndOfDataFragmentType)
+			{
+				end_of_data_received_ = true;
+			}
 			eventInEventOrder = true;
 			break;  // for (auto it = event_ordering_.begin(); it != event_ordering_.end(); ++it)
 		}

artdaq/ArtModules/TransferOutputReliable_module.cc

@@ -80,9 +80,9 @@ void art::TransferOutputReliable::SendMessage(artdaq::FragmentPtr& fragment)
 	                      << ", length=" << fragment->dataSizeBytes();
 	auto sts = artdaq::TransferInterface::CopyStatus::kErrorNotRequiringException;
 	sts = transfer_->transfer_fragment_reliable_mode(std::move(*fragment));
-	if(sts != artdaq::TransferInterface::CopyStatus::kSuccess) 
+	if (sts != artdaq::TransferInterface::CopyStatus::kSuccess)
 	{
-TLOG(TLVL_ERROR) << "Error sending Fragment " << seqID << " of type " << type << " and length " << length;
+		TLOG(TLVL_ERROR) << "Error sending Fragment " << seqID << " of type " << type << " and length " << length;
 	}
 }