DriftingOscillatorBase: Renamed currentTickLength to oldCurrentTickLength.

Author: levy

src/inet/clock/base/DriftingOscillatorBase.cc

@@ -75,15 +75,15 @@ void DriftingOscillatorBase::setDriftRate(ppm newDriftRate)
         emit(preOscillatorStateChangedSignal, this);
         simtime_t currentSimTime = simTime();
         EV_INFO << "Setting oscillator drift rate from " << driftRate << " to " << newDriftRate << " at simtime " << currentSimTime << ".\n";
-        simtime_t currentTickLength = getCurrentTickLength();
-        simtime_t baseTickTime = origin + nextTickFromOrigin - currentTickLength;
-        simtime_t elapsedTickTime = fmod(currentSimTime - baseTickTime, currentTickLength);
         if (elapsedTickTime == SIMTIME_ZERO)
             nextTickFromOrigin = 0;
         else {
             int64_t v = increaseWithDriftRate(currentTickLength.raw() - elapsedTickTime.raw());
             nextTickFromOrigin = SimTime::fromRaw(decreaseWithDriftRate(v, newInverseDriftRate));
         }
+        simtime_t oldCurrentTickLength = getCurrentTickLength();
+        simtime_t baseTickTime = origin + nextTickFromOrigin - oldCurrentTickLength;
+        simtime_t elapsedTickTime = fmod(currentSimTime - baseTickTime, oldCurrentTickLength);
         SimTimeScale newDriftFactor = SimTimeScale::fromPpm(newDriftRate.get<ppm>());
         driftRate = newDriftRate;
         setDriftFactor(newDriftFactor);