salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rework the layout stuff to be more correct. Physical skew no longer affects the

Browse Source 
order in the resulting images.
This commit is contained in:
dg
2022-12-04 19:19:37 +00:00
parent e3219087c9
commit a91dee27e7
13 changed files with 167 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
tests/layout.cc Normal file
View File

@@ -0,0 +1,125 @@
#include "lib/globals.h"
#include "lib/bytes.h"
#include "lib/config.pb.h"
#include "lib/proto.h"
#include "lib/layout.h"
#include "snowhouse/snowhouse.h"
#include <google/protobuf/text_format.h>
#include <regex>
using namespace snowhouse;
static std::string cleanup(const std::string& s)
{
auto outs = std::regex_replace(s, std::regex("[ \t\n]+"), " ");
outs = std::regex_replace(outs, std::regex("^[ \t\n]+"), "");
outs = std::regex_replace(outs, std::regex("[ \t\n]+$"), "");
return outs;
}
static void load_config(const std::string s)
{
config.Clear();
if (!google::protobuf::TextFormat::MergeFromString(cleanup(s), &config))
Error() << "couldn't load test config";
}
static void test_physical_sectors()
{
load_config(R"M(
layout {
tracks: 78
sides: 2
layoutdata {
sector_size: 256
physical {
sector: 0
sector: 2
sector: 1
sector: 3
}
}
}
)M");
auto layout = Layout::getLayoutOfTrack(0, 0);
AssertThat(
layout->naturalSectorOrder, Equals(std::vector<unsigned>{0, 1, 2, 3}));
AssertThat(
layout->diskSectorOrder, Equals(std::vector<unsigned>{0, 2, 1, 3}));
AssertThat(layout->filesystemSectorOrder,
Equals(std::vector<unsigned>{0, 1, 2, 3}));
}
static void test_logical_sectors()
{
load_config(R"M(
layout {
tracks: 78
sides: 2
layoutdata {
sector_size: 256
physical {
sector: 0
sector: 1
sector: 2
sector: 3
}
filesystem {
sector: 0
sector: 2
sector: 1
sector: 3
}
}
}
)M");
auto layout = Layout::getLayoutOfTrack(0, 0);
AssertThat(
layout->naturalSectorOrder, Equals(std::vector<unsigned>{0, 1, 2, 3}));
AssertThat(
layout->diskSectorOrder, Equals(std::vector<unsigned>{0, 1, 2, 3}));
AssertThat(layout->filesystemSectorOrder,
Equals(std::vector<unsigned>{0, 2, 1, 3}));
}
static void test_both_sectors()
{
load_config(R"M(
layout {
tracks: 78
sides: 2
layoutdata {
sector_size: 256
physical {
sector: 3
sector: 2
sector: 1
sector: 0
}
filesystem {
sector: 0
sector: 2
sector: 1
sector: 3
}
}
}
)M");
auto layout = Layout::getLayoutOfTrack(0, 0);
AssertThat(
layout->naturalSectorOrder, Equals(std::vector<unsigned>{0, 1, 2, 3}));
AssertThat(
layout->diskSectorOrder, Equals(std::vector<unsigned>{3, 2, 1, 0}));
AssertThat(layout->filesystemSectorOrder,
Equals(std::vector<unsigned>{0, 2, 1, 3}));
}
int main(int argc, const char* argv[])
{
test_physical_sectors();
test_logical_sectors();
test_both_sectors();
}