[k2] rpc client API

builtin-functions/kphp-light/stdlib/rpc.txt

@@ -40,15 +40,14 @@ final class KphpRpcRequestsExtraInfo {
     public function get ();
 }
 
-/** @kphp-extern-func-info interruptible */
 function rpc_send_requests($actor ::: string,
                            $arr ::: array,
                            $timeout ::: ?float,
                            $ignore_answer ::: bool,
                            \KphpRpcRequestsExtraInfo $requests_extra_info,
                            $need_responses_extra_info ::: bool) ::: int[];
 
-/** @kphp-extern-func-info tl_common_h_dep interruptible */
+/** @kphp-extern-func-info tl_common_h_dep */
 function rpc_send_typed_query_requests($actor ::: string, @tl\RpcFunction[] $query_functions,
                                        $timeout ::: ?float,
                                        $ignore_answer ::: bool,

runtime-light/k2-platform/k2-api.h

@@ -60,6 +60,7 @@ inline constexpr int32_t errno_enoent = ENOENT;
 inline constexpr int32_t errno_eopnotsupp = EOPNOTSUPP;
 inline constexpr int32_t errno_ealready = EALREADY;
 inline constexpr int32_t errno_einprogress = EINPROGRESS;
+inline constexpr int32_t errno_eagain = EAGAIN;
 
 using descriptor = uint64_t;
 inline constexpr k2::descriptor INVALID_PLATFORM_DESCRIPTOR = 0;
@@ -80,6 +81,8 @@ using PollStatus = PollStatus;
 
 using ImageInfo = ImageInfo;
 
+using RpcKind = RpcKind;
+
 using ControlFlags = ControlFlags;
 
 inline const ImageInfo* describe() noexcept {
@@ -210,6 +213,32 @@ inline int32_t component_access(std::string_view component_name) noexcept {
   return k2_component_access(component_name.size(), component_name.data());
 }
 
+inline std::expected<k2::descriptor, int32_t> rpc_send_request(std::string_view actor_name, std::span<const std::byte> request_buffer,
+                                                               k2::RpcKind rpc_kind) noexcept {
+  k2::descriptor descriptor{};
+  if (auto error_code{
+          k2_rpc_send_request(actor_name.data(), actor_name.size(), request_buffer.data(), request_buffer.size(), rpc_kind, std::addressof(descriptor))};
+      error_code != k2::errno_ok) {
+    return std::unexpected{error_code};
+  }
+  return {descriptor};
+}
+
+inline std::expected<size_t, int32_t> rpc_get_response_size(k2::descriptor descriptor) noexcept {
+  size_t size{};
+  if (auto error_code{k2_rpc_get_response_size(descriptor, std::addressof(size))}; error_code != k2::errno_ok) {
+    return std::unexpected{error_code};
+  }
+  return {size};
+}
+
+inline std::expected<void, int32_t> rpc_fetch_response(k2::descriptor descriptor, std::span<std::byte> buffer) noexcept {
+  if (auto error_code{k2_rpc_fetch_response(descriptor, buffer.data(), buffer.size())}; error_code != errno_ok) {
+    return std::unexpected{error_code};
+  }
+  return {};
+}
+
 inline void stream_status(k2::descriptor descriptor, StreamStatus* status) noexcept {
   k2_stream_status(descriptor, status);
 }

runtime-light/k2-platform/k2-header.h

@@ -97,6 +97,10 @@ enum UpdateStatus {
   NewDescriptor = 2,
 };
 
+enum RpcKind {
+  TL_RPC = 0,
+};
+
 struct ImageInfo {
   // Base
   const char* image_name;
@@ -316,6 +320,44 @@ int32_t k2_unlink(const char* path, size_t path_len);
  */
 int32_t k2_component_access(size_t name_len, const char* name);
 
+/**
+ * Try to send rpc request to actor. On success, write descriptor of the corresponding rpc query to `rpc_d`.
+ * This descriptor should be later used to call `k2_rpc_get_response_size` and `k2_rpc_fetch_response`. On failure return positive libc-like errno.
+ *
+ * @return return `0` on success. libc-like `errno` otherwise.
+ *
+ * Possible `errno` values:
+ * `EAI_MEMORY` => max descriptors count achieved.
+ * `EINVAL`     => invalid `actor_name` or request, or connection pool is empty for this actor.
+ */
+int32_t k2_rpc_send_request(const char* actor_name, size_t actor_name_len, const void* request_ptr, size_t request_size, enum RpcKind rpc_kind, uint64_t* rpc_d);
+
+/**
+ * Try to get response size for the corresponding query of this `rpc_d`. Write 0 to `response_size` and return `EAGAIN` if response is not ready yet.
+ * Write positive response size value to `response_size` if response is ready and return 0.
+ *
+ * @return return `0` on success. libc-like `errno` otherwise
+ *
+ * Possible `errno` values:
+ * `EINVAL` => invalid `rpc_d` descriptor, for example, it is unknown descriptor, or not rpc descriptor.
+ * `EAGAIN` => response is not ready yet.
+ */
+int32_t k2_rpc_get_response_size(uint64_t rpc_d, size_t* response_size);
+
+/**
+ * Try to fetch response for the corresponding query of this `rpc_d`. If response is ready, write it to `buf` and return 0.
+ * Return `EAGAIN` if response is not ready yet and write nothing. Return `ENOBUFS` if `buf_size` < response length.
+ * User should get response size by calling `k2_rpc_get_response_size` first.
+ *
+ * @return return `0` on success. libc-like `errno` otherwise
+ *
+ * Possible `errno` values:
+ * `EINVAL`  => invalid `rpc_d` descriptor, for example, it is unknown descriptor, or not rpc descriptor.
+ * `EAGAIN`  => response is not ready yet.
+ * `ENOBUFS` => provided response buffer is not big enough, (`buf_size` < `response_size` value written by `k2_rpc_get_response_size`).
+ */
+int32_t k2_rpc_fetch_response(uint64_t rpc_d, void* buf, size_t buf_size);
+
 /**
  * If the write or read status is `Blocked` - then the platform ensures that
  * the component receives this `stream_d` via `k2_take_update` when the status is

runtime-light/state/instance-state.cpp

@@ -17,7 +17,6 @@
 #include "runtime-common/core/std/containers.h"
 #include "runtime-light/core/globals/php-init-scripts.h"
 #include "runtime-light/core/globals/php-script-globals.h"
-#include "runtime-light/coroutine/await-set.h"
 #include "runtime-light/coroutine/task.h"
 #include "runtime-light/k2-platform/k2-api.h"
 #include "runtime-light/server/cli/init-functions.h"
@@ -29,7 +28,6 @@
 #include "runtime-light/stdlib/diagnostics/logs.h"
 #include "runtime-light/stdlib/fork/fork-functions.h"
 #include "runtime-light/stdlib/fork/fork-state.h"
-#include "runtime-light/stdlib/rpc/rpc-client-state.h"
 #include "runtime-light/stdlib/time/time-functions.h"
 #include "runtime-light/streams/read-ext.h"
 #include "runtime-light/streams/stream.h"
@@ -221,26 +219,6 @@ kphp::coro::task<> InstanceState::run_instance_epilogue() noexcept {
   }
   shutdown_state_ = shutdown_state::finished;
 
-  /*
-   * Unlike regular RPC requests whose results the user code waits for via rpc_fetch_responses,
-   * thereby guaranteeing they are sent, the user code does not wait for requests sent with the
-   * ignore_answer flag. Therefore, we can’t guarantee that the coroutines responsible for
-   * sending ignore_answer requests have finished. This means the requests might not be sent
-   * if the instance terminates.
-   *
-   * This await suspends the current coroutine until all pending ignore_answer requests are
-   * fully sent. While suspended, other forks and coroutines may continue running.
-   *
-   * After this call completes, delivery of all ignore_answer requests is guaranteed.
-   */
-  {
-    auto& rpc_client_instance_st{RpcClientInstanceState::get()};
-    auto ignore_answer_request_await_set{std::exchange(rpc_client_instance_st.ignore_answer_request_awaiter_tasks, kphp::coro::await_set<void>{})};
-    while (!ignore_answer_request_await_set.empty()) {
-      co_await ignore_answer_request_await_set.next();
-    }
-  }
-
   // Stop session with internal Web component
   if (auto& web_state{WebInstanceState::get()}; web_state.session.has_value()) {
     web_state.session_is_finished = true;