commit 61276dc62e8677702994c53019ef889090beeeac
author colleen <colleen.twitty@bluerivertech.com> Thu Jun 01 09:23:29 2023 -0700
committer James Kuszmaul <jabukuszmaul+collab@gmail.com> Sun Jul 23 08:37:25 2023 -0700
tree 94861dbb793c1bc3010c60447edc93b38e957ba3
parent a6681e22da2b53bb98cb1ba89c0ab809c0f5b9b6

Teach logger about O_DIRECT

Plump the option down through aos.

This will let us (in a future change) detect whether the storage disk
should use O_DIRECT or not, as appropriate.

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

aos/events/logging/log_backend.cc

diff --git a/aos/events/logging/log_backend.cc b/aos/events/logging/log_backend.cc
index 30f6181..9eb9089 100644
--- a/aos/events/logging/log_backend.cc
+++ b/aos/events/logging/log_backend.cc
@@ -11,9 +11,6 @@
 #include "aos/events/logging/file_operations.h"
 #include "aos/util/file.h"
 
-DEFINE_bool(direct, false,
-            "If true, write using O_DIRECT and write 512 byte aligned blocks "
-            "whenever possible.");
 DEFINE_bool(
     sync, false,
     "If true, sync data to disk as we go so we don't get too far ahead.  Also "
@@ -123,8 +120,8 @@
   }
 }
 
-FileHandler::FileHandler(std::string filename)
-    : filename_(std::move(filename)), supports_odirect_(FLAGS_direct) {}
+FileHandler::FileHandler(std::string filename, bool supports_odirect)
+    : filename_(std::move(filename)), supports_odirect_(supports_odirect) {}
 
 FileHandler::~FileHandler() { Close(); }
 
@@ -332,12 +329,14 @@
   return ran_out_of_space ? WriteCode::kOutOfSpace : WriteCode::kOk;
 }
 
-FileBackend::FileBackend(std::string_view base_name)
-    : base_name_(base_name), separator_(base_name_.back() == '/' ? "" : "_") {}
+FileBackend::FileBackend(std::string_view base_name, bool supports_odirect)
+    : supports_odirect_(supports_odirect),
+      base_name_(base_name),
+      separator_(base_name_.back() == '/' ? "" : "_") {}
 
 std::unique_ptr<LogSink> FileBackend::RequestFile(std::string_view id) {
   const std::string filename = absl::StrCat(base_name_, separator_, id);
-  return std::make_unique<FileHandler>(filename);
+  return std::make_unique<FileHandler>(filename, supports_odirect_);
 }
 
 std::vector<std::string> FileBackend::ListFiles() const {
@@ -365,14 +364,18 @@
   return std::make_unique<DummyDecoder>(filename);
 }
 
-RenamableFileBackend::RenamableFileBackend(std::string_view base_name)
-    : base_name_(base_name), separator_(base_name_.back() == '/' ? "" : "_") {}
+RenamableFileBackend::RenamableFileBackend(std::string_view base_name,
+                                           bool supports_odirect)
+    : supports_odirect_(supports_odirect),
+      base_name_(base_name),
+      separator_(base_name_.back() == '/' ? "" : "_") {}
 
 std::unique_ptr<LogSink> RenamableFileBackend::RequestFile(
     std::string_view id) {
   const std::string filename =
       absl::StrCat(base_name_, separator_, id, temp_suffix_);
-  return std::make_unique<RenamableFileHandler>(this, filename);
+  return std::make_unique<RenamableFileHandler>(this, filename,
+                                                supports_odirect_);
 }
 
 void RenamableFileBackend::EnableTempFiles() {