commit 06a8f35550343a79634b8fe2390349eb955d448a
author James Kuszmaul <james.kuszmaul@bluerivertech.com> Fri Mar 15 14:15:57 2024 -0700
committer Austin Schuh <austin.linux@gmail.com> Sat May 11 14:58:35 2024 -0700
tree 07dd276a683f47cb236294898796f0ffe801c33c
parent b2117a978a6f37e79258cda439aefbbe7dc712f0

Call set_name() on more AOS timers

This makes the AOS timing reports more helpful.

Change-Id: I5f4774f355f7ef7022c8f0effa27e560b5bc26bc
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>

aos/network/message_bridge_auth_client_lib.cc

diff --git a/aos/network/message_bridge_auth_client_lib.cc b/aos/network/message_bridge_auth_client_lib.cc
index 63388a4..c277b4f 100644
--- a/aos/network/message_bridge_auth_client_lib.cc
+++ b/aos/network/message_bridge_auth_client_lib.cc
@@ -42,6 +42,7 @@
       config_request_fetcher_(
           event_loop_->MakeFetcher<SctpConfigRequest>("/aos")),
       client_(SctpConfigService::NewStub(channel)) {
+  poll_timer_->set_name("poll");
   event_loop_->OnRun([this] {
     poll_timer_->Schedule(event_loop_->monotonic_now(),
                           std::chrono::milliseconds(1000));

aos/starter/starter_rpc_lib.cc

diff --git a/aos/starter/starter_rpc_lib.cc b/aos/starter/starter_rpc_lib.cc
index 891355e..754fc2c 100644
--- a/aos/starter/starter_rpc_lib.cc
+++ b/aos/starter/starter_rpc_lib.cc
@@ -63,6 +63,7 @@
     : event_loop_(event_loop),
       timeout_timer_(event_loop_->AddTimer([this]() { Timeout(); })),
       cmd_sender_(event_loop_->MakeSender<StarterRpc>("/aos")) {
+  timeout_timer_->set_name("rpc_timeout");
   if (configuration::MultiNode(event_loop_->configuration())) {
     for (const aos::Node *node :
          configuration::GetNodes(event_loop_->configuration())) {

aos/starter/starterd_lib.cc

diff --git a/aos/starter/starterd_lib.cc b/aos/starter/starterd_lib.cc
index 38d519d..6a1d3ed 100644
--- a/aos/starter/starterd_lib.cc
+++ b/aos/starter/starterd_lib.cc
@@ -58,6 +58,8 @@
       top_(&event_loop_) {
   event_loop_.SkipAosLog();
 
+  cleanup_timer_->set_name("cleanup");
+
   if (!aos::configuration::MultiNode(config_msg_)) {
     event_loop_.MakeWatcher(
         "/aos",

aos/starter/subprocess.cc

diff --git a/aos/starter/subprocess.cc b/aos/starter/subprocess.cc
index d677922..07057a0 100644
--- a/aos/starter/subprocess.cc
+++ b/aos/starter/subprocess.cc
@@ -237,9 +237,16 @@
           event_loop_->AddTimer([this]() { MaybeHandleSignal(); })),
       on_change_({on_change}),
       quiet_flag_(quiet_flag) {
+  // Keep the length of the timer name bounded to some reasonable length.
+  start_timer_->set_name(absl::StrCat("app_start_", name.substr(0, 10)));
+  restart_timer_->set_name(absl::StrCat("app_restart_", name.substr(0, 10)));
+  stop_timer_->set_name(absl::StrCat("app_stop_", name.substr(0, 10)));
+  pipe_timer_->set_name(absl::StrCat("app_pipe_", name.substr(0, 10)));
+  child_status_handler_->set_name(
+      absl::StrCat("app_status_handler_", name.substr(0, 10)));
   // Every second poll to check if the child is dead. This is used as a
-  // default for the case where the user is not directly catching SIGCHLD and
-  // calling MaybeHandleSignal for us.
+  // default for the case where the user is not directly catching SIGCHLD
+  // and calling MaybeHandleSignal for us.
   child_status_handler_->Schedule(event_loop_->monotonic_now(),
                                   std::chrono::seconds(1));
 }