remove task batches

Author: anderspkd

include/scl/coro/batch.h

@@ -175,32 +175,6 @@ std::coroutine_handle<> FutureAwaiter<FUTURE>::await_suspend(
   return m_runtime->next();
 }
 
-template <typename RESULT>
-std::coroutine_handle<> Batch<RESULT>::await_suspend(
-    std::coroutine_handle<> coroutine) {
-  for (auto& task : m_tasks) {
-    task.setRuntime(m_runtime);
-    m_runtime->schedule(task.m_handle);
-  }
-
-  m_runtime->schedule(coroutine, [this]() { return await_ready(); });
-
-  return m_runtime->next();
-}
-
-template <typename RESULT>
-std::coroutine_handle<> PartialBatch<RESULT>::await_suspend(
-    std::coroutine_handle<> coroutine) {
-  for (auto& task : m_tasks) {
-    task.setRuntime(m_runtime);
-    m_runtime->schedule(task.m_handle);
-  }
-
-  m_runtime->schedule(coroutine, [this]() { return await_ready(); });
-
-  return m_runtime->next();
-}
-
 inline std::coroutine_handle<> SleepAwaiter::await_suspend(
     std::coroutine_handle<> handle) {
   m_runtime->schedule(handle, m_duration);

include/scl/coro/runtime.h

@@ -131,39 +131,6 @@ class Network {
     }
   }
 
-  /**
-   * @brief Receive data from a subset of parties.
-   * @param t the minimum number of parties to receive data from.
-   * @return list of received packets.
-   *
-   * Attempts to receive data from all parties, but stops when a Packet has been
-   * received from at least t parties. The return value is a std::vector of
-   * size() std::optional elements. Positions with no values correspond to
-   * parties that did not send anything. Thus, the return value will have at
-   * least \p t positions with values.
-   */
-  Task<std::vector<std::optional<Packet>>> recv(std::size_t t) {
-    std::vector<Task<Packet>> recvs;
-    recvs.reserve(size());
-    for (std::size_t i = 0; i < size(); i++) {
-      recvs.emplace_back(party(i)->recv());
-    }
-    co_return co_await batch(std::move(recvs), t);
-  }
-
-  /**
-   * @brief Receive data from all parties on the network.
-   * @return list of received packets.
-   */
-  Task<std::vector<Packet>> recv() {
-    std::vector<Task<Packet>> recvs;
-    recvs.reserve(size());
-    for (std::size_t i = 0; i < size(); i++) {
-      recvs.emplace_back(party(i)->recv());
-    }
-    co_return co_await batch(std::move(recvs));
-  }
-
   /**
    * @brief The number of parties in this network.
    */

include/scl/net/network.h

@@ -17,6 +17,8 @@
 
 #include "scl/net/tcp/network.h"
 
+#include <algorithm>
+#include <coroutine>
 #include <cstdint>
 #include <memory>
 
@@ -100,6 +102,44 @@ scl::Task<SocketAndId> establishConnection(scl::ConnectionInfo party,
   throw std::runtime_error("could not establish connection to party");
 }
 
+class BatchTask final {
+ public:
+  BatchTask(std::vector<scl::Task<SocketAndId>>&& tasks)
+      : m_tasks(std::move(tasks)), m_runtime(nullptr) {}
+
+  bool await_ready() const noexcept {
+    return std::all_of(m_tasks.begin(), m_tasks.end(), [](const auto& task) {
+      return task.ready();
+    });
+  }
+
+  std::coroutine_handle<> await_suspend(std::coroutine_handle<> handle) {
+    for (auto& task : m_tasks) {
+      task.setRuntime(m_runtime);
+      m_runtime->schedule(task.m_handle);
+    }
+    m_runtime->schedule(handle, [this]() { return this->await_ready(); });
+
+    return m_runtime->next();
+  }
+
+  std::vector<SocketAndId> await_resume() {
+    std::vector<SocketAndId> results;
+    for (const auto& task : m_tasks) {
+      results.emplace_back(task.result());
+    }
+    return results;
+  }
+
+  void setRuntime(scl::Runtime* runtime) {
+    m_runtime = runtime;
+  }
+
+ private:
+  std::vector<scl::Task<SocketAndId>> m_tasks;
+  scl::Runtime* m_runtime;
+};
+
 }  // namespace
 
 scl::Task<scl::Network> scl::createTcpNetwork(const NetworkConfig& config) {
@@ -123,7 +163,7 @@ scl::Task<scl::Network> scl::createTcpNetwork(const NetworkConfig& config) {
     }
   }
 
-  std::vector<SocketAndId> sais = co_await batch(std::move(tasks));
+  std::vector<SocketAndId> sais = co_await BatchTask(std::move(tasks));
 
   details::sys_call::close(server_socket);
 

src/scl/net/tcp/network.cc

@@ -1,5 +1,5 @@
 # SCL --- Secure Computation Library
-# Copyright (C) 2024 Anders Dalskov
+# Copyright (C) 2025 Anders Dalskov
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -47,7 +47,6 @@ set(SCL_SOURCE_FILES_TEST
   scl/ss/test_pedersen.cc
 
   scl/coro/test_task.cc
-  scl/coro/test_batch.cc
 
   scl/net/util.cc
   scl/net/test_config.cc