Use WriteBuffer type for smart pointers

Author: franzpoeschel

include/openPMD/toolkit/Aws.hpp

@@ -38,7 +38,8 @@ struct ExternalBlockStorageAws : ExternalBlockStorageBackend
         std::string bucketName,
         std::optional<std::string> endpoint,
         bool async);
-    auto put(std::string const &identifier, void const *data, size_t len)
+    auto
+    put(std::string const &identifier, auxiliary::WriteBuffer data, size_t len)
         -> std::string override;
     void get(std::string const &external_ref, void *data, size_t len) override;
     [[nodiscard]] auto externalStorageLocation() const

include/openPMD/toolkit/ExternalBlockStorage.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "openPMD/Dataset.hpp"
+#include "openPMD/auxiliary/Memory.hpp"
 #include "openPMD/toolkit/AwsBuilder.hpp"
 #include "openPMD/toolkit/StdioBuilder.hpp"
 
@@ -22,7 +23,7 @@ namespace openPMD::internal
 struct ExternalBlockStorageBackend
 {
     virtual auto
-    put(std::string const &identifier, void const *data, size_t len)
+    put(std::string const &identifier, auxiliary::WriteBuffer data, size_t len)
         -> std::string = 0;
     virtual void
     get(std::string const &external_ref, void *data, size_t len) = 0;
@@ -90,7 +91,7 @@ class ExternalBlockStorage
         nlohmann::json &fullJsonDataset,
         nlohmann::json::json_pointer const &path,
         std::optional<std::string> infix, // e.g. for distinguishing MPI ranks
-        T const *data) -> std::string;
+        auxiliary::WriteBuffer data) -> std::string;
 
     template <typename DatatypeHandling, typename T>
     void read(

include/openPMD/toolkit/Stdio.hpp

@@ -12,7 +12,8 @@ struct ExternalBlockStorageStdio : ExternalBlockStorageBackend
 
 public:
     ExternalBlockStorageStdio(std::string directory, std::string openMode);
-    auto put(std::string const &identifier, void const *data, size_t len)
+    auto
+    put(std::string const &identifier, auxiliary::WriteBuffer data, size_t len)
         -> std::string override;
     void get(std::string const &external_ref, void *data, size_t len) override;
     [[nodiscard]] auto externalStorageLocation() const

src/IO/JSON/JSONIOHandlerImpl.cpp

@@ -1467,11 +1467,10 @@ namespace
     struct StoreExternally
     {
         template <typename T, typename... Args>
-        static void call(
-            ExternalBlockStorage &blockStorage, void const *ptr, Args &&...args)
+        static void call(ExternalBlockStorage &blockStorage, Args &&...args)
         {
             blockStorage.store<internal::JsonDatatypeHandling, T>(
-                std::forward<Args>(args)..., static_cast<T const *>(ptr));
+                std::forward<Args>(args)...);
         }
 
         static constexpr char const *errorMsg = "StoreExternally";
@@ -1525,13 +1524,13 @@ void JSONIOHandlerImpl::writeDataset(
                 switchDatasetType<StoreExternally>(
                     parameters.dtype,
                     *external,
-                    parameters.data.get(),
                     j.at("extent").get<Extent>(),
                     parameters.offset,
                     parameters.extent,
                     jsonRoot,
                     filePosition->id,
-                    std::move(rankInfix));
+                    std::move(rankInfix),
+                    std::move(parameters.data));
             }},
         verifyDataset(parameters, j).as_base());
 

src/toolkit/Aws.cpp

@@ -89,7 +89,8 @@ ExternalBlockStorageAws::ExternalBlockStorageAws(
 ExternalBlockStorageAws::~ExternalBlockStorageAws() = default;
 
 auto ExternalBlockStorageAws::put(
-    std::string const &identifier, void const *data, size_t len) -> std::string
+    std::string const &identifier, auxiliary::WriteBuffer data, size_t len)
+    -> std::string
 {
     auto sanitized = !identifier.empty() && identifier.at(0) == '/'
         ? identifier.substr(1)
@@ -100,7 +101,9 @@ auto ExternalBlockStorageAws::put(
     put_request.SetKey(sanitized);
 
     auto input_data = Aws::MakeShared<imemstream>(
-        "PutObjectInputStream", reinterpret_cast<char const *>(data), len);
+        "PutObjectInputStream",
+        reinterpret_cast<char const *>(data.get()),
+        len);
     put_request.SetBody(input_data);
     put_request.SetContentLength(static_cast<long long>(len));
 

src/toolkit/ExternalBlockStorage.cpp

@@ -2,6 +2,7 @@
 
 #include "openPMD/DatatypeMacros.hpp"
 #include "openPMD/IO/JSON/JSONIOHandlerImpl.hpp"
+#include "openPMD/auxiliary/Memory.hpp"
 #include "openPMD/auxiliary/StringManip.hpp"
 
 #include <nlohmann/json.hpp>
@@ -74,7 +75,7 @@ auto ExternalBlockStorage::store(
     nlohmann::json &fullJsonDataset,
     nlohmann::json::json_pointer const &path,
     std::optional<std::string> infix,
-    T const *data) -> std::string
+    auxiliary::WriteBuffer data) -> std::string
 {
     auto &dataset = fullJsonDataset[path];
 
@@ -154,7 +155,7 @@ auto ExternalBlockStorage::store(
     filesystem_identifier << "--" << index_as_str;
     auto escaped_filesystem_identifier = m_worker->put(
         filesystem_identifier.str(),
-        data,
+        std::move(data),
         sizeof(T) * flat_extent(blockExtent));
     block["external_ref"] = escaped_filesystem_identifier;
     return index_as_str;
@@ -250,7 +251,7 @@ void ExternalBlockStorage::sanitizeString(std::string &s)
         nlohmann::json &fullJsonDataset,                                       \
         nlohmann::json::json_pointer const &path,                              \
         std::optional<std::string> infix,                                      \
-        type const *data) -> std::string;                                      \
+        auxiliary::WriteBuffer) -> std::string;                                \
     template void ExternalBlockStorage::read<datatypehandling, type>(          \
         std::string const &identifier,                                         \
         nlohmann::json const &fullJsonDataset,                                 \

src/toolkit/Stdio.cpp

@@ -62,7 +62,8 @@ ExternalBlockStorageStdio::ExternalBlockStorageStdio(
 ExternalBlockStorageStdio::~ExternalBlockStorageStdio() = default;
 
 auto ExternalBlockStorageStdio::put(
-    std::string const &identifier, void const *data, size_t len) -> std::string
+    std::string const &identifier, auxiliary::WriteBuffer data, size_t len)
+    -> std::string
 {
     auto sanitized = identifier + ".dat";
     ExternalBlockStorage::sanitizeString(sanitized);
@@ -81,7 +82,7 @@ auto ExternalBlockStorageStdio::put(
             filepath);
     }
 
-    size_t written = std::fwrite(data, 1, len, file);
+    size_t written = std::fwrite(data.get(), 1, len, file);
     if (written != len)
     {
         throw std::runtime_error(