Pretty-print embedded_file_type in log messages

diff --git a/src/result.cpp b/src/result.cpp
index fcd7a8fe4bc9cdff215a4880fbacac4c357113a3..018a75b0f27d438194ebd0d37f16dd60432ce68b 100644 (file)
--- a/src/result.cpp
+++ b/src/result.cpp
@@ -106,6 +106,35 @@ using WriteEntryFunction =
            uint32_t entry_number,
            const ResultFileMap::value_type& suffix_and_path);
 
+static const char*
+UnderlyingFileTypeIntToString(UnderlyingFileTypeInt underlying_type)
+{
+  switch (FileType(underlying_type)) {
+  case FileType::object:
+    return ".o";
+
+  case FileType::dependency:
+    return ".d";
+
+  case FileType::stderr_output:
+    return "<stderr>";
+
+  case FileType::coverage:
+    return ".cov";
+
+  case FileType::stackusage:
+    return ".su";
+
+  case FileType::diagnostic:
+    return ".dia";
+
+  case FileType::dwarf_object:
+    return ".dwo";
+  }
+
+  return "<unknown type>";
+}
+
 static void
 read_embedded_file_entry(CacheEntryReader& reader,
                          const std::string& /*result_path_in_cache*/,
@@ -122,14 +151,14 @@ read_embedded_file_entry(CacheEntryReader& reader,
   bool content_read = false;
   if (dump_stream) {
     fmt::print(dump_stream,
-               "Embedded file #{}: type {} ({} bytes)\n",
+               "Embedded file #{}: {} ({} bytes)\n",
                entry_number,
-               type,
+               UnderlyingFileTypeIntToString(type),
                file_len);
   } else {
-    cc_log("Retrieving embedded file #%u type %u (%llu bytes)",
+    cc_log("Retrieving embedded file #%u %s (%llu bytes)",
            entry_number,
-           type,
+           UnderlyingFileTypeIntToString(type),
            (unsigned long long)file_len);
 
     const auto it = result_file_map->find(FileType(type));
@@ -218,14 +247,14 @@ read_raw_file_entry(CacheEntryReader& reader,
 
   if (dump_stream) {
     fmt::print(dump_stream,
-               "Raw file #{}: type {} ({} bytes)\n",
+               "Raw file #{}: {} ({} bytes)\n",
                entry_number,
-               type,
+               UnderlyingFileTypeIntToString(type),
                file_len);
   } else {
-    cc_log("Retrieving raw file #%u type %u (%llu bytes)",
+    cc_log("Retrieving raw file #%u %s (%llu bytes)",
            entry_number,
-           type,
+           UnderlyingFileTypeIntToString(type),
            (unsigned long long)file_len);
 
     auto raw_path = get_raw_file_path(result_path_in_cache, entry_number);
@@ -324,9 +353,9 @@ write_embedded_file_entry(CacheEntryWriter& writer,
       fmt::format("Failed to stat {}: {}", source_path, strerror(errno)));
   }
 
-  cc_log("Storing embedded file #%u type %u (%llu bytes) from %s",
+  cc_log("Storing embedded file #%u %s (%llu bytes) from %s",
          entry_number,
-         type,
+         UnderlyingFileTypeIntToString(type),
          (unsigned long long)source_file_size,
          source_path.c_str());
 
@@ -369,9 +398,9 @@ write_raw_file_entry(CacheEntryWriter& writer,
   uint64_t old_size;
   uint64_t new_size;
 
-  cc_log("Storing raw file #%u %u (%llu bytes) from %s",
+  cc_log("Storing raw file #%u %s (%llu bytes) from %s",
          entry_number,
-         type,
+         UnderlyingFileTypeIntToString(type),
          (unsigned long long)source_file_size,
          source_path.c_str());
 

diff --git a/src/result.hpp b/src/result.hpp
index 02665a4fda1f81dd352e49bacd74b0decc07fc55..d169a056a8dcdc8f21d5358d77fd03f3af502662 100644 (file)
--- a/src/result.hpp
+++ b/src/result.hpp
@@ -28,9 +28,9 @@ extern const uint8_t k_result_version;
 
 using UnderlyingFileTypeInt = uint8_t;
 enum class FileType : UnderlyingFileTypeInt {
-  // These values are written into the cache result file.
-  // This means they must never be changed or removed unless the
-  // result file version is incremented. Adding new values is Ok.
+  // These values are written into the cache result file. This means they must
+  // never be changed or removed unless the result file version is incremented.
+  // Adding new values is OK.
   object = 0,
   dependency = 1,
   stderr_output = 2,
@@ -38,8 +38,6 @@ enum class FileType : UnderlyingFileTypeInt {
   stackusage = 4,
   diagnostic = 5,
   dwarf_object = 6,
-
-  Max = 255,
 };
 
 using ResultFileMap = std::map<FileType, std::string /*path*/>;