Disk: ReadDriver: Add unified cache

Previously, we had to copy an entire block out of the
old cache every time we wanted to read even a single
byte from it.

This ended up being a fairly significant performance
issue, in addition to the fact that the caching code
was duplicated.

include/icsneo/disk/diskreaddriver.h

@@ -22,6 +22,9 @@ public:
 	virtual optional<uint64_t> readLogicalDisk(Communication& com, device_eventhandler_t report,
 		uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout = DefaultTimeout);
 
+	void invalidateCache(uint64_t pos = 0,
+		uint64_t amount = std::numeric_limits<uint32_t>::max() /* large value, but avoid overflow */);
+
 protected:
 	/**
 	 * Perform a read which the driver can do in one shot.
@@ -31,6 +34,15 @@ protected:
 	 */
 	virtual optional<uint64_t> readLogicalDiskAligned(Communication& com, device_eventhandler_t report,
 		uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout) = 0;
+
+private:
+	std::vector<uint8_t> cache;
+	uint64_t cachePos = 0;
+	std::chrono::time_point<std::chrono::steady_clock> cachedAt;
+
+	static constexpr const std::chrono::milliseconds CacheTime = std::chrono::milliseconds(1000);
+
+	optional<uint64_t> readFromCache(uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds staleAfter = CacheTime);
 };
 
 } // namespace Disk

include/icsneo/disk/extextractordiskreaddriver.h

@@ -24,13 +24,8 @@ public:
 
 private:
 	static constexpr const uint32_t MaxSize = Disk::SectorSize * 512;
-	static constexpr const std::chrono::seconds CacheTime = std::chrono::seconds(1);
 	static constexpr const uint8_t HeaderLength = 7;
 
-	std::array<uint8_t, MaxSize> cache;
-	uint64_t cachePos = 0;
-	std::chrono::time_point<std::chrono::steady_clock> cachedAt;
-
 	Access getPossibleAccess() const override { return Access::EntireCard; }
 
 	optional<uint64_t> readLogicalDiskAligned(Communication& com, device_eventhandler_t report,

include/icsneo/disk/neomemorydiskdriver.h

@@ -27,11 +27,6 @@ public:
 
 private:
 	static constexpr const uint8_t MemoryTypeSD = 0x01; // Logical Disk
-	static constexpr const std::chrono::seconds CacheTime = std::chrono::seconds(1);
-
-	std::array<uint8_t, SectorSize> cache;
-	uint64_t cachePos = 0;
-	std::chrono::time_point<std::chrono::steady_clock> cachedAt;
 
 	Access getPossibleAccess() const override { return Access::VSA; }
 

include/icsneo/disk/plasiondiskreaddriver.h

@@ -24,11 +24,6 @@ public:
 
 private:
 	static constexpr const uint32_t MaxSize = 65024;
-	static constexpr const std::chrono::seconds CacheTime = std::chrono::seconds(1);
-
-	std::array<uint8_t, MaxSize> cache;
-	uint64_t cachePos = 0;
-	std::chrono::time_point<std::chrono::steady_clock> cachedAt;
 
 	Access getPossibleAccess() const override { return Access::EntireCard; }