MemoryResources: make sure alignment is always at least 64 bytes

ktf · ktf · commit 57a7ed4b2810 · 2020-06-12T23:45:27.000+02:00
diff --git a/DataFormats/MemoryResources/include/MemoryResources/MemoryResources.h b/DataFormats/MemoryResources/include/MemoryResources/MemoryResources.h
@@ -100,12 +100,12 @@ class MessageResource : public FairMQMemoryResource
       initialImport = false;
       return mMessageData;
     } else {
-      return mUpstream->allocate(bytes, alignment);
+      return mUpstream->allocate(bytes, alignment < 64 ? 64 : alignment);
     }
   }
   void do_deallocate(void* p, std::size_t bytes, std::size_t alignment) override
   {
-    mUpstream->deallocate(p, bytes, alignment);
+    mUpstream->deallocate(p, bytes, alignment < 64 ? 64 : alignment);
     return;
   }
   bool do_is_equal(const memory_resource& other) const noexcept override
@@ -208,7 +208,7 @@ class SpectatorAllocator : public boost::container::pmr::polymorphic_allocator<T
   {
   }
 
-  T* allocate(size_t size) { return reinterpret_cast<T*>(this->resource()->allocate(size * sizeof(T), 0)); }
+  T* allocate(size_t size) { return reinterpret_cast<T*>(this->resource()->allocate(size * sizeof(T), 64)); }
   void deallocate(T* ptr, size_t size)
   {
     this->resource()->deallocate(const_cast<typename std::remove_cv<T>::type*>(ptr), size);
@@ -264,7 +264,7 @@ class OwningMessageSpectatorAllocator
   {
   }
 
-  T* allocate(size_t size) { return reinterpret_cast<T*>(mResource.allocate(size * sizeof(T), 0)); }
+  T* allocate(size_t size) { return reinterpret_cast<T*>(mResource.allocate(size * sizeof(T), 64)); }
   void deallocate(T* ptr, size_t size)
   {
     mResource.deallocate(const_cast<typename std::remove_cv<T>::type*>(ptr), size);

Original file line number	Diff line number	Diff line change
`@@ -100,12 +100,12 @@ class MessageResource : public FairMQMemoryResource`
`100`	`100`	`initialImport = false;`
`101`	`101`	`return mMessageData;`
`102`	`102`	`} else {`
`103`		`- return mUpstream->allocate(bytes, alignment);`
	`103`	`+ return mUpstream->allocate(bytes, alignment < 64 ? 64 : alignment);`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`void do_deallocate(void* p, std::size_t bytes, std::size_t alignment) override`
`107`	`107`	`{`
`108`		`- mUpstream->deallocate(p, bytes, alignment);`
	`108`	`+ mUpstream->deallocate(p, bytes, alignment < 64 ? 64 : alignment);`
`109`	`109`	`return;`
`110`	`110`	`}`
`111`	`111`	`bool do_is_equal(const memory_resource& other) const noexcept override`
`@@ -208,7 +208,7 @@ class SpectatorAllocator : public boost::container::pmr::polymorphic_allocator<T`
`208`	`208`	`{`
`209`	`209`	`}`
`210`	`210`
`211`		`- T* allocate(size_t size) { return reinterpret_cast<T>(this->resource()->allocate(size sizeof(T), 0)); }`
	`211`	`+ T* allocate(size_t size) { return reinterpret_cast<T>(this->resource()->allocate(size sizeof(T), 64)); }`
`212`	`212`	`void deallocate(T* ptr, size_t size)`
`213`	`213`	`{`
`214`	`214`	`this->resource()->deallocate(const_cast<typename std::remove_cv<T>::type*>(ptr), size);`
`@@ -264,7 +264,7 @@ class OwningMessageSpectatorAllocator`
`264`	`264`	`{`
`265`	`265`	`}`
`266`	`266`
`267`		`- T* allocate(size_t size) { return reinterpret_cast<T>(mResource.allocate(size sizeof(T), 0)); }`
	`267`	`+ T* allocate(size_t size) { return reinterpret_cast<T>(mResource.allocate(size sizeof(T), 64)); }`
`268`	`268`	`void deallocate(T* ptr, size_t size)`
`269`	`269`	`{`
`270`	`270`	`mResource.deallocate(const_cast<typename std::remove_cv<T>::type*>(ptr), size);`