only:unit test time mess

firmware/controllers/engine_cycle/high_pressure_fuel_pump.cpp

@@ -196,7 +196,7 @@ void HpfpController::pinTurnOn(HpfpController *self) {
 	// By scheduling the close after we already open, we don't have to worry if the engine
 	// stops, the valve will be turned off in a certain amount of time regardless.
 	scheduleByAngle(&self->m_event.scheduling,
-			self->m_event.scheduling.momentX,
+			self->m_event.scheduling.getMomentNt(),
 			self->m_deadtime + engineConfiguration->hpfpActivationAngle,
 			{ pinTurnOff, self });
 }

firmware/controllers/system/timer/event_queue.cpp

@@ -84,17 +84,17 @@ bool EventQueue::insertTask(scheduling_s *scheduling, efitick_t timeX, action_s
 	if (scheduling->action) {
 #if EFI_UNIT_TEST
 		if (verboseMode) {
-			printf("Already scheduled was %d\r\n", (int)scheduling->momentX);
+			printf("Already scheduled was %d\r\n", (int)scheduling->getMomentRaw());
 			printf("Already scheduled now %d\r\n", (int)timeX);
 		}
 #endif /* EFI_UNIT_TEST */
 		return false;
 	}
 
-	scheduling->momentX = timeX;
+	scheduling->setMomentX(timeX);
 	scheduling->action = action;
 
-	if (!m_head || timeX < m_head->momentX) {
+	if (!m_head || timeX < m_head->getMomentNt()) {
 		// here we insert into head of the linked list
 		LL_PREPEND2(m_head, scheduling, nextScheduling_s);
 		assertListIsSorted();
@@ -102,7 +102,7 @@ bool EventQueue::insertTask(scheduling_s *scheduling, efitick_t timeX, action_s
 	} else {
 		// here we know we are not in the head of the list, let's find the position - linear search
 		scheduling_s *insertPosition = m_head;
-		while (insertPosition->nextScheduling_s != NULL && insertPosition->nextScheduling_s->momentX < timeX) {
+		while (insertPosition->nextScheduling_s != NULL && insertPosition->nextScheduling_s->getMomentNt() < timeX) {
 			insertPosition = insertPosition->nextScheduling_s;
 		}
 
@@ -168,7 +168,7 @@ void EventQueue::remove(scheduling_s* scheduling) {
  */
 expected<efitick_t> EventQueue::getNextEventTime(efitick_t nowX) const {
 	if (m_head) {
-		if (m_head->momentX <= nowX) {
+		if (m_head->getMomentUs() <= nowX) {
 			/**
 			 * We are here if action timestamp is in the past. We should rarely be here since this 'getNextEventTime()' is
 			 * always invoked by 'scheduleTimerCallback' which is always invoked right after 'executeAllPendingActions' - but still,
@@ -179,7 +179,7 @@ expected<efitick_t> EventQueue::getNextEventTime(efitick_t nowX) const {
 			 */
 			return nowX + m_lateDelay;
 		} else {
-			return m_head->momentX;
+			return m_head->getMomentUs();
 		}
 	}
 
@@ -227,14 +227,14 @@ bool EventQueue::executeOne(efitick_t now) {
 	// resetting the timer and scheduling an new interrupt is greater than just
 	// waiting for the time to arrive.  On current CPUs, this is reasonable to set
 	// around 10 microseconds.
-	if (current->momentX > now + m_lateDelay) {
+	if (current->getMomentNt() > now + m_lateDelay) {
 		return false;
 	}
 
 	// near future - spin wait for the event to happen and avoid the
 	// overhead of rescheduling the timer.
 	// yes, that's a busy wait but that's what we need here
-	while (current->momentX > getTimeNowNt()) {
+	while (current->getMomentNt() > getTimeNowNt()) {
 		UNIT_TEST_BUSY_WAIT_CALLBACK();
 	}
 
@@ -275,7 +275,7 @@ void EventQueue::assertListIsSorted() const {
 	int counter = 0;
 	scheduling_s *current = m_head;
 	while (current != NULL && current->nextScheduling_s != NULL) {
-		efiAssertVoid(ObdCode::CUSTOM_ERR_6623, current->momentX <= current->nextScheduling_s->momentX, "list order");
+		efiAssertVoid(ObdCode::CUSTOM_ERR_6623, current->getMomentNt() <= current->nextScheduling_s->getMomentNt(), "list order");
 		current = current->nextScheduling_s;
 		if (counter++ > 1'000'000'000)
 			criticalError("EventQueue: looks like a loop?!");
@@ -309,7 +309,7 @@ void EventQueue::clear(void) {
 		m_head = x->nextScheduling_s;
 
 		// Reset this element
-		x->momentX = 0;
+		x->setMomentX(0);
 		x->nextScheduling_s = nullptr;
 		x->action = {};
 	}

firmware/controllers/system/timer/scheduler.h

@@ -61,30 +61,41 @@ private:
  */
 #pragma pack(push, 4)
 struct scheduling_s {
+  efitick_t getMomentNt() {
+    return momentX;
+  }
+
 #if EFI_UNIT_TEST
   efitick_t getMomentUs() {
     return momentX;
   }
+
+  efitick_t getMomentRaw() {
+    return momentX;
+  }
 #endif
+  void setMomentX(efitick_t p_moment) {
+    momentX = p_moment;
+  }
 
 #if EFI_SIMULATOR
   // used by signal_executor_sleep executor implementation
 	virtual_timer_t timer;
 #endif /* EFI_SIMULATOR */
 
-	/**
-	 * timestamp represented as 64-bit value of ticks since MCU start
-	 */
-	// actually looks like this is ALWAYS or sometimes us these days?
-	// todo: make private with explicit getter/setter?
-	volatile efitick_t momentX = 0;
-
 	/**
 	 * Scheduler implementation uses a sorted linked list of these scheduling records.
 	 */
 	scheduling_s *nextScheduling_s = nullptr;
 
 	action_s action;
+	/**
+	 * timestamp represented as 64-bit value of ticks since MCU start
+	 */
+	// actually looks like this is ALWAYS or sometimes us these days?
+	// todo: make private with explicit getter/setter?
+private:
+	volatile efitick_t momentX = 0;
 };
 #pragma pack(pop)
 

unit_tests/tests/test_event_queue.cpp

@@ -96,10 +96,10 @@ TEST(EventQueue, complex) {
 	eq.insertTask(&s2, 11, callback);
 
 	ASSERT_EQ(4, eq.size());
-	ASSERT_EQ(10, eq.getHead()->momentX);
-	ASSERT_EQ(10, eq.getHead()->nextScheduling_s->momentX);
-	ASSERT_EQ(11, eq.getHead()->nextScheduling_s->nextScheduling_s->momentX);
-	ASSERT_EQ(12, eq.getHead()->nextScheduling_s->nextScheduling_s->nextScheduling_s->momentX);
+	ASSERT_EQ(10, eq.getHead()->getMomentRaw());
+	ASSERT_EQ(10, eq.getHead()->nextScheduling_s->getMomentRaw());
+	ASSERT_EQ(11, eq.getHead()->nextScheduling_s->nextScheduling_s->getMomentRaw());
+	ASSERT_EQ(12, eq.getHead()->nextScheduling_s->nextScheduling_s->nextScheduling_s->getMomentRaw());
 
 	callbackCounter = 0;
 	eq.executeAll(10);

unit_tests/tests/test_hpfp.cpp

@@ -299,7 +299,7 @@ TEST(HPFP, Schedule) {
 
 	// Since we have a mock scheduler, lets insert the correct timestamp in the scheduling
 	// struct.
-	hpfp.m_event.scheduling.momentX = nt1;
+	hpfp.m_event.scheduling.setMomentX(nt1);
 
 	HpfpController::pinTurnOn(&hpfp);