Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/remove race warnings #289

Merged
merged 2 commits into from
Sep 15, 2023
Merged

Feature/remove race warnings #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9411aaf
Remove data race warnings.
KIwabuchi Sep 15, 2023
decd58b
Bugfix in closing manager kernel
KIwabuchi Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions include/metall/kernel/manager_kernel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ class manager_kernel {
// Private methods
// -------------------- //

bool priv_initialized() const;
void priv_sanity_check() const;
bool priv_validate_runtime_configuration() const;
difference_type priv_to_offset(const void *const ptr) const;
void *priv_to_address(difference_type offset) const;
Expand Down Expand Up @@ -585,7 +585,6 @@ class manager_kernel {
// Private fields
// -------------------- //
bool m_good{false};
bool m_open{false};
std::string m_base_dir_path{};
size_type m_vm_region_size{0};
void *m_vm_region{nullptr};
Expand Down
37 changes: 21 additions & 16 deletions include/metall/kernel/manager_kernel_impl.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,14 @@ bool manager_kernel<chnk_no, chnk_sz>::open(

template <typename chnk_no, std::size_t chnk_sz>
void manager_kernel<chnk_no, chnk_sz>::close() {
// Update m_good
if (priv_initialized()) {
if (m_vm_region) {
priv_sanity_check();
if (!m_segment_storage.read_only()) {
priv_serialize_management_data();
m_segment_storage.sync(true);
}

m_good = false;
m_segment_storage.destroy();
priv_deallocate_segment_header();
priv_release_vm_region();
Expand All @@ -78,14 +79,14 @@ void manager_kernel<chnk_no, chnk_sz>::close() {

template <typename chnk_no, std::size_t chnk_sz>
void manager_kernel<chnk_no, chnk_sz>::flush(const bool synchronous) {
assert(priv_initialized());
priv_sanity_check();
m_segment_storage.sync(synchronous);
}

template <typename chnk_no, std::size_t chnk_sz>
void *manager_kernel<chnk_no, chnk_sz>::allocate(
const manager_kernel<chnk_no, chnk_sz>::size_type nbytes) {
assert(priv_initialized());
priv_sanity_check();
if (m_segment_storage.read_only()) return nullptr;

const auto offset = m_segment_memory_allocator.allocate(nbytes);
Expand All @@ -101,7 +102,7 @@ template <typename chnk_no, std::size_t chnk_sz>
void *manager_kernel<chnk_no, chnk_sz>::allocate_aligned(
const manager_kernel<chnk_no, chnk_sz>::size_type nbytes,
const manager_kernel<chnk_no, chnk_sz>::size_type alignment) {
assert(priv_initialized());
priv_sanity_check();
if (m_segment_storage.read_only()) return nullptr;

// This requirement could be removed, but it would need some work to do
Expand All @@ -122,23 +123,23 @@ void *manager_kernel<chnk_no, chnk_sz>::allocate_aligned(

template <typename chnk_no, std::size_t chnk_sz>
void manager_kernel<chnk_no, chnk_sz>::deallocate(void *addr) {
assert(priv_initialized());
priv_sanity_check();
if (m_segment_storage.read_only()) return;
if (!addr) return;
m_segment_memory_allocator.deallocate(priv_to_offset(addr));
}

template <typename chnk_no, std::size_t chnk_sz>
bool manager_kernel<chnk_no, chnk_sz>::all_memory_deallocated() const {
assert(priv_initialized());
priv_sanity_check();
return m_segment_memory_allocator.all_memory_deallocated();
}

template <typename chnk_no, std::size_t chnk_sz>
template <typename T>
std::pair<T *, typename manager_kernel<chnk_no, chnk_sz>::size_type>
manager_kernel<chnk_no, chnk_sz>::find(char_ptr_holder_type name) const {
assert(priv_initialized());
priv_sanity_check();

if (name.is_anonymous()) {
return std::make_pair(nullptr, 0);
Expand Down Expand Up @@ -166,7 +167,7 @@ manager_kernel<chnk_no, chnk_sz>::find(char_ptr_holder_type name) const {
template <typename chnk_no, std::size_t chnk_sz>
template <typename T>
bool manager_kernel<chnk_no, chnk_sz>::destroy(char_ptr_holder_type name) {
assert(priv_initialized());
priv_sanity_check();
if (m_segment_storage.read_only()) return false;

if (name.is_anonymous()) {
Expand Down Expand Up @@ -199,7 +200,7 @@ bool manager_kernel<chnk_no, chnk_sz>::destroy(char_ptr_holder_type name) {
template <typename chnk_no, std::size_t chnk_sz>
template <typename T>
bool manager_kernel<chnk_no, chnk_sz>::destroy_ptr(const T *ptr) {
assert(priv_initialized());
priv_sanity_check();
if (m_segment_storage.read_only()) return false;

size_type length = 0;
Expand Down Expand Up @@ -425,7 +426,7 @@ template <typename T>
T *manager_kernel<chnk_no, chnk_sz>::generic_construct(
char_ptr_holder_type name, const size_type num, const bool try2find,
[[maybe_unused]] const bool do_throw, mdtl::in_place_interface &table) {
assert(priv_initialized());
priv_sanity_check();
return priv_generic_construct<T>(name, num, try2find, table);
}

Expand Down Expand Up @@ -658,11 +659,15 @@ bool manager_kernel<chnk_no, chnk_sz>::priv_init_datastore_directory(
}

template <typename chnk_no, std::size_t chnk_sz>
bool manager_kernel<chnk_no, chnk_sz>::priv_initialized() const {
void manager_kernel<chnk_no, chnk_sz>::priv_sanity_check() const {
assert(m_good);
assert(!m_base_dir_path.empty());
assert(m_vm_region_size > 0);
assert(m_vm_region);
assert(m_segment_header);
// TODO: add sanity check functions in other classes
assert(m_segment_storage.get_segment());
return (m_vm_region && m_vm_region_size > 0 && m_segment_header &&
m_segment_storage.size() > 0);
assert(m_manager_metadata);
}

template <typename chnk_no, std::size_t chnk_sz>
Expand Down Expand Up @@ -1076,7 +1081,7 @@ bool manager_kernel<chnk_no, chnk_sz>::priv_create(
// ---------- For serializing/deserializing ---------- //
template <typename chnk_no, std::size_t chnk_sz>
bool manager_kernel<chnk_no, chnk_sz>::priv_serialize_management_data() {
assert(priv_initialized());
priv_sanity_check();

if (m_segment_storage.read_only()) return true;

Expand Down Expand Up @@ -1157,7 +1162,7 @@ template <typename chnk_no, std::size_t chnk_sz>
bool manager_kernel<chnk_no, chnk_sz>::priv_snapshot(
const char *destination_base_dir_path, const bool clone,
const int num_max_copy_threads) {
assert(priv_initialized());
priv_sanity_check();
m_segment_storage.sync(true);
priv_serialize_management_data();

Expand Down