diff options
Diffstat (limited to 'pw_log_rpc/rpc_log_drain.cc')
| -rw-r--r-- | pw_log_rpc/rpc_log_drain.cc | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pw_log_rpc/rpc_log_drain.cc b/pw_log_rpc/rpc_log_drain.cc index fe12ba0c8..68294f9a5 100644 --- a/pw_log_rpc/rpc_log_drain.cc +++ b/pw_log_rpc/rpc_log_drain.cc @@ -17,7 +17,6 @@ #include <limits> #include <mutex> #include <optional> -#include <span> #include <string_view> #include "pw_assert/check.h" @@ -25,6 +24,7 @@ #include "pw_log/proto/log.pwpb.h" #include "pw_result/result.h" #include "pw_rpc/raw/server_reader_writer.h" +#include "pw_span/span.h" #include "pw_status/status.h" #include "pw_status/try.h" @@ -33,14 +33,15 @@ namespace { // Creates an encoded drop message on the provided buffer and adds it to the // bulk log entries. Resets the drop count when successfull. -void TryEncodeDropMessage(ByteSpan encoded_drop_message_buffer, - std::string_view reason, - uint32_t& drop_count, - log::LogEntries::MemoryEncoder& entries_encoder) { +void TryEncodeDropMessage( + ByteSpan encoded_drop_message_buffer, + std::string_view reason, + uint32_t& drop_count, + log::pwpb::LogEntries::MemoryEncoder& entries_encoder) { // Encode drop count and reason, if any, in log proto. - log::LogEntry::MemoryEncoder encoder(encoded_drop_message_buffer); + log::pwpb::LogEntry::MemoryEncoder encoder(encoded_drop_message_buffer); if (!reason.empty()) { - encoder.WriteMessage(std::as_bytes(std::span(reason))).IgnoreError(); + encoder.WriteMessage(as_bytes(span<const char>(reason))).IgnoreError(); } encoder.WriteDropped(drop_count).IgnoreError(); if (!encoder.status().ok()) { @@ -51,7 +52,8 @@ void TryEncodeDropMessage(ByteSpan encoded_drop_message_buffer, if (drop_message.size() + RpcLogDrain::kLogEntriesEncodeFrameSize < entries_encoder.ConservativeWriteLimit()) { PW_CHECK_OK(entries_encoder.WriteBytes( - static_cast<uint32_t>(log::LogEntries::Fields::ENTRIES), drop_message)); + static_cast<uint32_t>(log::pwpb::LogEntries::Fields::kEntries), + drop_message)); drop_count = 0; } } @@ -113,7 +115,7 @@ RpcLogDrain::LogDrainState RpcLogDrain::SendLogs(size_t max_num_bundles, // No reason to keep polling this drain until the writer is opened. return LogDrainState::kCaughtUp; } - log::LogEntries::MemoryEncoder encoder(encoding_buffer); + log::pwpb::LogEntries::MemoryEncoder encoder(encoding_buffer); uint32_t packed_entry_count = 0; log_sink_state = EncodeOutgoingPacket(encoder, packed_entry_count); @@ -123,7 +125,7 @@ RpcLogDrain::LogDrainState RpcLogDrain::SendLogs(size_t max_num_bundles, } encoder.WriteFirstEntrySequenceId(sequence_id_) - .IgnoreError(); // TODO(pwbug/387): Handle Status properly + .IgnoreError(); // TODO(b/242598609): Handle Status properly sequence_id_ += packed_entry_count; const Status status = server_writer_.Write(encoder); sent_bundle_count++; @@ -141,7 +143,8 @@ RpcLogDrain::LogDrainState RpcLogDrain::SendLogs(size_t max_num_bundles, } RpcLogDrain::LogDrainState RpcLogDrain::EncodeOutgoingPacket( - log::LogEntries::MemoryEncoder& encoder, uint32_t& packed_entry_count_out) { + log::pwpb::LogEntries::MemoryEncoder& encoder, + uint32_t& packed_entry_count_out) { const size_t total_buffer_size = encoder.ConservativeWriteLimit(); do { // Peek entry and get drop count from multisink. @@ -245,7 +248,7 @@ RpcLogDrain::LogDrainState RpcLogDrain::EncodeOutgoingPacket( // Encode the entry and remove it from multisink. PW_CHECK_OK(encoder.WriteBytes( - static_cast<uint32_t>(log::LogEntries::Fields::ENTRIES), + static_cast<uint32_t>(log::pwpb::LogEntries::Fields::kEntries), possible_entry.value().entry())); PW_CHECK_OK(PopEntry(possible_entry.value())); ++packed_entry_count_out; |