fix: Access, dereference unique pointers correctly

src/OutputFile.h

@@ -51,7 +51,9 @@ struct LumisectionMetadata {
   size_t content_size{};
   uint32_t num_orbits{};
   uint32_t num_files{};
-  uint32_t max_index;
+  uint32_t max_index{};
+
+  LumisectionMetadata() = default;
 
   // Max index per lumisection should only be enforced if CMSSW headers are enabled
   explicit LumisectionMetadata(uint32_t max_index_per_ls) : max_index(max_index_per_ls) {}
@@ -62,7 +64,7 @@ struct LumisectionMetadata {
               << ", LS=" << lumisection << "  ==>  " << new_ls;
     // Lumisection should only ever change after structure has been reset
     if (lumisection != 0 && lumisection != new_ls) {
-      LOG(INFO) << "Lumisection skipped some steps";
+      LOG(INFO) << "NOTE: lumisection should remain the same unless reset";
     }
     lumisection = new_ls;
     auto new_file_idx = global_index % (max_index + 1);
@@ -108,16 +110,14 @@ class Output {
       : md_(std::move(md)), run_metrics_(run_ptr) {};
 
   Output() = default;
-  ~Output() {
-    if (bool(ls_footer_)) free(ls_footer_);
-  }
+  ~Output() {}
 
   auto GetHandle() const { return handle_; }
   auto GetMetadata() const { return md_; }
   auto GetLumisection() const { return md_.lumisection; }
-  auto GetLumisectionFooter() const { return *ls_footer_; }
+  auto GetLumisectionFooter() const { return ls_footer_; }
   auto HasPayload() const { return md_.size > sizeof(HeaderType); }
-  auto HasLumisectionFooter() const { return bool(ls_footer_); }
+  auto HasLumisectionFooter() const { return ls_footer_.lumisection != 0; }
   auto HasHeader() const { return header_.has_value(); };
   auto GetHeader() const -> std::optional<HeaderType> { return header_; }
 
@@ -125,9 +125,9 @@ class Output {
     header_ = HeaderType(md_.source_id, md_.num_orbits, md_.run_number, md_.lumisection, md_.size);
   }
 
-  void SetLumisectionFooter(std::unique_ptr<Detail::LumisectionMetadata>&& ls) {
+  void SetLumisectionFooter(Detail::LumisectionMetadata ls) {
     // The last file in a lumisection carries an LS metadata footer
-    ls_footer_ = ls.release();
+    ls_footer_ = ls;
   }
 
   virtual void ReserveHeader() = 0;
@@ -149,7 +149,7 @@ class Output {
   Detail::RunMetadata* run_metrics_{nullptr};
 
  protected:
-  Detail::LumisectionMetadata* ls_footer_{nullptr};
+  Detail::LumisectionMetadata ls_footer_{};
 };
 
 class FileOutput : public Output {
@@ -172,9 +172,7 @@ class FileOutput : public Output {
 
   FileOutput() = default;
 
-  ~FileOutput() {
-    if (bool(ls_footer_)) free(ls_footer_);
-  }
+  ~FileOutput() {}
 
   std::string GetIdentifier() const { return filename_; };
 

src/OutputFileHandler.cc

@@ -50,13 +50,12 @@ void OutputFileHandler::UpdateRunInfo(uint32_t next_run, uint32_t next_index) {
 }
 
 void OutputFileHandler::CommitFile() {
+  ls_->AddFileMetadata(outputFile_.GetMetadata());
   Detail::FileMetadata file_meta = outputFile_.GetMetadata();
-  ls_->AddFileMetadata(file_meta);
   if (ls_->IsLastIndex(file_meta.index_in_ls) && IsMainPipeline() && HasCmsswHeaders()) {
     // If last in lumisection and using CMSSW header and is the main pipeline
-    LOG(INFO) << "Last file in lumisection; handing over LS metadata footer";
-    outputFile_.SetLumisectionFooter(std::move(ls_));
-    LOG(INFO) << "Re-instantiating LumisectionMetadata";
+    LOG(INFO) << "Last file in lumisection " << ls_->lumisection << ", handing over metadata footer and resetting.";
+    outputFile_.SetLumisectionFooter(*ls_);
     ls_ = std::make_unique<Detail::LumisectionMetadata>(GetMaxFileIndexPerLumisection());
   }
 
@@ -69,10 +68,10 @@ int OutputFileHandler::StageSlice(const char *buffer, size_t size_bytes, uint32_
   bool is_new_index = (current_global_index_ != static_cast<int>(file_index));
 
   if (is_new_run || is_new_index) {
-    LOG(INFO) << "Committing file because ... new_run? " << is_new_run << ", new_index? "
-              << is_new_index << "(context: current_global_index_=" << current_global_index_
-              << ", incoming_file_index=" << file_index << ", current_run=" << run_.number
-              << ", incoming_run=" << run_number << ")";
+    //    LOG(INFO) << "Committing file because ... new_run? " << is_new_run << ", new_index? "
+    //              << is_new_index << "(context: current_global_index_=" << current_global_index_
+    //              << ", incoming_file_index=" << file_index << ", current_run=" << run_.number
+    //              << ", incoming_run=" << run_number << ")";
     // Commit current file and start a new one
     CommitFile();
     UpdateRunInfo(run_number, file_index);
@@ -124,10 +123,12 @@ void OutputFileHandler::CommitRun() {
   LOG(INFO) << "Lumi " << std::to_string(ls_index)
             << ". Assert that lumisection pointer exists: " << bool(ls_);
   if (ls_) {
-    auto lumi_number = ls_->lumisection;
-    LOG(INFO) << "Lumi in LS struct: " << lumi_number;
-    LOG(INFO) << "Lumi as function of global file index=" << current_global_index_ << " ==> " << ls_index;
-    assert(lumi_number == ls_index);
+    auto ls_index_footer = ls_->lumisection;
+    if (ls_index_footer != ls_index) {
+      LOG(WARNING) << "Expected lumisection number " << ls_index << ", but lumisection footer has " << ls_index_footer;
+    }
+
+    assert(ls_index_footer == ls_index);
 
     if (IsMainPipeline()) {
       LOG(INFO) << "Committing lumi EOLS before EoR can be written";

src/sink.cc

@@ -42,18 +42,10 @@ void Sink<TOutput>::CommitOutput(TOutput &f) {
       Detail::LumisectionMetadata ls_meta = file.GetLumisectionFooter();
       Detail::FileMetadata file_meta = file.GetMetadata();
       auto run_number = file_meta.run_number;
-      LOG(INFO) << "Writing scheduled Lumifooter now, ls_meta says=" << ls_meta.lumisection
-                << " and file says=" << file_meta.lumisection;
-      if (ls_meta.lumisection == file_meta.lumisection) {
-        LOG(INFO) << "Lumisection values match btw";
-      } else {
-        LOG(INFO) << "Oh no, values are different";
-      }
-      ls_meta.lumisection = file_meta.lumisection;
+      LOG(INFO) << "Writing scheduled lumifooter for lumisection=" << ls_meta.lumisection;
+      assert(ls_meta.lumisection == file_meta.lumisection);
       WriteLumisectionFooter(run_number, ls_meta);
-      LOG(INFO) << "Lumifooter written! " << std::to_string(ls_meta.lumisection);
       file.run_metrics_->AddLumisectionMetadata(ls_meta);
-      LOG(INFO) << "Lumi metadata has been accumulated";
     }
   } else if constexpr (std::is_same<TOutput, DaxOutput>()) {
     LOG(TRACE) << "Committing current DAX buffer";