From 1137767a4bf58f49a47e25da1cb86f90bc5e2606 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Mon, 18 Oct 2021 19:38:55 +0200
Subject: minor: comment edits

---
 zenserver/diag/logging.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zenserver/diag/logging.cpp b/zenserver/diag/logging.cpp
index 6e2559f1f..74c5c2101 100644
--- a/zenserver/diag/logging.cpp
+++ b/zenserver/diag/logging.cpp
@@ -272,12 +272,12 @@ InitializeLogging(const ZenServerOptions& GlobalOptions)
 	auto HttpLogger = std::make_shared<spdlog::logger>("http_requests", HttpSink);
 	spdlog::register_logger(HttpLogger);
 
-	// Jupiter - only log HTTP traffic to file
+	// Jupiter - only log upstream HTTP traffic to file
 
 	auto JupiterLogger = std::make_shared<spdlog::logger>("jupiter", FileSink);
 	spdlog::register_logger(JupiterLogger);
 
-	// Zen - only log HTTP traffic to file
+	// Zen - only log upstream HTTP traffic to file
 
 	auto ZenClientLogger = std::make_shared<spdlog::logger>("zenclient", FileSink);
 	spdlog::register_logger(ZenClientLogger);
-- 
cgit v1.2.3


From c6b0fa23f7161fbe5faedc03b5397a3e37f25e46 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Mon, 18 Oct 2021 19:39:15 +0200
Subject: Some gc interface stubs

---
 zenstore/gc.cpp                | 14 +++++++++++++-
 zenstore/include/zenstore/gc.h |  6 ++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/zenstore/gc.cpp b/zenstore/gc.cpp
index e7c8f3a1a..f7e448887 100644
--- a/zenstore/gc.cpp
+++ b/zenstore/gc.cpp
@@ -49,7 +49,19 @@ CasGc::CollectGarbage()
 }
 
 void
-CasGc::OnNewReferences(std::span<IoHash> Hashes)
+CasGc::OnNewCidReferences(std::span<IoHash> Hashes)
+{
+	ZEN_UNUSED(Hashes);
+}
+
+void
+CasGc::OnCommittedCidReferences(std::span<IoHash> Hashes)
+{
+	ZEN_UNUSED(Hashes);
+}
+
+void
+CasGc::OnDroppedCidReferences(std::span<IoHash> Hashes)
 {
 	ZEN_UNUSED(Hashes);
 }
diff --git a/zenstore/include/zenstore/gc.h b/zenstore/include/zenstore/gc.h
index 33a43f4d2..126c2eb68 100644
--- a/zenstore/include/zenstore/gc.h
+++ b/zenstore/include/zenstore/gc.h
@@ -29,7 +29,7 @@ private:
 	std::unique_ptr<GcState> m_State;
 };
 
-/** GC
+/** GC Coordinator
   */
 
 class CasGc
@@ -40,7 +40,9 @@ public:
 
 	void CollectGarbage();
 
-	void OnNewReferences(std::span<IoHash> Hashes);
+	void OnNewCidReferences(std::span<IoHash> Hashes);
+	void OnCommittedCidReferences(std::span<IoHash> Hashes);
+	void OnDroppedCidReferences(std::span<IoHash> Hashes);
 
 private:
 	CasStore& m_CasStore;
-- 
cgit v1.2.3