pw_rpc: Return BaseServerWriter::Finish() status
- Return the status of the Channel::Send() call in
BaseServerWriter::Finish().
- Assert if BaseServerWriter::AcquirePayloadBuffer() is called on a
closed server writer. This is an internal function and calling it on a
closed writer would be bug.
Change-Id: I8f10a3a400d3c3893057424e3675e8f4522cbda9
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/33126
Reviewed-by: Alexei Frolov <frolv@google.com>
Commit-Queue: Wyatt Hepler <hepler@google.com>
diff --git a/pw_rpc/base_server_writer.cc b/pw_rpc/base_server_writer.cc
index 478c67a..9d4423d 100644
--- a/pw_rpc/base_server_writer.cc
+++ b/pw_rpc/base_server_writer.cc
@@ -14,6 +14,7 @@
#include "pw_rpc/internal/base_server_writer.h"
+#include "pw_assert/assert.h"
#include "pw_rpc/internal/method.h"
#include "pw_rpc/internal/packet.h"
#include "pw_rpc/internal/server.h"
@@ -45,9 +46,9 @@
uint32_t BaseServerWriter::method_id() const { return call_.method().id(); }
-void BaseServerWriter::Finish(Status status) {
+Status BaseServerWriter::Finish(Status status) {
if (!open()) {
- return;
+ return Status::FailedPrecondition();
}
// If the ServerWriter implementer or user forgets to release an acquired
@@ -59,18 +60,16 @@
Close();
// Send a control packet indicating that the stream (and RPC) has terminated.
- call_.channel().Send(Packet(PacketType::SERVER_STREAM_END,
- call_.channel().id(),
- call_.service().id(),
- method().id(),
- {},
- status));
+ return call_.channel().Send(Packet(PacketType::SERVER_STREAM_END,
+ call_.channel().id(),
+ call_.service().id(),
+ method().id(),
+ {},
+ status));
}
std::span<std::byte> BaseServerWriter::AcquirePayloadBuffer() {
- if (!open()) {
- return {};
- }
+ PW_DCHECK(open());
// Only allow having one active buffer at a time.
if (response_.empty()) {
@@ -82,17 +81,12 @@
Status BaseServerWriter::ReleasePayloadBuffer(
std::span<const std::byte> payload) {
- if (!open()) {
- return Status::FailedPrecondition();
- }
+ PW_DCHECK(open());
return call_.channel().Send(response_, ResponsePacket(payload));
}
Status BaseServerWriter::ReleasePayloadBuffer() {
- if (!open()) {
- return Status::FailedPrecondition();
- }
-
+ PW_DCHECK(open());
call_.channel().Release(response_);
return OkStatus();
}