[𝘀𝗽𝗿] initial version

Created using spr 1.3.7

Author: cachemeifyoucan

llvm/lib/CAS/OnDiskCommon.cpp

@@ -30,6 +30,12 @@
 #include <sys/mount.h> // statfs
 #endif
 
+#ifdef __APPLE__
+#if __has_include(<sys/sysctl.h>)
+#include <sys/sysctl.h>
+#endif
+#endif
+
 using namespace llvm;
 
 static uint64_t OnDiskCASMaxMappingSize = 0;
@@ -179,3 +185,30 @@ bool cas::ondisk::useSmallMappingSize(const Twine &P) {
   // Default to use regular database file.
   return false;
 }
+
+Expected<uint64_t> cas::ondisk::getBootTime() {
+#ifdef __APPLE__
+#if __has_include(<sys/sysctl.h>) && defined(KERN_BOOTTIME)
+  struct timeval TV;
+  size_t TVLen = sizeof(TV);
+  int KernBoot[2] = {CTL_KERN, KERN_BOOTTIME};
+  if (sysctl(KernBoot, 2, &TV, &TVLen, nullptr, 0) < 0)
+    return createStringError(llvm::errnoAsErrorCode(),
+                             "failed to get boottime");
+  if (TVLen != sizeof(TV))
+    return createStringError("sysctl kern.boottime unexpected format");
+  return TV.tv_sec;
+#else
+  return 0;
+#endif
+#elif defined(__linux__)
+  // Use the mtime for /proc, which is recreated during system boot.
+  // We could also read /proc/stat and search for 'btime'.
+  sys::fs::file_status Status;
+  if (std::error_code EC = sys::fs::status("/proc", Status))
+    return createFileError("/proc", EC);
+  return Status.getLastModificationTime().time_since_epoch().count();
+#else
+  return 0;
+#endif
+}

llvm/lib/CAS/OnDiskCommon.h

@@ -63,6 +63,13 @@ std::error_code tryLockFileThreadSafe(
 Expected<size_t> preallocateFileTail(int FD, size_t CurrentSize,
                                      size_t NewSize);
 
+/// Get boot time for the OS. This can be used to check if the CAS has been
+/// validated since boot.
+///
+/// \returns the boot time in seconds (0 if operation not supported), or an \c
+/// Error.
+Expected<uint64_t> getBootTime();
+
 } // namespace llvm::cas::ondisk
 
 #endif // LLVM_LIB_CAS_ONDISKCOMMON_H

llvm/lib/CAS/UnifiedOnDiskCache.cpp

@@ -88,10 +88,6 @@
 #include "llvm/Support/raw_ostream.h"
 #include <optional>
 
-#if __has_include(<sys/sysctl.h>)
-#include <sys/sysctl.h>
-#endif
-
 using namespace llvm;
 using namespace llvm::cas;
 using namespace llvm::cas::ondisk;
@@ -271,29 +267,6 @@ static Error validateInProcess(StringRef RootPath, StringRef HashName,
   return Error::success();
 }
 
-static Expected<uint64_t> getBootTime() {
-#if __has_include(<sys/sysctl.h>) && defined(KERN_BOOTTIME)
-  struct timeval TV;
-  size_t TVLen = sizeof(TV);
-  int KernBoot[2] = {CTL_KERN, KERN_BOOTTIME};
-  if (sysctl(KernBoot, 2, &TV, &TVLen, nullptr, 0) < 0)
-    return createStringError(llvm::errnoAsErrorCode(),
-                             "failed to get boottime");
-  if (TVLen != sizeof(TV))
-    return createStringError("sysctl kern.boottime unexpected format");
-  return TV.tv_sec;
-#elif defined(__linux__)
-  // Use the mtime for /proc, which is recreated during system boot.
-  // We could also read /proc/stat and search for 'btime'.
-  sys::fs::file_status Status;
-  if (std::error_code EC = sys::fs::status("/proc", Status))
-    return createFileError("/proc", EC);
-  return Status.getLastModificationTime().time_since_epoch().count();
-#else
-  llvm::report_fatal_error("getBootTime unimplemented");
-#endif
-}
-
 Expected<ValidationResult> UnifiedOnDiskCache::validateIfNeeded(
     StringRef RootPath, StringRef HashName, unsigned HashByteSize,
     bool CheckHash, bool AllowRecovery, bool ForceValidation,