6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-11-07 21:17:27 +00:00
Code Issues Projects Releases Wiki Activity

Eliminate use of std::shared_ptr at DiskImage and below.

Browse Source
This commit is contained in:
Thomas Harte
2024-12-08 21:26:03 -05:00
parent aecd7f9283
commit 657960e7d0
38 changed files with 114 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,10 +22,10 @@ template <typename T> void DiskImageHolder<T>::flush_tracks() {
if(!unwritten_tracks_.empty()) {
if(!update_queue_) update_queue_ = std::make_unique<Concurrency::AsyncTaskQueue<true>>();
using TrackMap = std::map<Track::Address, std::shared_ptr<Track>>;
std::shared_ptr<TrackMap> track_copies(new TrackMap);
using TrackMap = std::map<Track::Address, std::unique_ptr<Track>>;
auto track_copies = std::make_shared<TrackMap>();
for(const auto &address : unwritten_tracks_) {
track_copies->insert({address, std::shared_ptr<Track>(cached_tracks_[address]->clone())});
track_copies->insert({address, std::unique_ptr<Track>(cached_tracks_[address]->clone())});
}
unwritten_tracks_.clear();
@@ -46,12 +46,13 @@ template <typename T> std::shared_ptr<Track> DiskImageHolder<T>::get_track_at_po
if(address.head >= get_head_count()) return nullptr;
if(address.position >= get_maximum_head_position()) return nullptr;
auto cached_track = cached_tracks_.find(address);
const auto canonical_address = disk_image_.canonical_address(address);
auto cached_track = cached_tracks_.find(canonical_address);
if(cached_track != cached_tracks_.end()) return cached_track->second;
std::shared_ptr<Track> track = disk_image_.get_track_at_position(address);
std::shared_ptr<Track> track = disk_image_.track_at_position(canonical_address);
if(!track) return nullptr;
cached_tracks_[address] = track;
cached_tracks_[canonical_address] = track;
return track;
}