From 0e30cf3979e60da7624305eb8987fa723d4a674f Mon Sep 17 00:00:00 2001 From: Alberto Gallegos Ramonet Date: Tue, 8 Apr 2025 17:33:17 +0900 Subject: [PATCH] core: Revert realTime simulator change in to avoid time advances during an event execution --- CHANGES.md | 1 - RELEASE_NOTES.md | 2 -- src/core/model/realtime-simulator-impl.cc | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 64d9fa1c7..1518d0c13 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -28,7 +28,6 @@ This file is a best-effort approach to solving this issue; we will do our best b ### Changed behavior -* (core) `RealTimeSimulatorImpl::Now` uses real time instead of the time of the last event call. * (zigbee) Adjust pedantic link cost requirement in ``NeighborTable::LookUpForBestParent``, a minimum link cost of 3 is not required now. ## Changes from ns-3.43 to ns-3.44 diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 432e274aa..21b544574 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -32,8 +32,6 @@ The required Doxygen version for documentation generation is now version 1.13. ### New user-visible features -- (core ) !2385 - The function `Now()` will now print the real time since the beginning of the simulation instead of the real time since the last event call when `RealTimeSimulatorImpl` is used. - ### Bugs fixed - (wifi) #2368 - Fix various issues related to Content Channels and RU allocation. Fixes mostly covers cases where OFDMA is used with central 26 tones, where a single user is being assigned the whole PPDU bandwidth or where a RU is larger than 20 MHz. diff --git a/src/core/model/realtime-simulator-impl.cc b/src/core/model/realtime-simulator-impl.cc index 96d2cad26..bbaea2c9d 100644 --- a/src/core/model/realtime-simulator-impl.cc +++ b/src/core/model/realtime-simulator-impl.cc @@ -573,7 +573,7 @@ RealtimeSimulatorImpl::ScheduleNow(EventImpl* impl) Time RealtimeSimulatorImpl::Now() const { - return TimeStep(m_running ? m_synchronizer->GetCurrentRealtime() : m_currentTs); + return TimeStep(m_currentTs); } //