From b3d9a930ca8a816d43b26b80f789ed1218c3b59b Mon Sep 17 00:00:00 2001 From: Guogang Li Date: Thu, 24 Jul 2025 13:36:05 -0700 Subject: [PATCH] Change time function to elapsed time from SystemClock PiperOrigin-RevId: 786819481 --- .../mediums/ble_v2/instant_on_lost_manager.cc | 5 ++- connections/implementation/payload_manager.cc | 33 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/connections/implementation/mediums/ble_v2/instant_on_lost_manager.cc b/connections/implementation/mediums/ble_v2/instant_on_lost_manager.cc index 4f9978eb..6dea81b9 100644 --- a/connections/implementation/mediums/ble_v2/instant_on_lost_manager.cc +++ b/connections/implementation/mediums/ble_v2/instant_on_lost_manager.cc @@ -22,7 +22,6 @@ #include "absl/functional/any_invocable.h" #include "absl/strings/escaping.h" #include "absl/strings/string_view.h" -#include "absl/time/clock.h" #include "absl/time/time.h" #include "connections/implementation/flags/nearby_connections_feature_flags.h" #include "connections/implementation/mediums/ble_v2/ble_utils.h" @@ -112,7 +111,7 @@ void InstantOnLostManager::OnAdvertisingStopped(const std::string& service_id) { } active_on_lost_advertising_list_.push_back( - {absl::Now(), std::string(advertisement_hash)}); + {SystemClock::ElapsedRealtime(), std::string(advertisement_hash)}); if (!StartInstantOnLostAdvertisement()) { LOG(ERROR) << __func__ << ": Failed to advertise instant onLost BLE."; @@ -277,7 +276,7 @@ bool InstantOnLostManager::StopOnLostAdvertising() { } void InstantOnLostManager::RemoveExpiredOnLostAdvertisements() { - absl::Time now = absl::Now(); + absl::Time now = SystemClock::ElapsedRealtime(); auto it = active_on_lost_advertising_list_.begin(); while (it != active_on_lost_advertising_list_.end()) { if ((now - it->start_time) >= kInstantOnLostAdvertiseDuration) { diff --git a/connections/implementation/payload_manager.cc b/connections/implementation/payload_manager.cc index 6e507a20..959382a9 100644 --- a/connections/implementation/payload_manager.cc +++ b/connections/implementation/payload_manager.cc @@ -28,7 +28,6 @@ #include "absl/functional/bind_front.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include "absl/time/clock.h" #include "absl/time/time.h" #include "connections/implementation/analytics/packet_meta_data.h" #include "connections/implementation/analytics/throughput_recorder.h" @@ -50,6 +49,7 @@ #include "internal/platform/exception.h" #include "internal/platform/expected.h" #include "internal/platform/feature_flags.h" +#include "internal/platform/implementation/system_clock.h" #include "internal/platform/logging.h" #include "internal/platform/mutex_lock.h" #include "internal/platform/single_thread_executor.h" @@ -131,9 +131,9 @@ bool PayloadManager::SendPayloadLoop( PayloadStatus::LOCAL_ERROR); return false; } - VLOG(1) << "PayloadManager successfully skipped " - << real_offset.GetResult() << " bytes on payload_id " - << pending_payload.GetInternalPayload()->GetId(); + VLOG(1) << "PayloadManager successfully skipped " << real_offset.GetResult() + << " bytes on payload_id " + << pending_payload.GetInternalPayload()->GetId(); next_chunk_offset = real_offset.GetResult(); } for (const auto& endpoint_id : available_endpoint_ids) { @@ -200,8 +200,8 @@ bool PayloadManager::SendPayloadLoop( } } VLOG(1) << "PayloadManager done sending chunk at offset " - << next_chunk_offset << " of payload_id=" - << pending_payload.GetInternalPayload()->GetId(); + << next_chunk_offset << " of payload_id=" + << pending_payload.GetInternalPayload()->GetId(); next_chunk_offset += next_chunk_size; if (!next_chunk_size) { @@ -1158,7 +1158,7 @@ void PayloadManager::HandleSuccessfulOutgoingChunk( return; } - absl::Time current_time = absl::Now(); + absl::Time current_time = SystemClock::ElapsedRealtime(); if (!is_last_chunk && payload_chunk_offset != 0 && current_time - last_outgoing_chunk_update_time_ < kMinTransferUpdateInterval) { @@ -1256,7 +1256,7 @@ void PayloadManager::HandleSuccessfulIncomingChunk( return; } - absl::Time current_time = absl::Now(); + absl::Time current_time = SystemClock::ElapsedRealtime(); if (!is_last_chunk && payload_chunk_offset != 0 && current_time - last_incoming_chunk_update_time_ < kMinTransferUpdateInterval) { @@ -1311,9 +1311,8 @@ void PayloadManager::ProcessDataPacket( PayloadTransferFrame::PayloadChunk& payload_chunk = *payload_transfer_frame.mutable_payload_chunk(); VLOG(1) << "PayloadManager got data OfflineFrame for payload_id=" - << payload_header.id() - << " from endpoint_id=" << from_endpoint_id << " at offset " - << payload_chunk.offset(); + << payload_header.id() << " from endpoint_id=" << from_endpoint_id + << " at offset " << payload_chunk.offset(); // We explicitly deny payloads with ID 0. if (payload_header.id() == 0) { LOG(WARNING) << "Denying payload with ID 0 for endpoint_id=" @@ -1485,11 +1484,11 @@ void PayloadManager::ProcessControlPacket( pending_payload->SetEndpointStatusFromControlMessage(from_endpoint_id, control_message); } - VLOG(1) - << "Marked " - << (pending_payload->IsIncoming() ? "incoming" : "outgoing") - << " payload_id=" << pending_payload->GetInternalPayload()->GetId() - << " as canceled at request of endpoint_id=" << from_endpoint_id; + VLOG(1) << "Marked " + << (pending_payload->IsIncoming() ? "incoming" : "outgoing") + << " payload_id=" + << pending_payload->GetInternalPayload()->GetId() + << " as canceled at request of endpoint_id=" << from_endpoint_id; break; case PayloadTransferFrame::ControlMessage::PAYLOAD_ERROR: if (pending_payload->IsIncoming()) { @@ -1606,7 +1605,7 @@ void PayloadManager::EndpointInfo::SetStatusFromControlMessage( const PayloadTransferFrame::ControlMessage& control_message) { status.Set(ControlMessageEventToEndpointInfoStatus(control_message.event())); VLOG(1) << "Marked endpoint " << id << " with status " - << ToString(status.Get()) << " based on OOB ControlMessage"; + << ToString(status.Get()) << " based on OOB ControlMessage"; } void PayloadManager::EndpointInfo::MarkReceivedAckFromEndpoint() {