6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-06 01:28:57 +00:00
Code Issues Projects Releases Wiki Activity

Uses Disk::flush_tracks to elide replacement of dirty tracks.

Browse Source
This commit is contained in:
Thomas Harte 2017-10-06 22:07:42 -04:00
parent 97a2be71e3
commit 53b99ea248
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Storage/Disk/Disk.hpp
View File

@ -23,7 +23,9 @@ namespace Disk {
class Disk {
public:
virtual ~Disk() {}
virtual ~Disk() {
flush_tracks();
}
/*!
@returns the number of discrete positions that this disk uses to model its complete surface area.

1
Storage/Disk/DiskImage/DiskImage.hpp
View File

@ -66,6 +66,7 @@ class DiskImage {
class DiskImageHolderBase: public Disk {
protected:
std::set<Track::Address> unwritten_tracks_;
std::map<Track::Address, std::shared_ptr<Track>> cached_tracks_;
std::unique_ptr<Concurrency::AsyncTaskQueue> update_queue_;
};

24
Storage/Disk/DiskImage/DiskImageImplementation.hpp
View File

@ -19,18 +19,30 @@ template <typename T> bool DiskImageHolder<T>::get_is_read_only() {
}
template <typename T> void DiskImageHolder<T>::flush_tracks() {
if(!unwritten_tracks_.empty()) {
if(!update_queue_) update_queue_.reset(new Concurrency::AsyncTaskQueue);
using TrackMap = std::map<Track::Address, std::shared_ptr<Track>>;
std::shared_ptr<TrackMap> track_copies(new TrackMap);
for(auto &address : unwritten_tracks_) {
track_copies->insert(std::make_pair(address, cached_tracks_[address]->clone()));
}
unwritten_tracks_.clear();
update_queue_->enqueue([this, track_copies]() {
// TODO: communicate these as a batch, not one by one.
for(auto &pair : *track_copies) {
disk_image_.set_track_at_position(pair.first, pair.second);
}
});
}
}
template <typename T> void DiskImageHolder<T>::set_track_at_position(Track::Address address, const std::shared_ptr<Track> &track) {
if(disk_image_.get_is_read_only()) return;
unwritten_tracks_.insert(address);
cached_tracks_[address] = track;
if(!update_queue_) update_queue_.reset(new Concurrency::AsyncTaskQueue);
std::shared_ptr<Track> track_copy(track->clone());
update_queue_->enqueue([this, address, track_copy] {
disk_image_.set_track_at_position(address, track_copy);
});
}
template <typename T> std::shared_ptr<Track> DiskImageHolder<T>::get_track_at_position(Track::Address address) {