commit 8902fa5b00b25bade39d07fd25b5a0b9db0d2b12
author Austin Schuh <austin.linux@gmail.com> Sun Mar 14 22:39:24 2021 -0700
committer Austin Schuh <austin.linux@gmail.com> Mon Mar 15 13:07:05 2021 -0700
tree cba388748364873a910dae92bfd29188363f1fe5
parent b5c6f97ea5ceefb4d32abe053247d727a7329593

Add remote_boot_uuid to Context

This lets us track which boot a message came from and finally fix the
logger relying on ServerStatistics having all the required information
needed to build up the logfile header.

Change-Id: I17fc4c5718d5d69c7a1e154afdd83b1ccb388a8f

aos/events/event_loop.h

diff --git a/aos/events/event_loop.h b/aos/events/event_loop.h
index 22f7c6f..cc5a356 100644
--- a/aos/events/event_loop.h
+++ b/aos/events/event_loop.h
@@ -75,6 +75,10 @@
   // the caller has access to this context, which makes this pretty useless.
   int buffer_index;
 
+  // UUID of the remote node which sent this message, or this node in the case
+  // of events which are local to this node.
+  UUID remote_boot_uuid = UUID::Zero();
+
   // Efficiently copies the flatbuffer into a FlatbufferVector, allocating
   // memory in the process.  It is vital that T matches the type of the
   // underlying flatbuffer.
@@ -150,7 +154,7 @@
   bool Send(size_t size);
   bool Send(size_t size, monotonic_clock::time_point monotonic_remote_time,
             realtime_clock::time_point realtime_remote_time,
-            uint32_t remote_queue_index);
+            uint32_t remote_queue_index, const UUID &remote_boot_uuid);
 
   // Sends a single block of data by copying it.
   // The remote arguments have the same meaning as in Send above.
@@ -158,7 +162,7 @@
   bool Send(const void *data, size_t size,
             monotonic_clock::time_point monotonic_remote_time,
             realtime_clock::time_point realtime_remote_time,
-            uint32_t remote_queue_index);
+            uint32_t remote_queue_index, const UUID &remote_boot_uuid);
 
   const Channel *channel() const { return channel_; }
 
@@ -195,13 +199,15 @@
   friend class EventLoop;
 
   virtual bool DoSend(const void *data, size_t size,
-                      aos::monotonic_clock::time_point monotonic_remote_time,
-                      aos::realtime_clock::time_point realtime_remote_time,
-                      uint32_t remote_queue_index) = 0;
+                      monotonic_clock::time_point monotonic_remote_time,
+                      realtime_clock::time_point realtime_remote_time,
+                      uint32_t remote_queue_index,
+                      const UUID &remote_boot_uuid) = 0;
   virtual bool DoSend(size_t size,
-                      aos::monotonic_clock::time_point monotonic_remote_time,
-                      aos::realtime_clock::time_point realtime_remote_time,
-                      uint32_t remote_queue_index) = 0;
+                      monotonic_clock::time_point monotonic_remote_time,
+                      realtime_clock::time_point realtime_remote_time,
+                      uint32_t remote_queue_index,
+                      const UUID &remote_boot_uuid) = 0;
 
   EventLoop *const event_loop_;
   const Channel *const channel_;