Skip to content

Commit

Permalink
[virtual machine] added load_snapshots_common to reduce the repeated …
Browse files Browse the repository at this point in the history
…code.
  • Loading branch information
georgeliao committed Nov 27, 2023
1 parent 218a86b commit 1d06601
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
29 changes: 14 additions & 15 deletions src/platform/backends/shared/base_virtual_machine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -350,34 +350,33 @@ void BaseVirtualMachine::delete_snapshot(const std::string& name)
mpl::log(mpl::Level::debug, vm_name, fmt::format("Snapshot deleted: {}", name));
}

void BaseVirtualMachine::load_snapshots()
void BaseVirtualMachine::load_snapshots_common(const std::function<void(const QString&)>& load_one_snapshot_function)

Check warning on line 353 in src/platform/backends/shared/base_virtual_machine.cpp

View check run for this annotation

Codecov / codecov/patch

src/platform/backends/shared/base_virtual_machine.cpp#L353

Added line #L353 was not covered by tests
{
const std::unique_lock lock{snapshot_mutex};

auto snapshot_files = MP_FILEOPS.entryInfoList(instance_dir,
{QString{"*.%1"}.arg(snapshot_extension)},
QDir::Filter::Files | QDir::Filter::Readable,
QDir::SortFlag::Name);
const auto snapshot_files = MP_FILEOPS.entryInfoList(instance_dir,
{QString{"*.%1"}.arg(snapshot_extension)},

Check warning on line 358 in src/platform/backends/shared/base_virtual_machine.cpp

View check run for this annotation

Codecov / codecov/patch

src/platform/backends/shared/base_virtual_machine.cpp#L357-L358

Added lines #L357 - L358 were not covered by tests
QDir::Filter::Files | QDir::Filter::Readable,
QDir::SortFlag::Name);

Check warning on line 360 in src/platform/backends/shared/base_virtual_machine.cpp

View check run for this annotation

Codecov / codecov/patch

src/platform/backends/shared/base_virtual_machine.cpp#L360

Added line #L360 was not covered by tests
for (const auto& finfo : snapshot_files)
load_snapshot(finfo.filePath());
load_one_snapshot_function(finfo.filePath());

Check warning on line 362 in src/platform/backends/shared/base_virtual_machine.cpp

View check run for this annotation

Codecov / codecov/patch

src/platform/backends/shared/base_virtual_machine.cpp#L362

Added line #L362 was not covered by tests

load_generic_snapshot_info();
}

void BaseVirtualMachine::load_snapshots()

Check warning on line 367 in src/platform/backends/shared/base_virtual_machine.cpp

View check run for this annotation

Codecov / codecov/patch

src/platform/backends/shared/base_virtual_machine.cpp#L367

Added line #L367 was not covered by tests
{
load_snapshots_common([this](const QString& file_path) -> void { load_snapshot(file_path); });

Check warning on line 369 in src/platform/backends/shared/base_virtual_machine.cpp

View check run for this annotation

Codecov / codecov/patch

src/platform/backends/shared/base_virtual_machine.cpp#L369

Added line #L369 was not covered by tests
}

void BaseVirtualMachine::load_snapshots_and_update_unique_identifiers(const VMSpecs& src_specs,

Check warning on line 372 in src/platform/backends/shared/base_virtual_machine.cpp

View check run for this annotation

Codecov / codecov/patch

src/platform/backends/shared/base_virtual_machine.cpp#L372

Added line #L372 was not covered by tests
const VMSpecs& dest_specs,
const std::string& src_vm_name)
{
const std::unique_lock lock{snapshot_mutex};

auto snapshot_files = MP_FILEOPS.entryInfoList(instance_dir,
{QString{"*.%1"}.arg(snapshot_extension)},
QDir::Filter::Files | QDir::Filter::Readable,
QDir::SortFlag::Name);
for (const auto& finfo : snapshot_files)
load_snapshot_and_update_unique_identifiers(finfo.filePath(), src_specs, dest_specs, src_vm_name);

load_generic_snapshot_info();
load_snapshots_common([this, &src_specs, &dest_specs, &src_vm_name](const QString& file_path) -> void {
load_snapshot_and_update_unique_identifiers(file_path, src_specs, dest_specs, src_vm_name);
});

Check warning on line 379 in src/platform/backends/shared/base_virtual_machine.cpp

View check run for this annotation

Codecov / codecov/patch

src/platform/backends/shared/base_virtual_machine.cpp#L377-L379

Added lines #L377 - L379 were not covered by tests
}

std::vector<std::string> BaseVirtualMachine::get_childrens_names(const Snapshot* parent) const
Expand Down
1 change: 1 addition & 0 deletions src/platform/backends/shared/base_virtual_machine.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ class BaseVirtualMachine : public VirtualMachine
private:
using SnapshotMap = std::unordered_map<std::string, std::shared_ptr<Snapshot>>;

void load_snapshots_common(const std::function<void(const QString&)>& load_function);
template <typename LockT>
void log_latest_snapshot(LockT lock) const;

Expand Down

0 comments on commit 1d06601

Please sign in to comment.