diff --git a/src/core/model/default-simulator-impl.cc b/src/core/model/default-simulator-impl.cc index 8b182b951..039b01471 100644 --- a/src/core/model/default-simulator-impl.cc +++ b/src/core/model/default-simulator-impl.cc @@ -283,15 +283,7 @@ DefaultSimulatorImpl::ScheduleNow (EventImpl *event) { NS_ASSERT_MSG (SystemThread::Equals (m_main), "Simulator::ScheduleNow Thread-unsafe invocation!"); - Scheduler::Event ev; - ev.impl = event; - ev.key.m_ts = m_currentTs; - ev.key.m_context = GetContext (); - ev.key.m_uid = m_uid; - m_uid++; - m_unscheduledEvents++; - m_events->Insert (ev); - return EventId (event, ev.key.m_ts, ev.key.m_context, ev.key.m_uid); + return Schedule (Time (0), event); } EventId diff --git a/src/core/model/realtime-simulator-impl.cc b/src/core/model/realtime-simulator-impl.cc index 7d098ebd5..dd7d17289 100644 --- a/src/core/model/realtime-simulator-impl.cc +++ b/src/core/model/realtime-simulator-impl.cc @@ -579,21 +579,7 @@ EventId RealtimeSimulatorImpl::ScheduleNow (EventImpl *impl) { NS_LOG_FUNCTION (this << impl); - Scheduler::Event ev; - { - CriticalSection cs (m_mutex); - - ev.impl = impl; - ev.key.m_ts = m_currentTs; - ev.key.m_context = GetContext (); - ev.key.m_uid = m_uid; - m_uid++; - m_unscheduledEvents++; - m_events->Insert (ev); - m_synchronizer->Signal (); - } - - return EventId (impl, ev.key.m_ts, ev.key.m_context, ev.key.m_uid); + return Schedule (Time (0), impl); } Time diff --git a/src/mpi/model/distributed-simulator-impl.cc b/src/mpi/model/distributed-simulator-impl.cc index 1a3822f5e..ee4fef83f 100644 --- a/src/mpi/model/distributed-simulator-impl.cc +++ b/src/mpi/model/distributed-simulator-impl.cc @@ -508,16 +508,7 @@ EventId DistributedSimulatorImpl::ScheduleNow (EventImpl *event) { NS_LOG_FUNCTION (this << event); - - Scheduler::Event ev; - ev.impl = event; - ev.key.m_ts = m_currentTs; - ev.key.m_context = GetContext (); - ev.key.m_uid = m_uid; - m_uid++; - m_unscheduledEvents++; - m_events->Insert (ev); - return EventId (event, ev.key.m_ts, ev.key.m_context, ev.key.m_uid); + return Schedule (Time (0), event); } EventId diff --git a/src/mpi/model/null-message-simulator-impl.cc b/src/mpi/model/null-message-simulator-impl.cc index 068a12812..bfb35c208 100644 --- a/src/mpi/model/null-message-simulator-impl.cc +++ b/src/mpi/model/null-message-simulator-impl.cc @@ -438,16 +438,7 @@ EventId NullMessageSimulatorImpl::ScheduleNow (EventImpl *event) { NS_LOG_FUNCTION (this << event); - - Scheduler::Event ev; - ev.impl = event; - ev.key.m_ts = m_currentTs; - ev.key.m_context = GetContext (); - ev.key.m_uid = m_uid; - m_uid++; - m_unscheduledEvents++; - m_events->Insert (ev); - return EventId (event, ev.key.m_ts, ev.key.m_context, ev.key.m_uid); + return Schedule (Time (0), event); } EventId