Skip to content

Commit b1507b1

Browse files
committed
remove internal use of raw methods
1 parent c3b2f22 commit b1507b1

2 files changed

Lines changed: 16 additions & 9 deletions

File tree

include/openPMD/RecordComponent.tpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ RecordComponent::storeChunk(std::unique_ptr<T, Del> data, Offset o, Extent e)
4747
.offset(std::move(o))
4848
.extent(std::move(e))
4949
.withUniquePtr(std::move(data))
50-
.storeRaw(EnqueuePolicy::Defer);
50+
.unsafeNoAutomaticFlush()
51+
.store();
5152
}
5253

5354
template <typename T_ContiguousContainer>
@@ -69,7 +70,8 @@ RecordComponent::storeChunk(T_ContiguousContainer &data, Offset o, Extent e)
6970

7071
std::move(storeChunkConfig)
7172
.withContiguousContainer(data)
72-
.storeRaw(EnqueuePolicy::Defer);
73+
.unsafeNoAutomaticFlush()
74+
.store();
7375
}
7476

7577
template <typename T, typename F>

src/RecordComponent.cpp

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,8 @@ std::shared_ptr<void> RecordComponent::loadChunkAllocate_impl(
254254
.offset(std::move(o))
255255
.extent(std::move(e))
256256
.withSharedPtr_impl_mut(newData, dtype)
257-
.loadRaw(EnqueuePolicy::Defer);
257+
.unsafeNoAutomaticFlush()
258+
.load();
258259
return newData;
259260
}
260261

@@ -852,7 +853,7 @@ std::shared_ptr<T> RecordComponent::loadChunk(Offset o, Extent e)
852853
operation.extent(std::move(e));
853854
}
854855

855-
return operation.loadRaw<T>(EnqueuePolicy::Defer);
856+
return operation.unsafeNoAutomaticFlush().load<T>().get();
856857
}
857858

858859
namespace detail
@@ -993,7 +994,7 @@ void RecordComponent::loadChunk(std::shared_ptr<T> data, Offset o, Extent e)
993994
operation.extent(std::move(e));
994995
}
995996

996-
operation.withSharedPtr(std::move(data)).loadRaw(EnqueuePolicy::Defer);
997+
operation.withSharedPtr(std::move(data)).unsafeNoAutomaticFlush().load();
997998
}
998999

9991000
template <typename T>
@@ -1003,7 +1004,8 @@ void RecordComponent::loadChunkRaw(T *ptr, Offset offset, Extent extent)
10031004
.offset(std::move(offset))
10041005
.extent(std::move(extent))
10051006
.withRawPtr(ptr)
1006-
.loadRaw(EnqueuePolicy::Defer);
1007+
.unsafeNoAutomaticFlush()
1008+
.load();
10071009
}
10081010

10091011
template <typename T>
@@ -1013,7 +1015,8 @@ void RecordComponent::storeChunk(std::shared_ptr<T> data, Offset o, Extent e)
10131015
.offset(std::move(o))
10141016
.extent(std::move(e))
10151017
.withSharedPtr(std::move(data))
1016-
.storeRaw(EnqueuePolicy::Defer);
1018+
.unsafeNoAutomaticFlush()
1019+
.store();
10171020
}
10181021

10191022
template <typename T>
@@ -1024,7 +1027,8 @@ void RecordComponent::storeChunk(
10241027
.offset(std::move(o))
10251028
.extent(std::move(e))
10261029
.withUniquePtr(std::move(data))
1027-
.storeRaw(EnqueuePolicy::Defer);
1030+
.unsafeNoAutomaticFlush()
1031+
.store();
10281032
}
10291033

10301034
template <typename T>
@@ -1034,7 +1038,8 @@ void RecordComponent::storeChunkRaw(T const *ptr, Offset offset, Extent extent)
10341038
.offset(std::move(offset))
10351039
.extent(std::move(extent))
10361040
.withRawPtr(ptr)
1037-
.storeRaw(EnqueuePolicy::Defer);
1041+
.unsafeNoAutomaticFlush()
1042+
.store();
10381043
}
10391044

10401045
template <typename T>

0 commit comments

Comments
 (0)