Logger: Pipe the monotonic_remote_transmit_time through event loop
Populate the field in all the network bridges and pipe it through
all the required spots in the event loop. Update all the tests to match
the update.
As part of this, we realized that our modeling of network delay was
wrong. Wakeups don't always take 50 uS if something else triggers the
wakeup and the message is ready in shared memory. This wasn't being
handled properly.
Change-Id: Idf94c5c6d7c87f4d65868c71b1cceedca7bf3853
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>
diff --git a/aos/ipc_lib/lockless_queue.cc b/aos/ipc_lib/lockless_queue.cc
index 9d14d8f..57a2e9e 100644
--- a/aos/ipc_lib/lockless_queue.cc
+++ b/aos/ipc_lib/lockless_queue.cc
@@ -953,6 +953,7 @@
const char *data, size_t length,
monotonic_clock::time_point monotonic_remote_time,
realtime_clock::time_point realtime_remote_time,
+ monotonic_clock::time_point monotonic_remote_transmit_time,
uint32_t remote_queue_index, const UUID &source_boot_uuid,
monotonic_clock::time_point *monotonic_sent_time,
realtime_clock::time_point *realtime_sent_time, uint32_t *queue_index) {
@@ -962,13 +963,15 @@
// adhere to this convention and place it at the end.
memcpy((reinterpret_cast<char *>(Data()) + size() - length), data, length);
return Send(length, monotonic_remote_time, realtime_remote_time,
- remote_queue_index, source_boot_uuid, monotonic_sent_time,
- realtime_sent_time, queue_index);
+ monotonic_remote_transmit_time, remote_queue_index,
+ source_boot_uuid, monotonic_sent_time, realtime_sent_time,
+ queue_index);
}
LocklessQueueSender::Result LocklessQueueSender::Send(
size_t length, monotonic_clock::time_point monotonic_remote_time,
realtime_clock::time_point realtime_remote_time,
+ monotonic_clock::time_point monotonic_remote_transmit_time,
uint32_t remote_queue_index, const UUID &source_boot_uuid,
monotonic_clock::time_point *monotonic_sent_time,
realtime_clock::time_point *realtime_sent_time, uint32_t *queue_index) {
@@ -997,6 +1000,8 @@
message->header.source_boot_uuid = source_boot_uuid;
message->header.monotonic_remote_time = monotonic_remote_time;
message->header.realtime_remote_time = realtime_remote_time;
+ message->header.monotonic_remote_transmit_time =
+ monotonic_remote_transmit_time;
Index to_replace = Index::Invalid();
while (true) {
@@ -1298,6 +1303,7 @@
monotonic_clock::time_point *monotonic_sent_time,
realtime_clock::time_point *realtime_sent_time,
monotonic_clock::time_point *monotonic_remote_time,
+ monotonic_clock::time_point *monotonic_remote_transmit_time,
realtime_clock::time_point *realtime_remote_time,
uint32_t *remote_queue_index, UUID *source_boot_uuid, size_t *length,
char *data,
@@ -1379,6 +1385,8 @@
context.monotonic_event_time = m->header.monotonic_sent_time;
context.realtime_event_time = m->header.realtime_sent_time;
context.monotonic_remote_time = m->header.monotonic_remote_time;
+ context.monotonic_remote_transmit_time =
+ m->header.monotonic_remote_transmit_time;
context.realtime_remote_time = m->header.realtime_remote_time;
context.queue_index = queue_index.index();
if (m->header.remote_queue_index == 0xffffffffu) {
@@ -1443,6 +1451,7 @@
*realtime_sent_time = context.realtime_event_time;
*remote_queue_index = context.remote_queue_index;
*monotonic_remote_time = context.monotonic_remote_time;
+ *monotonic_remote_transmit_time = context.monotonic_remote_transmit_time;
*realtime_remote_time = context.realtime_remote_time;
*source_boot_uuid = context.source_boot_uuid;
*length = context.size;
@@ -1597,6 +1606,12 @@
<< m->header.monotonic_remote_time << " 0x" << std::hex
<< m->header.monotonic_remote_time.time_since_epoch().count()
<< std::dec << ::std::endl;
+ ::std::cout
+ << " monotonic_clock::time_point "
+ "monotonic_remote_transmit_time = "
+ << m->header.monotonic_remote_transmit_time << " 0x" << std::hex
+ << m->header.monotonic_remote_transmit_time.time_since_epoch().count()
+ << std::dec << ::std::endl;
::std::cout << " realtime_clock::time_point realtime_remote_time = "
<< m->header.realtime_remote_time << " 0x" << std::hex
<< m->header.realtime_remote_time.time_since_epoch().count()