No public description

ffi_utils/BUILD

@@ -44,7 +44,10 @@ rust_library(
 rust_cxx_bridge(
     name = "status_cxx",
     src = "status.rs",
-    deps = [":status_cc"],
+    deps = [
+        ":status_cc",
+        "@abseil-cpp//absl/status",
+    ],
 )
 
 rust_test(
@@ -60,6 +63,7 @@ cc_library(
     srcs = ["status.cc"],
     hdrs = ["status.h"],
     deps = [
+        ":cxx_utils",
         ":status_cxx/include",
         "@abseil-cpp//absl/status",
         "@abseil-cpp//absl/strings:string_view",

ffi_utils/status.cc

@@ -16,39 +16,59 @@
 
 #include <cstdint>
 #include <memory>
-#include <string>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
+#include "ffi_utils/cxx_utils.h"
 #include "ffi_utils/status.rs.h"
 #include "include/cxx.h"
 
 namespace secure_aggregation {
 
-FfiStatus MakeFfiStatus() { return FfiStatus{.code = 0, .message = nullptr}; }
+FfiStatus MakeFfiStatus() { return FfiStatus{nullptr}; }
+
 FfiStatus MakeFfiStatus(absl::Status status) {
-  return FfiStatus{static_cast<int>(status.code()),
-                   std::make_unique<std::string>(status.message())};
+  if (status.ok()) {
+    return MakeFfiStatus();
+  }
+  return FfiStatus{std::make_unique<absl::Status>(std::move(status))};
 }
-FfiStatus MakeFfiStatus(int code, std::string message) {
-  return FfiStatus{code, std::make_unique<std::string>(std::move(message))};
+
+FfiStatus MakeFfiStatus(int32_t code, rust::Slice<const uint8_t> message) {
+  return MakeFfiStatus(absl::Status(static_cast<absl::StatusCode>(code),
+                                    ToAbslStringView(message)));
 }
 
-absl::Status UnwrapFfiStatus(const FfiStatus& status) {
-  if (status.code == 0) {
+FfiStatus CloneFfiStatus(const FfiStatus& status) {
+  if (status.ptr == nullptr) {
+    return MakeFfiStatus();
+  }
+  return MakeFfiStatus(*status.ptr);
+}
+
+absl::Status UnwrapFfiStatus(FfiStatus status) {
+  if (status.ptr == nullptr) {
     return absl::OkStatus();
   }
-  absl::string_view message = "";
-  if (status.message != nullptr || status.message->empty()) {
-    message = *status.message;
+  absl::Status out = std::move(*status.ptr);
+  return out;
+}
+
+int32_t FfiStatusCode(const FfiStatus& status) {
+  if (status.ptr == nullptr) {
+    return 0;
   }
-  return absl::Status(static_cast<absl::StatusCode>(status.code), message);
+  return static_cast<int32_t>(status.ptr->code());
 }
 
-FfiStatus MakeFfiStatus(int32_t code, rust::Slice<const uint8_t> message) {
-  return secure_aggregation::MakeFfiStatus(
-      code, std::string(message.begin(), message.end()));
+rust::Slice<const uint8_t> FfiStatusMessage(const FfiStatus& status) {
+  if (status.ptr == nullptr) {
+    return rust::Slice<const uint8_t>();
+  }
+  return rust::Slice<const uint8_t>(
+      reinterpret_cast<const uint8_t*>(status.ptr->message().data()),
+      status.ptr->message().size());
 }
 
 }  // namespace secure_aggregation

ffi_utils/status.h

@@ -27,12 +27,14 @@ struct FfiStatus;
 
 FfiStatus MakeFfiStatus();
 FfiStatus MakeFfiStatus(absl::Status status);
-FfiStatus MakeFfiStatus(int code, std::string message);
-absl::Status UnwrapFfiStatus(const FfiStatus& status);
-
-// To be called from Rust.
 FfiStatus MakeFfiStatus(int32_t code, rust::Slice<const uint8_t> message);
 
+FfiStatus CloneFfiStatus(const FfiStatus& status);
+
+absl::Status UnwrapFfiStatus(FfiStatus status);
+int32_t FfiStatusCode(const FfiStatus& status);
+rust::Slice<const uint8_t> FfiStatusMessage(const FfiStatus& status);
+
 }  // namespace secure_aggregation
 
 #endif  // SECURE_AGGREGATION_FFI_UTILS_STATUS_H_