pw_rpc: Rename BaseServerWriter to Responder
The pw::rpc::internal::Responder class will be used to respond to all
types of RPCs, not just server streaming RPCs, so the name
"BaseServerWriter" is not a good fit.
Change-Id: I72d1475f26896c76f0b0dd968b0aca65d0c618a4
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/49200
Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com>
Reviewed-by: Alexei Frolov <frolv@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
diff --git a/pw_rpc/base_server_writer.cc b/pw_rpc/base_server_writer.cc
index 64d73bc..d1a51b7 100644
--- a/pw_rpc/base_server_writer.cc
+++ b/pw_rpc/base_server_writer.cc
@@ -21,21 +21,20 @@
namespace pw::rpc::internal {
-BaseServerWriter::BaseServerWriter(ServerCall& call)
- : call_(call), state_(kOpen) {
- call_.server().RegisterWriter(*this);
+Responder::Responder(ServerCall& call) : call_(call), state_(kOpen) {
+ call_.server().RegisterResponder(*this);
}
-BaseServerWriter& BaseServerWriter::operator=(BaseServerWriter&& other) {
+Responder& Responder::operator=(Responder&& other) {
Finish();
state_ = other.state_;
if (other.open()) {
- other.call_.server().RemoveWriter(other);
+ other.call_.server().RemoveResponder(other);
other.state_ = kClosed;
- other.call_.server().RegisterWriter(*this);
+ other.call_.server().RegisterResponder(*this);
}
call_ = std::move(other.call_);
@@ -44,14 +43,14 @@
return *this;
}
-uint32_t BaseServerWriter::method_id() const { return call_.method().id(); }
+uint32_t Responder::method_id() const { return call_.method().id(); }
-Status BaseServerWriter::Finish(Status status) {
+Status Responder::Finish(Status status) {
if (!open()) {
return Status::FailedPrecondition();
}
- // If the ServerWriter implementer or user forgets to release an acquired
+ // If the Responder implementer or user forgets to release an acquired
// buffer before finishing, release it here.
if (!response_.empty()) {
ReleasePayloadBuffer();
@@ -68,7 +67,7 @@
status));
}
-std::span<std::byte> BaseServerWriter::AcquirePayloadBuffer() {
+std::span<std::byte> Responder::AcquirePayloadBuffer() {
PW_DCHECK(open());
// Only allow having one active buffer at a time.
@@ -79,29 +78,27 @@
return response_.payload(ResponsePacket());
}
-Status BaseServerWriter::ReleasePayloadBuffer(
- std::span<const std::byte> payload) {
+Status Responder::ReleasePayloadBuffer(std::span<const std::byte> payload) {
PW_DCHECK(open());
return call_.channel().Send(response_, ResponsePacket(payload));
}
-Status BaseServerWriter::ReleasePayloadBuffer() {
+Status Responder::ReleasePayloadBuffer() {
PW_DCHECK(open());
call_.channel().Release(response_);
return OkStatus();
}
-void BaseServerWriter::Close() {
+void Responder::Close() {
if (!open()) {
return;
}
- call_.server().RemoveWriter(*this);
+ call_.server().RemoveResponder(*this);
state_ = kClosed;
}
-Packet BaseServerWriter::ResponsePacket(
- std::span<const std::byte> payload) const {
+Packet Responder::ResponsePacket(std::span<const std::byte> payload) const {
return Packet(PacketType::RESPONSE,
call_.channel().id(),
call_.service().id(),