commit 59f3d43da108a52d48830962aaa5b2876afd6881
author Carlos Chinchilla <cachinchilla@google.com> Wed Sep 22 10:05:13 2021 -0700
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 22 18:16:27 2021 +0000
tree 0e4aa03680d84863c73f20bd87c9afbaaf5e367c
parent af501dad26890a7828e99d299e517dcd963fcf17

pw_log & pw_log_rpc: Rename proto service name

- Remove redundant "Service" word from proto service name.
- Properly update the packed messages count used in dropped message
  count.
- Replace server writer deprecated open() with active().

No-Docs-Update-Reason: Fixed intended behavior.
Change-Id: I045ed50ce2f823909ff555881acc3ecbea3e8d3f
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/61920
Pigweed-Auto-Submit: Carlos Chinchilla <cachinchilla@google.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>

pw_log/log.proto

diff --git a/pw_log/log.proto b/pw_log/log.proto
index 60aae87..988f34a 100644
--- a/pw_log/log.proto
+++ b/pw_log/log.proto
@@ -175,6 +175,6 @@
 }
 
 // RPC service for accessing logs.
-service LogService {
+service Logs {
   rpc Listen(LogRequest) returns (stream LogEntries);
 }

pw_log_rpc/public/pw_log_rpc/log_service.h

diff --git a/pw_log_rpc/public/pw_log_rpc/log_service.h b/pw_log_rpc/public/pw_log_rpc/log_service.h
index 3cc648b..bd341d1 100644
--- a/pw_log_rpc/public/pw_log_rpc/log_service.h
+++ b/pw_log_rpc/public/pw_log_rpc/log_service.h
@@ -22,7 +22,7 @@
 // The RPC LogService provides a way to start a log stream on a known RPC
 // channel with a writer provided on a call. Log streams maintenance is flexible
 // and delegated outside the service.
-class LogService final : public log::generated::LogService<LogService> {
+class LogService final : public log::generated::Logs<LogService> {
  public:
   LogService(RpcLogDrainMap& drains) : drains_(drains) {}
 

pw_log_rpc/public/pw_log_rpc/rpc_log_drain.h

diff --git a/pw_log_rpc/public/pw_log_rpc/rpc_log_drain.h b/pw_log_rpc/public/pw_log_rpc/rpc_log_drain.h
index 93d5358..cc12014 100644
--- a/pw_log_rpc/public/pw_log_rpc/rpc_log_drain.h
+++ b/pw_log_rpc/public/pw_log_rpc/rpc_log_drain.h
@@ -91,7 +91,7 @@
         committed_entry_drop_count_(0),
         mutex_(mutex) {
     PW_ASSERT(log_entry_buffer.size_bytes() >= kMinEntryBufferSize);
-    PW_ASSERT(writer.open());
+    PW_ASSERT(writer.active());
   }
 
   // Creates a closed log stream with a writer that can be set at a later time.
@@ -157,7 +157,7 @@
 
   // Fills the outgoing buffer with as many entries as possible.
   LogDrainState EncodeOutgoingPacket(log::LogEntries::MemoryEncoder& encoder,
-                                     uint32_t packed_entry_count_out)
+                                     uint32_t& packed_entry_count_out)
       PW_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
   const uint32_t channel_id_;

pw_log_rpc/rpc_log_drain.cc

diff --git a/pw_log_rpc/rpc_log_drain.cc b/pw_log_rpc/rpc_log_drain.cc
index 6c21286..3759162 100644
--- a/pw_log_rpc/rpc_log_drain.cc
+++ b/pw_log_rpc/rpc_log_drain.cc
@@ -45,11 +45,11 @@
 }  // namespace
 
 Status RpcLogDrain::Open(rpc::RawServerWriter& writer) {
-  if (!writer.open()) {
+  if (!writer.active()) {
     return Status::FailedPrecondition();
   }
   std::lock_guard lock(mutex_);
-  if (server_writer_.open()) {
+  if (server_writer_.active()) {
     return Status::AlreadyExists();
   }
   server_writer_ = std::move(writer);
@@ -62,7 +62,7 @@
   LogDrainState log_sink_state = LogDrainState::kMoreEntriesRemaining;
   std::lock_guard lock(mutex_);
   do {
-    if (!server_writer_.open()) {
+    if (!server_writer_.active()) {
       return Status::Unavailable();
     }
     log::LogEntries::MemoryEncoder encoder(server_writer_.PayloadBuffer());
@@ -80,7 +80,7 @@
 }
 
 RpcLogDrain::LogDrainState RpcLogDrain::EncodeOutgoingPacket(
-    log::LogEntries::MemoryEncoder& encoder, uint32_t packed_entry_count_out) {
+    log::LogEntries::MemoryEncoder& encoder, uint32_t& packed_entry_count_out) {
   const size_t total_buffer_size = encoder.ConservativeWriteLimit();
   do {
     // Get entry and drop count from drain.