step 5

apps/LoopThroughWithOpenGLCompositing/gl/frame/RuntimeUpdateController.cpp

@@ -48,6 +48,9 @@ RuntimeUpdateController::RuntimeUpdateController(
 	mRuntimeEventDispatcher.Subscribe(
 		RuntimeEventType::RuntimeReloadRequested,
 		[this](const RuntimeEvent& event) { HandleRuntimeReloadRequested(event); });
+	mRuntimeEventDispatcher.Subscribe(
+		RuntimeEventType::RuntimePersistenceRequested,
+		[this](const RuntimeEvent& event) { HandleRuntimePersistenceRequested(event); });
 	mRuntimeEventDispatcher.Subscribe(
 		RuntimeEventType::ShaderBuildRequested,
 		[this](const RuntimeEvent& event) { HandleShaderBuildRequested(event); });
@@ -158,6 +161,16 @@ void RuntimeUpdateController::HandleRuntimeReloadRequested(const RuntimeEvent& e
 	mRuntimeStore.ClearReloadRequest();
 }
 
+void RuntimeUpdateController::HandleRuntimePersistenceRequested(const RuntimeEvent& event)
+{
+	const RuntimePersistenceRequestedEvent* payload = std::get_if<RuntimePersistenceRequestedEvent>(&event.payload);
+	if (!payload)
+		return;
+
+	std::string error;
+	mRuntimeStore.RequestPersistence(payload->request, error);
+}
+
 void RuntimeUpdateController::HandleShaderBuildRequested(const RuntimeEvent& event)
 {
 	const ShaderBuildEvent* payload = std::get_if<ShaderBuildEvent>(&event.payload);

apps/LoopThroughWithOpenGLCompositing/gl/frame/RuntimeUpdateController.h

@@ -36,6 +36,7 @@ public:
 private:
 	void HandleRuntimeStateBroadcastRequested(const RuntimeEvent& event);
 	void HandleRuntimeReloadRequested(const RuntimeEvent& event);
+	void HandleRuntimePersistenceRequested(const RuntimeEvent& event);
 	void HandleShaderBuildRequested(const RuntimeEvent& event);
 	void HandleShaderBuildPrepared(const RuntimeEvent& event);
 	void HandleShaderBuildFailed(const RuntimeEvent& event);

apps/LoopThroughWithOpenGLCompositing/runtime/store/RuntimeStore.cpp

@@ -43,7 +43,6 @@ std::string PersistenceTargetKindName(PersistenceTargetKind targetKind)
 
 RuntimeStore::RuntimeStore() :
 	mRenderSnapshotBuilder(*this),
-	mHealthTelemetry(),
 	mReloadRequested(false),
 	mCompileSucceeded(false),
 	mStartupRandom(GenerateStartupRandom()),
@@ -128,6 +127,35 @@ PersistenceSnapshot RuntimeStore::BuildRuntimeStatePersistenceSnapshot(const Per
 	return BuildRuntimeStatePersistenceSnapshotLocked(request);
 }
 
+bool RuntimeStore::RequestPersistence(const PersistenceRequest& request, std::string& error)
+{
+	if (request.targetKind != PersistenceTargetKind::RuntimeState)
+	{
+		error = "Unsupported persistence request target: " + PersistenceTargetKindName(request.targetKind);
+		mHealthTelemetry.RecordPersistenceWriteResult(
+			false,
+			PersistenceTargetKindName(request.targetKind),
+			std::string(),
+			request.reason,
+			error,
+			false);
+		return false;
+	}
+
+	const PersistenceSnapshot snapshot = BuildRuntimeStatePersistenceSnapshot(request);
+	if (mPersistenceWriter.EnqueueSnapshot(snapshot, error))
+		return true;
+
+	mHealthTelemetry.RecordPersistenceWriteResult(
+		false,
+		PersistenceTargetKindName(request.targetKind),
+		snapshot.targetPath.string(),
+		request.reason,
+		error,
+		false);
+	return false;
+}
+
 PersistenceSnapshot RuntimeStore::BuildRuntimeStatePersistenceSnapshotLocked(const PersistenceRequest& request) const
 {
 	PersistenceSnapshot snapshot;
@@ -211,7 +239,7 @@ bool RuntimeStore::CreateStoredLayer(const std::string& shaderId, std::string& e
 
 	mReloadRequested = true;
 	MarkRenderStateDirtyLocked();
-	return SavePersistentState(error);
+	return true;
 }
 
 bool RuntimeStore::DeleteStoredLayer(const std::string& layerId, std::string& error)
@@ -222,7 +250,7 @@ bool RuntimeStore::DeleteStoredLayer(const std::string& layerId, std::string& er
 
 	mReloadRequested = true;
 	MarkRenderStateDirtyLocked();
-	return SavePersistentState(error);
+	return true;
 }
 
 bool RuntimeStore::MoveStoredLayer(const std::string& layerId, int direction, std::string& error)
@@ -239,7 +267,7 @@ bool RuntimeStore::MoveStoredLayer(const std::string& layerId, int direction, st
 
 	mReloadRequested = true;
 	MarkRenderStateDirtyLocked();
-	return SavePersistentState(error);
+	return true;
 }
 
 bool RuntimeStore::MoveStoredLayerToIndex(const std::string& layerId, std::size_t targetIndex, std::string& error)
@@ -256,7 +284,7 @@ bool RuntimeStore::MoveStoredLayerToIndex(const std::string& layerId, std::size_
 
 	mReloadRequested = true;
 	MarkRenderStateDirtyLocked();
-	return SavePersistentState(error);
+	return true;
 }
 
 bool RuntimeStore::SetStoredLayerBypassState(const std::string& layerId, bool bypassed, std::string& error)
@@ -267,7 +295,7 @@ bool RuntimeStore::SetStoredLayerBypassState(const std::string& layerId, bool by
 
 	mReloadRequested = true;
 	MarkParameterStateDirtyLocked();
-	return SavePersistentState(error);
+	return true;
 }
 
 bool RuntimeStore::SetStoredLayerShaderSelection(const std::string& layerId, const std::string& shaderId, std::string& error)
@@ -278,18 +306,19 @@ bool RuntimeStore::SetStoredLayerShaderSelection(const std::string& layerId, con
 
 	mReloadRequested = true;
 	MarkRenderStateDirtyLocked();
-	return SavePersistentState(error);
+	return true;
 }
 
 bool RuntimeStore::SetStoredParameterValue(const std::string& layerId, const std::string& parameterId, const ShaderParameterValue& value, bool persistState, std::string& error)
 {
+	(void)persistState;
 	std::lock_guard<std::mutex> lock(mMutex);
 
 	if (!mCommittedLiveState.SetParameterValue(layerId, parameterId, value, error))
 		return false;
 
 	MarkParameterStateDirtyLocked();
-	return !persistState || SavePersistentState(error);
+	return true;
 }
 
 bool RuntimeStore::ResetStoredLayerParameterValues(const std::string& layerId, std::string& error)
@@ -300,7 +329,7 @@ bool RuntimeStore::ResetStoredLayerParameterValues(const std::string& layerId, s
 		return false;
 
 	MarkParameterStateDirtyLocked();
-	return SavePersistentState(error);
+	return true;
 }
 
 bool RuntimeStore::SaveStackPresetSnapshot(const std::string& presetName, std::string& error) const
@@ -340,7 +369,7 @@ bool RuntimeStore::LoadStackPresetSnapshot(const std::string& presetName, std::s
 
 	mReloadRequested = true;
 	MarkRenderStateDirtyLocked();
-	return SavePersistentState(error);
+	return true;
 }
 
 bool RuntimeStore::HasStoredLayer(const std::string& layerId) const
@@ -503,11 +532,6 @@ bool RuntimeStore::LoadPersistentState(std::string& error)
 	return mCommittedLiveState.LoadPersistentStateValue(root);
 }
 
-bool RuntimeStore::SavePersistentState(std::string& error) const
-{
-	return mPersistenceWriter.EnqueueSnapshot(BuildRuntimeStatePersistenceSnapshotLocked(PersistenceRequest::RuntimeStateRequest("SavePersistentState")), error);
-}
-
 PersistenceSnapshot RuntimeStore::BuildStackPresetPersistenceSnapshot(const std::string& presetName) const
 {
 	const std::string safeStem = LayerStackStore::MakeSafePresetFileStem(presetName);

apps/LoopThroughWithOpenGLCompositing/runtime/store/RuntimeStore.h

@@ -32,6 +32,7 @@ public:
 	bool InitializeStore(std::string& error);
 	std::string BuildPersistentStateJson() const;
 	PersistenceSnapshot BuildRuntimeStatePersistenceSnapshot(const PersistenceRequest& request) const;
+	bool RequestPersistence(const PersistenceRequest& request, std::string& error);
 	bool PollStoredFileChanges(bool& registryChanged, bool& reloadRequested, std::string& error);
 
 	bool CreateStoredLayer(const std::string& shaderId, std::string& error);
@@ -83,7 +84,6 @@ public:
 
 private:
 	bool LoadPersistentState(std::string& error);
-	bool SavePersistentState(std::string& error) const;
 	PersistenceSnapshot BuildRuntimeStatePersistenceSnapshotLocked(const PersistenceRequest& request) const;
 	PersistenceSnapshot BuildStackPresetPersistenceSnapshot(const std::string& presetName) const;
 	bool ScanShaderPackages(std::string& error);
@@ -93,11 +93,11 @@ private:
 	void MarkParameterStateDirtyLocked();
 
 	RenderSnapshotBuilder mRenderSnapshotBuilder;
-	mutable PersistenceWriter mPersistenceWriter;
 	RuntimeConfigStore mConfigStore;
 	ShaderPackageCatalog mShaderCatalog;
 	CommittedLiveState mCommittedLiveState;
 	HealthTelemetry mHealthTelemetry;
+	mutable PersistenceWriter mPersistenceWriter;
 	mutable std::mutex mMutex;
 	bool mReloadRequested;
 	bool mCompileSucceeded;