Create DPL AlgorithmSpec Task only in the InitCallback

davidrohr · sawenzel · commit ad8a5bd66366 · 2019-12-09T20:58:32.000+01:00
diff --git a/Framework/Core/include/Framework/Task.h b/Framework/Core/include/Framework/Task.h
@@ -66,8 +66,8 @@ class Task
 template <typename T, typename... Args>
 AlgorithmSpec adaptFromTask(Args&&... args)
 {
-  auto task = std::make_shared<T>(std::forward<Args>(args)...);
-  return AlgorithmSpec::InitCallback{[task](InitContext& ic) {
+  return AlgorithmSpec::InitCallback{[=](InitContext& ic) {
+    auto task = std::make_shared<T>(args...);
     if constexpr (has_endOfStream<T>::value) {
       auto& callbacks = ic.services().get<CallbackService>();
       callbacks.set(CallbackService::Id::EndOfStream, [task](EndOfStreamContext& eosContext) {
diff --git a/Utilities/Mergers/include/Mergers/Merger.h b/Utilities/Mergers/include/Mergers/Merger.h
@@ -38,7 +38,7 @@ class Merger : public framework::Task
 {
  public:
   /// \brief Default constructor. It expects merger configuration and subSpec of output channel.
-  Merger(MergerConfig, header::DataHeader::SubSpecificationType);
+  Merger(const MergerConfig&, const header::DataHeader::SubSpecificationType&);
   /// \brief Default destructor.
   ~Merger() override = default;
 
diff --git a/Utilities/Mergers/src/Merger.cxx b/Utilities/Mergers/src/Merger.cxx
@@ -36,7 +36,7 @@ namespace o2
 namespace experimental::mergers
 {
 
-Merger::Merger(MergerConfig config, header::DataHeader::SubSpecificationType subSpec)
+Merger::Merger(const MergerConfig& config, const header::DataHeader::SubSpecificationType& subSpec)
   : mConfig(config),
     mSubSpec(subSpec),
     mCache(config.ownershipMode.value == OwnershipMode::Full)

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class Merger : public framework::Task`
`38`	`38`	`{`
`39`	`39`	`public:`
`40`	`40`	`/// \brief Default constructor. It expects merger configuration and subSpec of output channel.`
`41`		`- Merger(MergerConfig, header::DataHeader::SubSpecificationType);`
	`41`	`+ Merger(const MergerConfig&, const header::DataHeader::SubSpecificationType&);`
`42`	`42`	`/// \brief Default destructor.`
`43`	`43`	`~Merger() override = default;`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ namespace o2`
`36`	`36`	`namespace experimental::mergers`
`37`	`37`	`{`
`38`	`38`
`39`		`-Merger::Merger(MergerConfig config, header::DataHeader::SubSpecificationType subSpec)`
	`39`	`+Merger::Merger(const MergerConfig& config, const header::DataHeader::SubSpecificationType& subSpec)`
`40`	`40`	`: mConfig(config),`
`41`	`41`	`mSubSpec(subSpec),`
`42`	`42`	`mCache(config.ownershipMode.value == OwnershipMode::Full)`