Format mgr:5min and mgr:60min as YAML

src/mgr/IntervalAction.cc

@@ -9,6 +9,7 @@
 /* DEBUG: section 16    Cache Manager API */
 
 #include "squid.h"
+#include "base/PackableStream.h"
 #include "base/TextException.h"
 #include "ipc/Messages.h"
 #include "ipc/TypedMsgHdr.h"
@@ -17,8 +18,10 @@
 #include "Store.h"
 #include "tools.h"
 
+#include <iosfwd>
+
 void GetAvgStat(Mgr::IntervalActionData& stats, int minutes, int hours);
-void DumpAvgStat(Mgr::IntervalActionData& stats, StoreEntry* sentry);
+void DumpAvgStat(Mgr::IntervalActionData& stats, std::ostream&);
 
 Mgr::IntervalActionData::IntervalActionData()
 {
@@ -149,7 +152,8 @@ Mgr::IntervalAction::dump(StoreEntry* entry)
 {
     debugs(16, 5, MYNAME);
     Must(entry != nullptr);
-    DumpAvgStat(data, entry);
+    PackableStream yaml(*entry);
+    DumpAvgStat(data, yaml);
 }
 
 void

src/tests/stub_libtime.cc

@@ -12,6 +12,9 @@
 #include "tests/STUB.h"
 
 #include "time/Engine.h"
+#include "time/YamlDateTime.h"
+
+#include <iosfwd>
 void Time::Engine::tick() STUB
 
 #include "time/gadgets.h"
@@ -33,5 +36,6 @@ const char *FormatRfc1123(time_t) STUB_RETVAL("")
 time_t ParseRfc1123(const char *) STUB_RETVAL(0)
 const char *FormatStrf(time_t) STUB_RETVAL("")
 const char *FormatHttpd(time_t) STUB_RETVAL("")
+void YamlDateTime::print(std::ostream &) const STUB
 }
 

src/time/Makefile.am

@@ -12,6 +12,8 @@ noinst_LTLIBRARIES = libtime.la
 libtime_la_SOURCES = \
 	Engine.cc \
 	Engine.h \
+	YamlDateTime.cc \
+	YamlDateTime.h \
 	forward.h \
 	gadgets.cc \
 	gadgets.h \

src/time/YamlDateTime.cc

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
+#include "squid.h"
+#include "YamlDateTime.h"
+
+#include <ctime>
+#include <iomanip>
+#include <ostream>
+
+void
+Time::YamlDateTime::print(std::ostream &os) const
+{
+    // need to add fractions and timezone on top of this
+    static const char *yaml_time_format = "%Y-%m-%d %H:%M:%S";
+    const auto tm = gmtime(&tv_.tv_sec);
+    os << std::put_time(tm, yaml_time_format);
+    os << '.' << std::setw(2) << (tv_.tv_usec / 10000) << 'Z';
+}

src/time/YamlDateTime.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
+#ifndef SQUID_SRC_TIME_YAMLDATETIME_H
+#define SQUID_SRC_TIME_YAMLDATETIME_H
+
+#include <iosfwd>
+#include <sys/time.h>
+
+namespace Time {
+
+/// Output onto an ostream a yaml-formatted datetime string (UTC)
+///  see https://yaml.org/type/timestamp.html
+class YamlDateTime
+{
+public:
+    YamlDateTime(const struct timeval &tv) : tv_(tv) {};
+    void print(std::ostream &) const;
+
+private:
+    const struct timeval tv_;
+};
+
+} // namespace Time
+
+inline auto &
+operator<<(std::ostream &os, const Time::YamlDateTime &dt)
+{
+    dt.print(os);
+    return os;
+}
+
+#endif /* SQUID_SRC_TIME_YAMLDATETIME_H */

src/time/forward.h

@@ -14,6 +14,7 @@ namespace Time
 {
 
 class Engine;
+class YamlDateTime;
 
 } // namespace Time