cxx examples udpated

examples/cxx/ADM_register_adhoc_storage.cpp

@@ -24,6 +24,7 @@
 
 #include <fmt/format.h>
 #include <admire.hpp>
+#include "common.hpp"
 
 #define NINPUTS  10
 #define NOUTPUTS 5
@@ -41,14 +42,24 @@ main(int argc, char* argv[]) {
 
     admire::server server{"tcp", argv[1]};
 
-    ADM_job_t job{};
+    const auto inputs = prepare_datasets("input-dataset-{}", NINPUTS);
+    const auto outputs = prepare_datasets("output-dataset-{}", NOUTPUTS);
+
+    auto p = std::make_unique<admire::adhoc_storage>(
+            admire::storage::type::gekkofs, "foobar", 52,
+            admire::adhoc_storage::execution_mode::separate_new,
+            admire::adhoc_storage::access_type::read_write, 42, 100, false);
+
+    admire::job_requirements reqs(inputs, outputs, std::move(p));
+
     std::string id;
-    ADM_adhoc_context_t ctx{};
-    ADM_storage_t adhoc_storage{};
+    //ADM_storage_t adhoc_storage{};
+    const auto adhoc_storage_ctx = admire::adhoc_storage::ctx{admire::adhoc_storage::execution_mode::separate_new, admire::adhoc_storage::access_type::read_write, 42, 100, false};
     ADM_return_t ret = ADM_SUCCESS;
 
     try {
-        ret = admire::register_adhoc_storage(server, job, id, ctx, &adhoc_storage);
+        [[maybe_unused]] const auto job = admire::register_job(server, reqs);
+        const auto adhoc_storage = admire::register_adhoc_storage(server, job, id, adhoc_storage_ctx);
     } catch(const std::exception& e) {
         fmt::print(stderr, "FATAL: ADM_register_adhoc_storage() failed: {}\n",
                    e.what());

examples/cxx/ADM_register_job.cpp

@@ -44,7 +44,7 @@ main(int argc, char* argv[]) {
     const auto outputs = prepare_datasets("output-dataset-{}", NOUTPUTS);
 
     auto p = std::make_unique<admire::adhoc_storage>(
-            admire::storage::type::gekkofs, "foobar",
+            admire::storage::type::gekkofs, "foobar", 52,
             admire::adhoc_storage::execution_mode::separate_new,
             admire::adhoc_storage::access_type::read_write, 42, 100, false);
 

examples/cxx/ADM_transfer_datasets.cpp

@@ -52,7 +52,7 @@ main(int argc, char* argv[]) {
     const auto mapping = admire::transfer::mapping::n_to_n;
 
     auto p = std::make_unique<admire::adhoc_storage>(
-            admire::storage::type::gekkofs, "foobar",
+            admire::storage::type::gekkofs, "foobar", 42,
             admire::adhoc_storage::execution_mode::separate_new,
             admire::adhoc_storage::access_type::read_write, 42, 100, false);
 

examples/cxx/ADM_update_job.cpp

@@ -44,10 +44,12 @@ main(int argc, char* argv[]) {
     const auto outputs = prepare_datasets("output-dataset-{}", NOUTPUTS);
 
     auto p = std::make_unique<admire::adhoc_storage>(
-            admire::storage::type::gekkofs, "foobar",
+            admire::storage::type::gekkofs, "foobar", 42,
             admire::adhoc_storage::execution_mode::separate_new,
             admire::adhoc_storage::access_type::read_write, 42, 100, false);
 
+    //const auto adhoc_storage = admire::register_adhoc_storage(server, job, "foobar", adhoc_storage_ctx);
+
     admire::job_requirements reqs{inputs, outputs, std::move(p)};
 
 
@@ -56,7 +58,7 @@ main(int argc, char* argv[]) {
             prepare_datasets("output-new-dataset-{}", NOUTPUTS);
 
     auto p2 = std::make_unique<admire::adhoc_storage>(
-            admire::storage::type::gekkofs, "foobar",
+            admire::storage::type::gekkofs, "foobar", 42,
             admire::adhoc_storage::execution_mode::separate_new,
             admire::adhoc_storage::access_type::read_write, 42, 100, false);