Merge pull request #342 from DARMA-tasking/335-add-std-queue-serializer

#335: Add `std::queue` serializer
DARMA-tasking · Jun 5, 2024 · f43638e · f43638e
2 parents c985084 + 26d428a
commit f43638e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 6 deletions.
diff --git a/src/checkpoint/container/queue_serialize.h b/src/checkpoint/container/queue_serialize.h
@@ -51,8 +51,46 @@
 
 namespace checkpoint {
 
+template<typename SerializerT, typename T>
+void deserializeQueueElems(SerializerT& s, std::queue<T>& q, typename std::queue<T>::size_type size) {
+  using Reconstructor =
+    dispatch::Reconstructor<typename dispatch::CleanType<T>::CleanT>;
+
+  dispatch::Allocator<T> allocated;
+  for (typename std::queue<T>::size_type i = 0; i < size; ++i) {
+    auto* reconstructed = Reconstructor::construct(allocated.buf);
+    s | *reconstructed;
+    q.push(std::move(*reconstructed));
+  }
+}
+
+template<typename SerializerT, typename T>
+void serializeQueueElems(SerializerT& s, std::queue<T> q) {
+  while(!q.empty()) {
+    s | q.front();
+    q.pop();
+  }
+}
+
+template <
+  typename SerializerT,
+  typename T,
+  typename = std::enable_if_t<
+    not std::is_same_v<SerializerT, checkpoint::Footprinter>
+  >
+>
+void serializeQueueLikeContainer(SerializerT& s, std::queue<T>& q) {
+  typename std::queue<T>::size_type size = serializeContainerSize(s, q);
+
+  if (s.isUnpacking()) {
+    deserializeQueueElems(s, q, size);
+  } else {
+    serializeQueueElems(s, q);
+  }
+}
+
 template <typename Serializer, typename T>
-void serialize(Serializer& s, const std::queue<T>& q) {
+void serialize(Serializer& s, std::queue<T>& q) {
   serializeQueueLikeContainer(s, q);
 }
 
@@ -70,10 +108,7 @@ template <
   typename SerializerT,
   typename Q,
   typename = std::enable_if_t<
-    std::is_same<
-      SerializerT,
-      checkpoint::Footprinter
-    >::value
+    std::is_same_v<SerializerT, checkpoint::Footprinter>
   >
 >
 void serializeQueueLikeContainer(SerializerT& s, const Q& q) {

diff --git a/tests/unit/test_container.cc b/tests/unit/test_container.cc
@@ -58,6 +58,11 @@ struct TestContainerUnordered : TestHarness { };
 TYPED_TEST_CASE_P(TestContainer);
 TYPED_TEST_CASE_P(TestContainerUnordered);
 
+template <typename T>
+static void testEqualityContainerOrdered(std::queue<T> c1, std::queue<T> t1) {
+  EXPECT_EQ(c1, t1);
+}
+
 template <typename ContainerT>
 static void testEqualityContainerOrdered(ContainerT& c1, ContainerT& t1) {
   for (auto i = c1.begin(), j = t1.begin(), i_end = c1.end(), j_end = t1.end();
@@ -155,7 +160,8 @@ using ContOrderedTypes = ::testing::Types<
   std::list<T>,
   std::deque<T>,
   std::set<T>,
-  std::multiset<T>
+  std::multiset<T>,
+  std::queue<T>
 >;
 
 template <typename T>