Extend statistics

PiSCSI · Oct 5, 2023 · 1810b2a · 1810b2a
1 parent 52007ff
commit 1810b2a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/cpp/devices/disk_cache.cpp b/cpp/devices/disk_cache.cpp
@@ -156,17 +156,16 @@ bool DiskCache::Load(int index, int track, shared_ptr<DiskTrack> disktrk)
 		sectors = 0x100;
 	}
 
-	// Create a disk track
 	if (disktrk == nullptr) {
 		disktrk = make_shared<DiskTrack>();
 	}
 
-	// Initialize disk track
 	disktrk->Init(track, sec_size, sectors, cd_raw, imgoffset);
 
 	// Try loading
 	if (!disktrk->Load(sec_path)) {
-		// Failure
+		++read_error_count;
+
 		return false;
 	}
 
@@ -190,3 +189,12 @@ void DiskCache::UpdateSerialNumber()
 	}
 }
 
+statistics_map DiskCache::GetStatistics()
+{
+	statistics_map statistics;
+
+	statistics.emplace(PbStatisticsCategory::ERROR, make_pair(READ_ERROR_COUNT, read_error_count));
+	statistics.emplace(PbStatisticsCategory::ERROR, make_pair(WRITE_ERROR_COUNT, write_error_count));
+
+	return statistics;
+}
diff --git a/cpp/devices/disk_cache.h b/cpp/devices/disk_cache.h
@@ -27,6 +27,12 @@ class DiskCache
 	// Number of tracks to cache
 	static const int CACHE_MAX = 16;
 
+	inline static uint32_t read_error_count = 0;
+	inline static uint32_t write_error_count = 0;
+
+	inline static const string READ_ERROR_COUNT = "read_error_count";
+	inline static const string WRITE_ERROR_COUNT = "write_error_count";
+
 public:
 
 	// Internal data definition
@@ -40,12 +46,11 @@ class DiskCache
 
 	void SetRawMode(bool b) { cd_raw = b; }		// CD-ROM raw mode setting
 
-	// Access
 	bool Save() const;							// Save and release all
 	bool ReadSector(span<uint8_t>, uint32_t);			// Sector Read
 	bool WriteSector(span<const uint8_t>, uint32_t);	// Sector Write
 
-	static statistics_map GetStatistics() { return DiskTrack::GetStatistics(); }
+	static statistics_map GetStatistics();
 
 private:
 

diff --git a/cpp/devices/disk_track.h b/cpp/devices/disk_track.h
@@ -55,6 +55,8 @@ class DiskTrack
 	DiskTrack(DiskTrack&) = delete;
 	DiskTrack& operator=(const DiskTrack&) = delete;
 
+	static statistics_map GetStatistics();
+
 private:
 
 	friend class DiskCache;
@@ -68,6 +70,4 @@ class DiskTrack
 	bool WriteSector(span<const uint8_t> buf, int);			// Sector Write
 
 	int GetTrack() const		{ return dt.track; }		// Get track
-
-	static statistics_map GetStatistics();
 };
diff --git a/cpp/piscsi/statistics_collector.cpp b/cpp/piscsi/statistics_collector.cpp
@@ -11,8 +11,9 @@
 
 statistics_map StatisticsCollector::GetStatistics() const
 {
-	statistics_map statistics = Disk::GetStatistics();
+	statistics_map statistics = DiskTrack::GetStatistics();
 	statistics.merge(DiskCache::GetStatistics());
+	statistics.merge(Disk::GetStatistics());
 
 	return statistics;
 }