gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-01 22:45:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge PR #66396 into main

Browse Source 
* refs/pull/66396/head:
	neorados: specify alignments for aligned_storage

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <k.chai@proxmox.com>
Reviewed-by: Mark Kogan <mkogan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>
This commit is contained in:
Patrick Donnelly 2026-03-20 17:49:06 -04:00
commit 1330473ff4
No known key found for this signature in database
GPG Key ID: 053758C0A8A3CE2F
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.githubmap
View File

@ -207,3 +207,4 @@ jmundack Joseph Mundackal <jmundackal@bloomberg.net>
edwinzrodriguez Edwin Rodriguez <edwin.rodriguez1@ibm.com>
synarete Shachar Sharon <ssharon@redhat.com>
ashjosh1git Ashwin M Joshi <ashjosh1@in.ibm.com>
mkogan1 Mark Kogan <mkogan@redhat.com>

2
src/include/neorados/RADOS.hpp
View File

@ -80,7 +80,7 @@ struct hash<neorados::IOContext>;
namespace neorados {
namespace detail {
class Client;
template<std::size_t S, std::size_t Alignment = std::bit_ceil(S)>
template<std::size_t S, std::size_t Alignment = alignof(std::max_align_t)>
struct alignas(Alignment) aligned_storage {
std::byte data[S];
};

18
src/neorados/RADOS.cc
View File

@ -74,26 +74,31 @@ namespace neorados {
Object::Object() {
static_assert(impl_size >= sizeof(object_t));
static_assert(alignof(decltype(impl)) >= alignof(object_t));
new (&impl) object_t();
}
Object::Object(const char* s) {
static_assert(impl_size >= sizeof(object_t));
static_assert(alignof(decltype(impl)) >= alignof(object_t));
new (&impl) object_t(s);
}
Object::Object(std::string_view s) {
static_assert(impl_size >= sizeof(object_t));
static_assert(alignof(decltype(impl)) >= alignof(object_t));
new (&impl) object_t(s);
}
Object::Object(std::string&& s) {
static_assert(impl_size >= sizeof(object_t));
static_assert(alignof(decltype(impl)) >= alignof(object_t));
new (&impl) object_t(std::move(s));
}
Object::Object(const std::string& s) {
static_assert(impl_size >= sizeof(object_t));
static_assert(alignof(decltype(impl)) >= alignof(object_t));
new (&impl) object_t(s);
}
@ -103,6 +108,7 @@ Object::~Object() {
Object::Object(const Object& o) {
static_assert(impl_size >= sizeof(object_t));
static_assert(alignof(decltype(impl)) >= alignof(object_t));
new (&impl) object_t(*reinterpret_cast<const object_t*>(&o.impl));
}
Object& Object::operator =(const Object& o) {
@ -112,6 +118,7 @@ Object& Object::operator =(const Object& o) {
}
Object::Object(Object&& o) {
static_assert(impl_size >= sizeof(object_t));
static_assert(alignof(decltype(impl)) >= alignof(object_t));
new (&impl) object_t(std::move(*reinterpret_cast<object_t*>(&o.impl)));
}
Object& Object::operator =(Object&& o) {
@ -165,6 +172,7 @@ struct IOContextImpl {
IOContext::IOContext() {
static_assert(impl_size >= sizeof(IOContextImpl));
static_assert(alignof(decltype(impl)) >= alignof(IOContextImpl));
new (&impl) IOContextImpl();
}
@ -185,6 +193,7 @@ IOContext::~IOContext() {
IOContext::IOContext(const IOContext& rhs) {
static_assert(impl_size >= sizeof(IOContextImpl));
static_assert(alignof(decltype(impl)) >= alignof(IOContextImpl));
new (&impl) IOContextImpl(*reinterpret_cast<const IOContextImpl*>(&rhs.impl));
}
@ -196,6 +205,7 @@ IOContext& IOContext::operator =(const IOContext& rhs) {
IOContext::IOContext(IOContext&& rhs) {
static_assert(impl_size >= sizeof(IOContextImpl));
static_assert(alignof(decltype(impl)) >= alignof(IOContextImpl));
new (&impl) IOContextImpl(
std::move(*reinterpret_cast<IOContextImpl*>(&rhs.impl)));
}
@ -414,6 +424,7 @@ struct OpImpl {
Op::Op() {
static_assert(Op::impl_size >= sizeof(OpImpl));
static_assert(alignof(decltype(impl)) >= alignof(OpImpl));
new (&impl) OpImpl;
}
@ -1760,16 +1771,19 @@ void RADOS::notify_(Object o, IOContext _ioc, bufferlist bl,
Cursor::Cursor() {
static_assert(impl_size >= sizeof(hobject_t));
static_assert(alignof(decltype(impl)) >= alignof(hobject_t));
new (&impl) hobject_t();
};
Cursor::Cursor(end_magic_t) {
static_assert(impl_size >= sizeof(hobject_t));
static_assert(alignof(decltype(impl)) >= alignof(hobject_t));
new (&impl) hobject_t(hobject_t::get_max());
}
Cursor::Cursor(void* p) {
static_assert(impl_size >= sizeof(hobject_t));
static_assert(alignof(decltype(impl)) >= alignof(hobject_t));
new (&impl) hobject_t(std::move(*reinterpret_cast<hobject_t*>(p)));
}
@ -1785,11 +1799,13 @@ Cursor Cursor::end() {
Cursor::Cursor(const Cursor& rhs) {
static_assert(impl_size >= sizeof(hobject_t));
static_assert(alignof(decltype(impl)) >= alignof(hobject_t));
new (&impl) hobject_t(*reinterpret_cast<const hobject_t*>(&rhs.impl));
}
Cursor& Cursor::operator =(const Cursor& rhs) {
static_assert(impl_size >= sizeof(hobject_t));
static_assert(alignof(decltype(impl)) >= alignof(hobject_t));
reinterpret_cast<hobject_t*>(&impl)->~hobject_t();
new (&impl) hobject_t(*reinterpret_cast<const hobject_t*>(&rhs.impl));
return *this;
@ -1797,11 +1813,13 @@ Cursor& Cursor::operator =(const Cursor& rhs) {
Cursor::Cursor(Cursor&& rhs) {
static_assert(impl_size >= sizeof(hobject_t));
static_assert(alignof(decltype(impl)) >= alignof(hobject_t));
new (&impl) hobject_t(std::move(*reinterpret_cast<hobject_t*>(&rhs.impl)));
}
Cursor& Cursor::operator =(Cursor&& rhs) {
static_assert(impl_size >= sizeof(hobject_t));
static_assert(alignof(decltype(impl)) >= alignof(hobject_t));
reinterpret_cast<hobject_t*>(&impl)->~hobject_t();
new (&impl) hobject_t(std::move(*reinterpret_cast<hobject_t*>(&rhs.impl)));
return *this;