From 255c2672ea0758ced4359c6ff085feac6de1ec05 Mon Sep 17 00:00:00 2001 From: hai007 Date: Tue, 13 Dec 2022 15:10:10 -0800 Subject: [PATCH] Internal cleanup. PiperOrigin-RevId: 495138142 --- connections/implementation/endpoint_manager.cc | 2 +- connections/implementation/endpoint_manager.h | 13 ++++++------- connections/implementation/payload_manager.cc | 14 ++++++++------ connections/implementation/payload_manager.h | 6 ++++-- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/connections/implementation/endpoint_manager.cc b/connections/implementation/endpoint_manager.cc index 298cf8b0..70e25ba7 100644 --- a/connections/implementation/endpoint_manager.cc +++ b/connections/implementation/endpoint_manager.cc @@ -49,7 +49,7 @@ class EndpointManager::LockedFrameProcessor { frame_processor_with_mutex_{fp} {} // Constructor of a no-op object. - LockedFrameProcessor() {} + LockedFrameProcessor() = default; explicit operator bool() const { return get() != nullptr; } diff --git a/connections/implementation/endpoint_manager.h b/connections/implementation/endpoint_manager.h index c876493f..dd127d73 100644 --- a/connections/implementation/endpoint_manager.h +++ b/connections/implementation/endpoint_manager.h @@ -74,11 +74,10 @@ class EndpointManager { // To achieve that, OfflineFrame needs to be either mutabe lvalue reference, // or rvalue reference. Rvalue references are discouraged by go/cstyle, // and that leaves us with mutable lvalue reference. - virtual void OnIncomingFrame(OfflineFrame& offline_frame, - const std::string& from_endpoint_id, - ClientProxy* to_client, - proto::connections::Medium current_medium, - PacketMetaData& packet_meta_data) = 0; + virtual void OnIncomingFrame( + OfflineFrame& offline_frame, const std::string& from_endpoint_id, + ClientProxy* to_client, proto::connections::Medium current_medium, + analytics::PacketMetaData& packet_meta_data) = 0; // Implementations must call barrier.CountDown() once // they're done. This parallelizes the disconnection event across all frame @@ -127,7 +126,7 @@ class EndpointManager { const PayloadTransferFrame::PayloadHeader& payload_header, const PayloadTransferFrame::PayloadChunk& payload_chunk, const std::vector& endpoint_ids, - PacketMetaData& packet_meta_data); + analytics::PacketMetaData& packet_meta_data); std::vector SendControlMessage( const PayloadTransferFrame::PayloadHeader& payload_header, const PayloadTransferFrame::ControlMessage& control_message, @@ -264,7 +263,7 @@ class EndpointManager { const std::vector& endpoint_ids, const ByteArray& payload_transfer_frame_bytes, std::int64_t payload_id, std::int64_t offset, const std::string& packet_type, - PacketMetaData& packet_meta_data); + analytics::PacketMetaData& packet_meta_data); // Executes all jobs sequentially, on a serial_executor_. void RunOnEndpointManagerThread(const std::string& name, Runnable runnable); diff --git a/connections/implementation/payload_manager.cc b/connections/implementation/payload_manager.cc index cbb9a3c1..8532d205 100644 --- a/connections/implementation/payload_manager.cc +++ b/connections/implementation/payload_manager.cc @@ -15,10 +15,12 @@ #include "connections/implementation/payload_manager.h" #include +#include #include #include #include #include +#include #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" @@ -40,7 +42,7 @@ using ::location::nearby::connections::PayloadDirection; // C++14 requires to declare this. // TODO(apolyudov): remove when migration to c++17 is possible. -constexpr const absl::Duration PayloadManager::kWaitCloseTimeout; +constexpr absl::Duration PayloadManager::kWaitCloseTimeout; bool PayloadManager::SendPayloadLoop( ClientProxy* client, PendingPayload& pending_payload, @@ -646,8 +648,8 @@ PayloadTransferFrame::PayloadHeader PayloadManager::CreatePayloadHeader( payload_header.set_id(internal_payload.GetId()); payload_header.set_type(internal_payload.GetType()); if (internal_payload.GetType() == - location::nearby::connections::PayloadTransferFrame::PayloadHeader:: - PayloadType::PayloadTransferFrame_PayloadHeader_PayloadType_FILE) { + location::nearby::connections::PayloadTransferFrame:: + PayloadTransferFrame::PayloadHeader::FILE) { payload_header.set_file_name(file_name); payload_header.set_parent_folder(parent_folder); } @@ -1182,11 +1184,11 @@ void PayloadManager::RecordInvalidPayloadAnalytics( PayloadType PayloadManager::FramePayloadTypeToPayloadType( PayloadTransferFrame::PayloadHeader::PayloadType type) { switch (type) { - case PayloadTransferFrame_PayloadHeader_PayloadType_BYTES: + case PayloadTransferFrame::PayloadHeader::BYTES: return connections::PayloadType::kBytes; - case PayloadTransferFrame_PayloadHeader_PayloadType_FILE: + case PayloadTransferFrame::PayloadHeader::FILE: return connections::PayloadType::kFile; - case PayloadTransferFrame_PayloadHeader_PayloadType_STREAM: + case PayloadTransferFrame::PayloadHeader::STREAM: return connections::PayloadType::kStream; default: return connections::PayloadType::kUnknown; diff --git a/connections/implementation/payload_manager.h b/connections/implementation/payload_manager.h index acbd8656..27441e44 100644 --- a/connections/implementation/payload_manager.h +++ b/connections/implementation/payload_manager.h @@ -23,6 +23,7 @@ #include #include "absl/container/flat_hash_map.h" +#include "connections/implementation/analytics/packet_meta_data.h" #include "connections/implementation/client_proxy.h" #include "connections/implementation/endpoint_manager.h" #include "connections/implementation/internal_payload.h" @@ -62,7 +63,7 @@ class PayloadManager : public EndpointManager::FrameProcessor { const std::string& from_endpoint_id, ClientProxy* to_client, proto::connections::Medium current_medium, - PacketMetaData& packet_meta_data) override; + analytics::PacketMetaData& packet_meta_data) override; // @EndpointManagerThread void OnEndpointDisconnect(ClientProxy* client, const std::string& service_id, @@ -274,7 +275,8 @@ class PayloadManager : public EndpointManager::FrameProcessor { void ProcessDataPacket(ClientProxy* to_client, const std::string& from_endpoint_id, PayloadTransferFrame& payload_transfer_frame, - Medium medium, PacketMetaData& packet_meta_data); + Medium medium, + analytics::PacketMetaData& packet_meta_data); void ProcessControlPacket(ClientProxy* to_client, const std::string& from_endpoint_id, PayloadTransferFrame& payload_transfer_frame);