Remove Stack::freefn

mkrzewic · matthiasrichter · commit fe2defaf6692 · 2019-01-16T12:21:59.000+01:00
diff --git a/DataFormats/Headers/include/Headers/Stack.h b/DataFormats/Headers/include/Headers/Stack.h
@@ -33,25 +33,19 @@ namespace header
 ///   - returns a Stack ready to be shipped.
 struct Stack {
 
- private:
-  static void freefn(void* data, void* hint)
-  {
-    boost::container::pmr::memory_resource* resource = static_cast<boost::container::pmr::memory_resource*>(hint);
-    resource->deallocate(data, 0, 0);
-  }
+  using memory_resource = o2::pmr::memory_resource;
 
+ private:
   struct freeobj {
-    freeobj() {}
-    freeobj(boost::container::pmr::memory_resource* mr) : resource(mr) {}
-
-    boost::container::pmr::memory_resource* resource{ nullptr };
-    void operator()(o2::byte* ptr) { Stack::freefn(ptr, resource); }
+    freeobj(memory_resource* mr) : resource(mr) {}
+    memory_resource* resource{ nullptr };
+    void operator()(o2::byte* ptr) { resource->deallocate(ptr, 0, 0); }
   };
 
  public:
   using allocator_type = boost::container::pmr::polymorphic_allocator<o2::byte>;
   using value_type = o2::byte;
-  using BufferType = std::unique_ptr<value_type[], freeobj>;
+  using BufferType = std::unique_ptr<value_type[], freeobj>; //this gives us proper default move semantics for free
 
   Stack() = default;
   Stack(Stack&&) = default;
@@ -64,8 +58,6 @@ struct Stack {
   allocator_type get_allocator() const { return allocator; }
 
   //
-  boost::container::pmr::memory_resource* getFreefnHint() const noexcept { return allocator.resource(); }
-  static auto getFreefn() noexcept { return &freefn; }
 
   /// The magic constructors: take arbitrary number of headers and serialize them
   /// into the buffer buffer allocated by the specified polymorphic allocator. By default
@@ -86,15 +78,15 @@ struct Stack {
     : allocator{ allocatorArg },
       bufferSize{ calculateSize(std::forward<Headers>(headers)...) },
       buffer{ static_cast<o2::byte*>(allocator.resource()->allocate(bufferSize, alignof(std::max_align_t))),
-              freeobj(getFreefnHint()) }
+              freeobj(allocator.resource()) }
   {
     inject(buffer.get(), std::forward<Headers>(headers)...);
   }
 
  private:
   allocator_type allocator{ boost::container::pmr::new_delete_resource() };
   size_t bufferSize{ 0 };
-  BufferType buffer{ nullptr, freeobj{ getFreefnHint() } };
+  BufferType buffer{ nullptr, freeobj{ allocator.resource() } };
 
   template <typename T, typename... Args>
   static size_t calculateSize(T&& h, Args&&... args) noexcept
diff --git a/Framework/Utils/include/Utils/Utils.h b/Framework/Utils/include/Utils/Utils.h
@@ -25,6 +25,9 @@ namespace o2
 {
 namespace workflows
 {
+//TODO: this is to make DPLmerger compile, but this code is (and always was) horribly broken - please remove.
+inline void freefn(void* data, void* /*hint*/) { delete static_cast<char*>(data); };
+
 //
 o2f::Output getOutput(const o2f::OutputSpec outputSpec);
 std::shared_ptr<std::vector<o2f::Output>> getOutputList(const o2f::Outputs outputSpecs);
diff --git a/Framework/Utils/src/DPLMerger.cxx b/Framework/Utils/src/DPLMerger.cxx
@@ -46,7 +46,7 @@ o2f::DataProcessorSpec defineMerger(std::string devName, o2f::Inputs usrInputs,
                  (*mergerFuncPtr)(outputBuffer, itInputs);
                }
                // Adopting the buffer as new chunk
-               ctx.outputs().adoptChunk((*outputPtr), &outputBuffer[0], outputBuffer.size(), header::Stack::getFreefn(),
+               ctx.outputs().adoptChunk((*outputPtr), &outputBuffer[0], outputBuffer.size(), &freefn,
                                         nullptr);
              };
            } } };

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@ namespace o2`
`25`	`25`	`{`
`26`	`26`	`namespace workflows`
`27`	`27`	`{`
	`28`	`+//TODO: this is to make DPLmerger compile, but this code is (and always was) horribly broken - please remove.`
	`29`	`+inline void freefn(void* data, void* /hint/) { delete static_cast<char*>(data); };`
	`30`	`+`
`28`	`31`	`//`
`29`	`32`	`o2f::Output getOutput(const o2f::OutputSpec outputSpec);`
`30`	`33`	`std::shared_ptr<std::vector<o2f::Output>> getOutputList(const o2f::Outputs outputSpecs);`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ o2f::DataProcessorSpec defineMerger(std::string devName, o2f::Inputs usrInputs,`
`46`	`46`	`(*mergerFuncPtr)(outputBuffer, itInputs);`
`47`	`47`	`}`
`48`	`48`	`// Adopting the buffer as new chunk`
`49`		`- ctx.outputs().adoptChunk((*outputPtr), &outputBuffer[0], outputBuffer.size(), header::Stack::getFreefn(),`
	`49`	`+ ctx.outputs().adoptChunk((*outputPtr), &outputBuffer[0], outputBuffer.size(), &freefn,`
`50`	`50`	`nullptr);`
`51`	`51`	`};`
`52`	`52`	`} } };`