Finished (theoretically) file extraction.

Created DataExtractor & DataReader
Created Lookup tables

README.md

@@ -10,13 +10,9 @@ Overall works, but currently is missing some features ([see below](#capabilities
 
 ## Build options
 
-> `-Duse_zig_decomp=true`
+> `-Duse_c_libs=true`
 
-Instead of using C libraries for decompression, use Zig's standard library for decompression. If using this option LZO and LZ4 decomrpession types are unsupported and decompression times will be significantly longer.
+Instead of using Zig's standard library for decompression, use the system's C libraries. Has the benefit of being much faster and enabling LZO and LZ4 decompression.
-
-> `-Ddynamic=true`
-
-Dynamicly link C libraries (if they're used) instead of statically linking them.
 
 > `-Dallow_lzo=true`
 
@@ -39,22 +35,22 @@ Most features are present except for the following:
 
 ## Performance
 
-This is some basic observation's I've made about this library's performance when compared to `unsquashfs`. Unless otherwise stated, most observations were made when extracting my test archive which is fairly small and uses zstd compression with `-Doptimize=ReleaseFast`.
+This is some basic observation's I've made about this library's performance when compared to `unsquashfs`. Unless otherwise stated, most observations were made when extracting my test archive (which is fairly small and uses zstd compression) and with `--release=fast`.
 
 Currently, my only performance checks are checking execution time, nothing deeper.
 
-* Currently, using my test archive, performance aproximately matches `unsquashfs` when multi-threaded, but significantly slower when single-threaded.
+* Under ideal circumstances, my library is ~70% slower (.12s vs .20s).
-* Using Zig decompression libraries *significantly* increases decompression time by 5x. Under ideal circumstances.
+* Using Zig decompression libraries *significantly* increases decompression time by ~600%. Under ideal circumstances.
 * Performance improvements/regressions will be common. I'm still learning Zig.
 
 Example Times:
 
-* *unsquashfs, multi-threaded*: .15s
+* *unsquashfs, multi-threaded*: .12s
-* *unsquashfs, single-threaded*: .16s
+* *unsquashfs, single-threaded*: .13s
-* *C-libs, single-threaded*: .36s
+* *C-libs, single-threaded*: .45s
-* *C-libs, multi-threaded*: .14s
+* *C-libs, multi-threaded*: .20s
-* *Zig-libs, single-threaded*: CURRENTLY UNTESTED
+* *Zig-libs, single-threaded*: 5.78s
-* *Zig-libs, multi-threaded*: .76s
+* *Zig-libs, multi-threaded*: 1.08s
 
 ## Build considerations
 

benchmark.sh

@@ -1,17 +0,0 @@
-#! /usr/bin/env bash
-
-ARCHIVE="testing/LinuxPATest.sfs"
-
-REF_EXT_LOC="testing/LinuxPAReference"
-PROG_EXT_LOC="testing/LinuxPABinTest"
-
-echo "Testing Multi-threaded Performance"
-echo ""
-
-hyperfine --warmup 5 --prepare "rm -rf $REF_EXT_LOC && rm -rf $PROG_EXT_LOC" "unsquashfs -d $REF_EXT_LOC $ARCHIVE" "zig-out/bin/unsquashfs -d $PROG_EXT_LOC $ARCHIVE"
-
-echo ""
-echo "Testing Single-threaded Performance"
-echo ""
-
-hyperfine --warmup 5 --prepare "rm -rf $REF_EXT_LOC && rm -rf $PROG_EXT_LOC" "unsquashfs -p 1 -d $REF_EXT_LOC $ARCHIVE" "zig-out/bin/unsquashfs -p 1 -d $PROG_EXT_LOC $ARCHIVE"

build.zig

@@ -1,195 +1,125 @@
 const std = @import("std");
+const Build = std.Build;
 
 pub fn build(b: *std.Build) !void {
     const use_zig_decomp = b.option(bool, "use_zig_decomp", "Use zig standard library for decompression.") orelse false;
-    const allow_lzo = b.option(bool, "allow_lzo", "Compile with lzo support") orelse false;
+    const allow_lzo = b.option(bool, "allow_lzo", "Compile with lzo decompression support.") orelse false;
-<<<<<<< HEAD
+    const dynamic = b.option(bool, "dynamic", "Dynamic link C decompression libraries.") orelse false;
-=======
+    const debug = b.option(bool, "debug", "Enable options to make debugging easier.") orelse false;
-    const dynamic = b.option(bool, "dynamic", "Dynamicly link C decompression libraries") orelse false;
+    const version_string = b.option([]const u8, "version", "Version of the library/binary") orelse "0.0.0-testing";
->>>>>>> dfbfbda (Build is working again (on Zig master branch))
+
-    var debug = b.option(bool, "debug", "Enable options to make debugging easier.");
+    const version: std.SemanticVersion = try .parse(version_string);
-    const version_string_option = b.option([]const u8, "version", "Version of the library/binary");
 
     const zig_squashfs_options = b.addOptions();
     zig_squashfs_options.addOption(bool, "use_zig_decomp", use_zig_decomp);
     zig_squashfs_options.addOption(bool, "allow_lzo", allow_lzo);
 
+    const optimize = b.standardOptimizeOption(.{});
     const target = b.standardTargetOptions(.{});
-    var optimize = b.standardOptimizeOption(.{});
-
-    if (debug == true)
-        optimize = .Debug;
-    if (optimize == .Debug)
-        debug = true;
 
     const c = b.addTranslateC(.{
         .optimize = optimize,
         .target = target,
         .root_source_file = b.path("src/c.h"),
     });
+    if (allow_lzo)
+        c.defineCMacro("ALLOW_LZO", null);
+    if (dynamic) {
+        c.linkSystemLibrary("z", .{});
+        c.linkSystemLibrary("lzma", .{});
+        c.linkSystemLibrary("lz4", .{});
+        c.linkSystemLibrary("zstd", .{});
+        if (allow_lzo)
+            c.linkSystemLibrary("minilzo", .{});
+    }
+
+    const deps = try getDependencies(b, optimize, target, allow_lzo);
 
     const lib = b.addLibrary(.{
         .name = "squashfs",
+        .use_llvm = debug,
+        .version = version,
         .root_module = b.createModule(.{
-            .optimize = if (debug == true) .Debug else optimize,
-            .target = target,
-            .valgrind = debug,
-            .root_source_file = b.path("src/root.zig"),
-<<<<<<< HEAD
-            // .link_libc = true,
             .imports = &.{
                 .{ .name = "options", .module = zig_squashfs_options.createModule() },
                 .{ .name = "c", .module = c.createModule() },
-=======
-            .imports = &.{
-                .{ .name = "options", .module = zig_squashfs_options.createModule() },
->>>>>>> dfbfbda (Build is working again (on Zig master branch))
             },
-        }),
-        .use_llvm = debug,
-    });
-
-    const deps = try dependencies(b, optimize, target, use_zig_decomp, allow_lzo, dynamic);
-    defer b.allocator.free(deps);
-
-<<<<<<< HEAD
-    const zng = b.dependency("zlib_ng", .{ .optimize = optimize, .target = target });
-    lib.root_module.linkLibrary(zng.artifact("zng"));
-
-    const xz = b.dependency("xz", .{ .optimize = optimize, .target = target });
-    lib.root_module.linkLibrary(xz.artifact("lzma"));
-
-    const minilzo = b.dependency("minilzo", .{ .optimize = optimize, .target = target });
-    lib.root_module.linkLibrary(minilzo.artifact("minilzo"));
-
-    const lz4 = b.dependency("lz4", .{ .optimize = optimize, .target = target });
-    lib.root_module.linkLibrary(lz4.artifact("lz4"));
-=======
-    for (deps) |d|
-        lib.root_module.linkLibrary(d);
-
-    if (!use_zig_decomp) {
-        const c = b.addTranslateC(.{
-            .optimize = optimize,
-            .target = target,
-            .root_source_file = b.path("src/c.h"),
-        });
-        if (allow_lzo) c.defineCMacro("ALLOW_LZO", null);
-        lib.root_module.addImport("c", c.createModule());
-
-        if (dynamic)
-            dynamicLinkLibraries(c, allow_lzo);
-    }
->>>>>>> dfbfbda (Build is working again (on Zig master branch))
-
-    var version = version_string_option orelse "0.0.0-testing";
-    if (version[0] == 'v') version = version[1..];
-    const unsquashfs_options = b.addOptions();
-    unsquashfs_options.addOption(
-        std.SemanticVersion,
-        "version",
-        try std.SemanticVersion.parse(version),
-    );
-    const exe = b.addExecutable(.{
-        .name = "unsquashfs",
-        .root_module = b.createModule(.{
-            .optimize = if (debug == true) .Debug else optimize,
-            .target = target,
-            .valgrind = debug,
-            .root_source_file = b.path("src/bin/unsquashfs.zig"),
-            .imports = &.{
-                .{ .name = "zig_squashfs", .module = lib.root_module },
-            },
-        }),
-        .use_llvm = debug,
-    });
-    exe.root_module.addOptions("config", unsquashfs_options);
-
-    b.installArtifact(lib);
-    b.installArtifact(exe);
-
-    const mod_tests = b.addTest(.{
-        .root_module = b.createModule(.{
             .optimize = optimize,
             .target = target,
             .root_source_file = b.path("src/root.zig"),
-            .imports = &.{
-                .{ .name = "options", .module = zig_squashfs_options.createModule() },
-            },
             .valgrind = debug,
         }),
-        .use_llvm = debug,
     });
 
     for (deps) |d|
-        mod_tests.root_module.linkLibrary(d);
+        lib.root_module.linkLibrary(d);
 
-    if (!use_zig_decomp) {
+    b.installArtifact(lib);
-        const c = b.addTranslateC(.{
+
+    const exe_config = b.addOptions();
+    exe_config.addOption(std.SemanticVersion,"version", version);
+
+    const exe = b.addExecutable(.{
+        .name = "unsquashfs",
+        .use_llvm = debug,
+        .version = version,
+        .root_module = b.createModule(.{
             .optimize = optimize,
             .target = target,
-            .root_source_file = b.path("src/c.h"),
+            .root_source_file = b.path("src/bin/unsquashfs.zig"),
+            .valgrind = debug,
+            .imports = &.{
+                .{ .name = "config", .module = exe_config.createModule() },
+                .{ .name = "squashfs", .module = lib.root_module }
+            },
+        }),
     });
-        mod_tests.root_module.addImport("c", c.createModule());
-        if (allow_lzo) c.defineCMacro("ALLOW_LZO", null);
 
-        if (dynamic)
+    b.installArtifact(exe);
-            dynamicLinkLibraries(c, allow_lzo);
-    }
 
-    const run_mod_tests = b.addRunArtifact(mod_tests);
+    const lib_test = b.addTest(.{
-    const test_step = b.step("test", "Run tests");
+        .name = "squashfs-test",
-    test_step.dependOn(&run_mod_tests.step);
-
-    // zls build check steps
-    const lib_check = b.addLibrary(.{
-        .name = "squashfs",
-        .root_module = exe.root_module,
-    });
-    const exe_check = b.addExecutable(.{
-        .name = "unsquashfs",
         .root_module = lib.root_module,
     });
-    const check = b.step("check", "Check if unsquashfs compiles");
+    const test_step = b.step("test", "Run tests");
+    test_step.dependOn(&lib_test.step);
+
+    // zls check step
+    const lib_check = b.addLibrary(.{
+        .name = "squashfs-check",
+        .root_module = lib.root_module,
+    });
+    const exe_check = b.addLibrary(.{
+        .name = "unsquashfs-check",
+        .root_module = exe.root_module,
+    });
+
+    const check = b.step("check", "Check if squashfs compiles");
     check.dependOn(&lib_check.step);
     check.dependOn(&exe_check.step);
 }
 
-pub fn dynamicLinkLibraries(mod: *std.Build.Step.TranslateC, allow_lzo: bool) void {
+fn getDependencies(b: *Build, optimize: std.builtin.OptimizeMode, target: Build.ResolvedTarget, allow_lzo: bool) ![]*Build.Step.Compile {
-    mod.linkSystemLibrary("zstd", .{});
+    const alloc = b.allocator;
-    mod.linkSystemLibrary("zlib-ng", .{});
-    mod.linkSystemLibrary("lzma", .{});
-    mod.linkSystemLibrary("lz4", .{});
-    if (allow_lzo)
-        mod.linkSystemLibrary("minilzo", .{});
-}
-fn dependencies(
-    b: *std.Build,
-    optimize: std.builtin.OptimizeMode,
-    target: std.Build.ResolvedTarget,
-    use_zig_decomp: bool,
-    allow_lzo: bool,
-    dynamic: bool,
-) ![]*std.Build.Step.Compile {
-    if (use_zig_decomp or dynamic) return &.{};
 
-    var list: std.ArrayList(*std.Build.Step.Compile) = .empty;
+    var list: std.ArrayList(*Build.Step.Compile) = .empty;
 
-    const zstd = b.dependency("zstd", .{ .optimize = optimize, .target = target });
+    const zlib_ng = b.dependency("zlib_ng", .{ .optimize = optimize, .target = target });
-    try list.append(b.allocator, zstd.artifact("zstd"));
+    try list.append(alloc, zlib_ng.artifact("zng"));
-
-    const zng = b.dependency("zlib_ng", .{ .optimize = optimize, .target = target });
-    try list.append(b.allocator, zng.artifact("zng"));
 
     const xz = b.dependency("xz", .{ .optimize = optimize, .target = target });
-    try list.append(b.allocator, xz.artifact("lzma"));
+    try list.append(alloc, xz.artifact("lzma"));
 
     const lz4 = b.dependency("lz4", .{ .optimize = optimize, .target = target });
-    try list.append(b.allocator, lz4.artifact("lz4"));
+    try list.append(alloc, lz4.artifact("lz4"));
+
+    const zstd = b.dependency("zstd", .{ .optimize = optimize, .target = target });
+    try list.append(alloc, zstd.artifact("zstd"));
 
     if (allow_lzo) {
         const minilzo = b.dependency("minilzo", .{ .optimize = optimize, .target = target });
-        try list.append(b.allocator, minilzo.artifact("minilzo"));
+        try list.append(alloc, minilzo.artifact("minilzo"));
     }
+
     return list.toOwnedSlice(b.allocator);
 }

build.zig.zon

@@ -2,7 +2,7 @@
     .name = .squashfs,
     .version = "0.0.6",
     .fingerprint = 0x37ba29474b87f145, // Changing this has security and trust implications.
-    .minimum_zig_version = "0.15.2",
+    .minimum_zig_version = "0.16.0",
     .dependencies = .{
         .zlib_ng = .{
             .url = "git+https://github.com/CalebQ42/zig-zlib-ng#5f2f02dfb28acca2517dacbbd09e9b987f57b133",

run_tests.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+zig test \
+	-lc \
+	-lz \
+	-llzma \
+	-lminilzo \
+	-llz4 \
+	-lzstd \
+		src/test.zig

src/archive.zig

@@ -1,125 +1,93 @@
 const std = @import("std");
 const Io = std.Io;
+const File = Io.File;
+const MemoryMap = File.MemoryMap;
 
 const Decomp = @import("decomp.zig");
+const DecompCache = @import("decomp_cache.zig");
+const Extract = @import("extract.zig");
 const ExtractionOptions = @import("options.zig");
-const File = @import("file.zig");
 const Inode = @import("inode.zig");
-const LookupTable = @import("lookup_table.zig");
+const SfsFile = @import("file.zig");
-const Decompressor = @import("util/decompressor.zig");
-const MetadataReader = @import("util/metadata.zig");
-const Utils = @import("util/misc.zig");
-const OffsetFile = @import("util/offset_file.zig");
 
 const Archive = @This();
 
-file: OffsetFile,
+const CACHE_MEM_MAX = 1024 * 1024 * 1024;
+
 super: Superblock,
 
-stateless_decomp: *const Decompressor,
+cache: DecompCache,
 
-pub fn init(io: Io, file: std.Io.File, offset: u64) !Archive {
+pub fn init(alloc: std.mem.Allocator, io: Io, fil: File) !Archive {
-    var rdr = file.reader(io, &[0]u8{});
+    return initAdvanced(alloc, io, fil, 0, 0);
+}
+pub fn initAdvanced(alloc: std.mem.Allocator, io: Io, fil: File, offset: u64, cache_memory_max: u64) !Archive {
+    var rdr = fil.reader(io, &[0]u8{});
     try rdr.seekTo(offset);
     var super: Superblock = undefined;
     try rdr.interface.readSliceEndian(Superblock, @ptrCast(&super), .little);
     try super.validate();
 
+    const map = try fil.createMemoryMap(io, .{
+        .offset = offset,
+        .len = super.size,
+        .protection = .{ .read = true },
+    });
+
     return .{
-        .file = try .init(io, file, super.size, offset),
         .super = super,
 
-        .stateless_decomp = try Decomp.StatelessDecomp(super.compression),
+        .cache = try .init(
+            alloc,
+            map,
+            super.compression,
+            if (cache_memory_max != 0)
+                cache_memory_max
+            else
+                @min(CACHE_MEM_MAX, (try std.process.totalSystemMemory()) / 2),
+        ),
     };
 }
 pub fn deinit(self: *Archive, io: Io) void {
-    self.file.deinit(io);
+    self.cache.deinit(io);
 }
 
-/// The root folder of the Archive. Used to open other Files.
+pub fn root(self: *Archive, alloc: std.mem.Allocator, io: Io) !SfsFile {
-pub fn root(self: Archive, alloc: std.mem.Allocator) !File {
+    const inode: Inode = try .initRef(
-    const root_inode = try Utils.inodeFromRef(
         alloc,
-        self.file,
+        io,
-        self.stateless_decomp,
+        &self.cache,
         self.super.inode_start,
         self.super.block_size,
         self.super.root_ref,
     );
-    return .init(alloc, self, root_inode, "");
+    return .init(alloc, self, inode, "");
 }
-/// Opens a File within the archive.
+pub fn open(self: *Archive, alloc: std.mem.Allocator, io: Io, filepath: []const u8) !SfsFile {
-pub fn open(self: Archive, alloc: std.mem.Allocator, io: Io, filepath: []const u8) !File {
-    const root_file = try self.root(alloc);
     const path = std.mem.trim(u8, filepath, "/");
-    if (Utils.pathIsSelf(path))
+
-        return root_file;
+    var root_file = try self.root(alloc, io);
+
+    if (path.len == 0 or path[0] == '.') return root_file;
+
     defer root_file.deinit();
     return root_file.open(alloc, io, filepath);
 }
 
-/// Returns the inode with the given inode number.
+pub fn extract(self: *Archive, alloc: std.mem.Allocator, io: Io, ext_loc: []const u8, options: ExtractionOptions) !void {
-/// Requires that the archive is exportable (has an export lookup table).
+    const root_inode: Inode = try .initRef(
-pub fn inode(self: Archive, alloc: std.mem.Allocator, io: Io, num: u32) !Inode {
-    if (!self.super.flags.exportable)
-        return error.NotExportable;
-    const ref = try LookupTable.lookupValue(
-        Inode.Ref,
         alloc,
         io,
-        &self.stateless_decomp,
+        &self.cache,
-        self.file,
-        self.super.export_start,
-        num + 1,
-    );
-    return Utils.inodeFromRef(
-        alloc,
-        io,
-        self.file,
-        &self.stateless_decomp,
-        self.super.inode_start,
-        self.super.block_size,
-        ref,
-    );
-}
-/// Returns a value at the given index from the Archive's id (uid/gid) table.
-pub fn idTable(self: Archive, alloc: std.mem.Allocator, io: Io, idx: u32) !u16 {
-    return LookupTable.lookupValue(
-        u16,
-        alloc,
-        io,
-        &self.stateless_decomp,
-        self.file,
-        self.super.id_start,
-        idx,
-    );
-}
-
-/// Extract the entire archive contents to the given directory.
-pub fn extract(self: Archive, alloc: std.mem.Allocator, io: Io, extract_dir: []const u8, options: ExtractionOptions) !void {
-    const root_inode = try Utils.inodeFromRef(
-        alloc,
-        self.file,
-        self.stateless_decomp,
         self.super.inode_start,
         self.super.block_size,
         self.super.root_ref,
     );
-    return root_inode.extract(alloc, io, self.file, self.super, extract_dir, options);
+    return Extract.extract(alloc, io, root_inode, &self.cache, self.super, ext_loc, options);
 }
 
 // Superblock
 
-const SQUASHFS_MAGIC: u32 = std.mem.readInt(u32, "hsqs", .little);
-
-const SuperblockError = error{
-    InvalidMagic,
-    InvalidBlockLog,
-    InvalidVersion,
-    InvalidCheck,
-};
-
-/// A squashfs Superblock
 pub const Superblock = extern struct {
     magic: u32,
     inode_count: u32,
@@ -133,14 +101,14 @@ pub const Superblock = extern struct {
         data_uncompressed: bool,
         check: bool,
         frag_uncompressed: bool,
-        fragment_never: bool,
+        frag_never: bool,
-        fragment_always: bool,
+        frag_always: bool,
-        duplicates: bool,
+        de_dupe: bool,
         exportable: bool,
         xattr_uncompressed: bool,
         xattr_never: bool,
         compression_options: bool,
-        ids_uncompressed: bool,
+        id_uncompressed: bool,
         _: u4,
     },
     id_count: u16,
@@ -155,134 +123,63 @@ pub const Superblock = extern struct {
     frag_start: u64,
     export_start: u64,
 
-    /// Validate the Superblock. If an error is returned, it's likely the archive is corrupted or not a squashfs archive.
     pub fn validate(self: Superblock) !void {
-        if (self.magic != SQUASHFS_MAGIC)
+        if (self.magic != std.mem.readInt(u32, "hsqs", .little))
-            return SuperblockError.InvalidMagic;
+            return error.BadMagic;
-        if (self.flags.check)
-            return SuperblockError.InvalidCheck;
         if (self.ver_maj != 4 or self.ver_min != 0)
-            return SuperblockError.InvalidVersion;
+            return error.InvalidVersion;
-        if (std.math.log2(self.block_size) != self.block_log)
+        if (self.block_log != std.math.log2(self.block_size))
-            return SuperblockError.InvalidBlockLog;
+            return error.BadBlockLog;
+        if (self.flags.check)
+            return error.BadCheckFlag;
     }
 };
 
-// Tests
+// Test
 
 const TestArchive = "testing/LinuxPATest.sfs";
 
 test "Basics" {
-    std.debug.print("Starting test: Basics...\n", .{});
-
     const alloc = std.testing.allocator;
     const io = std.testing.io;
 
-    var fil = try Io.Dir.cwd().openFile(io, TestArchive, .{});
+    var archive_file = try Io.Dir.cwd().openFile(io, TestArchive, .{});
-    defer fil.close(io);
+    defer archive_file.close(io);
-    var sfs: Archive = try .init(io, fil, 0);
+    var arc: Archive = try .init(alloc, io, archive_file);
-    defer sfs.deinit(io);
+    defer arc.deinit(io);
-    try std.testing.expectEqualDeep(sfs.super, LinuxPATestCorrectSuperblock);
+
-    const root_file = try sfs.root(alloc);
+    var root_file = try arc.root(alloc, io);
     defer root_file.deinit();
 }
 
 const TestFile = "Start.exe";
 const TestFileExtractLocation = "testing/Start.exe";
 
-test "ExtractSingleFile" {
+test "SingleFileExtraction" {
-    std.debug.print("Starting test: ExtractSingleFile...\n", .{});
-
     const alloc = std.testing.allocator;
     const io = std.testing.io;
 
-    Io.Dir.cwd().deleteFile(io, TestFileExtractLocation) catch {};
+    var archive_file = try Io.Dir.cwd().openFile(io, TestArchive, .{});
-    var fil = try Io.Dir.cwd().openFile(io, TestArchive, .{});
+    defer archive_file.close(io);
-    defer fil.close(io);
+    var arc: Archive = try .init(alloc, io, archive_file);
-    var sfs: Archive = try .init(io, fil, 0);
+    defer arc.deinit(io);
-    defer sfs.deinit(io);
+
-    var test_fil = try sfs.open(alloc, io, TestFile);
+    var ext_file = try arc.open(alloc, io, TestFile);
-    defer test_fil.deinit();
+    defer ext_file.deinit();
-    try test_fil.extract(alloc, io, TestFileExtractLocation, .default);
+
-    //TODO: validate extracted file.
+    try ext_file.extract(alloc, io, TestFileExtractLocation, .default);
 }
 
 const TestFullExtractLocation = "testing/TestExtract";
 
-test "ExtractCompleteArchive" {
+test "FullExtraction" {
-    std.debug.print("Starting test: ExtractCompleteArchive...\n", .{});
-
     const alloc = std.testing.allocator;
     const io = std.testing.io;
 
-    Io.Dir.cwd().deleteTree(io, TestFullExtractLocation) catch {};
+    var archive_file = try Io.Dir.cwd().openFile(io, TestArchive, .{});
-    var fil = try Io.Dir.cwd().openFile(io, TestArchive, .{});
+    defer archive_file.close(io);
-    defer fil.close(io);
+    var arc: Archive = try .init(alloc, io, archive_file);
-    var sfs: Archive = try .init(io, fil, 0);
+    defer arc.deinit(io);
-    defer sfs.deinit(io);
-    try sfs.extract(alloc, io, TestFullExtractLocation, .default);
-}
 
-test "ExtractCompleteArchiveSingleThreaded" {
+    try arc.extract(alloc, io, TestFullExtractLocation, .default);
-    std.debug.print("Starting test: ExtractCompleteArchive...\n", .{});
-
-    const alloc = std.testing.allocator;
-    const io = std.testing.io;
-
-    var fil = try Io.Dir.cwd().openFile(io, TestArchive, .{});
-    defer fil.close(io);
-    {
-        std.debug.print("First testing using Threaded.global_single_threaded...\n", .{});
-        Io.Dir.cwd().deleteTree(io, TestFullExtractLocation) catch {};
-        var sfs: Archive = try .init(Io.Threaded.global_single_threaded.io(), fil, 0);
-        defer sfs.deinit(Io.Threaded.global_single_threaded.io());
-        try sfs.extract(alloc, Io.Threaded.global_single_threaded.io(), TestFullExtractLocation, .default);
 }
-    {
-        std.debug.print("Next testing using ExtractionOptions.single_threaded...\n", .{});
-        Io.Dir.cwd().deleteTree(io, TestFullExtractLocation) catch {};
-        var sfs: Archive = try .init(io, fil, 0);
-        defer sfs.deinit(io);
-        try sfs.extract(alloc, io, TestFullExtractLocation, .default_single_threaded);
-    }
-}
-
-const LinuxPATestCorrectSuperblock: Superblock = .{
-    .magic = std.mem.readInt(u32, "hsqs", .little),
-    .inode_count = 2974,
-    .mod_time = 1632696724,
-    .block_size = 131072,
-    .frag_count = 264,
-    .compression = .zstd,
-    .block_log = 17,
-    .flags = .{
-        .inode_uncompressed = false,
-        .data_uncompressed = false,
-        .check = false,
-        .frag_uncompressed = false,
-        .fragment_never = false,
-        .fragment_always = false,
-        .duplicates = true,
-        .exportable = true,
-        .xattr_uncompressed = false,
-        .xattr_never = false,
-        .compression_options = false,
-        .ids_uncompressed = false,
-        ._ = 0,
-    },
-    .id_count = 1,
-    .ver_maj = 4,
-    .ver_min = 0,
-    .root_ref = .{
-        .block_offset = 1363,
-        .block_start = 29237,
-        ._ = 0,
-    },
-    .size = 106841744,
-    .id_start = 106841632,
-    .xattr_start = 106841720,
-    .inode_start = 106778274,
-    .dir_start = 106807998,
-    .frag_start = 106837747,
-    .export_start = 106841602,
-};

src/bin/unsquashfs.zig

@@ -1,10 +1,11 @@
 const std = @import("std");
 const Io = std.Io;
 const Writer = Io.Writer;
+const File = Io.File;
 const builtin = @import("builtin");
 
 const config = @import("config");
-const squashfs = @import("zig_squashfs");
+const squashfs = @import("squashfs");
 
 //TODO: Add more options
 const help_mgs =
@@ -18,7 +19,7 @@ const help_mgs =
     \\  -dx             Don't set xattr values
     \\  -dp             Don't set permissions (includes setting uid & gid owner)
     \\
-    \\  -p <threads>    Specify how many threads to use. If not present or zero, the system's logical cores count is used.
+    \\  -p <threads>    Specify how many threads to use. If no present or zero, the system's logical cores count is used.
     \\  -v              Verbose
     \\
     \\  --force         Force extraction. If the destination already exists, it will be deleted.
@@ -43,48 +44,34 @@ pub fn main(init: std.process.Init) !void {
     const alloc = init.gpa;
     const io = init.io;
 
-    var stdout = std.Io.File.stdout();
+    var stdout = File.stdout();
-    defer stdout.close(io);
     var out = stdout.writer(io, &[0]u8{});
     defer out.interface.flush() catch {};
-
     try handleArgs(init.minimal.args, &out.interface);
     if (archive.len == 0) {
         try out.interface.print("You must provide a squashfs archive\n", .{});
         try out.interface.print(help_mgs, .{});
         return;
     }
-
+    var fil: File = try Io.Dir.cwd().openFile(io, archive, .{}); //TODO: Handle error gracefully.
-    var fil = try Io.Dir.cwd().openFile(io, archive, .{}); //TODO: Handle error gracefully.
     defer fil.close(io);
-
+    var arc: squashfs.Archive = try .initAdvanced(alloc, io, fil, offset, 0); //TODO: Update when memory size matters. //TODO: Handle error gracefully.
-    var arc: squashfs.Archive = try .init(io, fil, offset); //TODO: Handle error gracefully.
+    defer arc.deinit(io);
     const options: squashfs.ExtractionOptions = .{
-        .single_threaded = threads == 1,
         .verbose = verbose,
         .verbose_writer = if (verbose) &out.interface else null,
         .ignore_xattr = ignore_xattrs,
         .ignore_permissions = ignore_permissions,
     };
-
     if (force)
         try Io.Dir.cwd().deleteTree(io, extLoc);
-    if (threads != 0) {
+    try arc.extract(alloc, io, extLoc, options); //TODO: Handle error gracefully.
-        var limited_io = Io.Threaded.init(alloc, .{
-            .async_limit = .limited(threads - 1),
-            .concurrent_limit = .limited(threads - 1),
-            .argv0 = .init(init.minimal.args),
-            .environ = init.minimal.environ,
-        });
-        return arc.extract(alloc, limited_io.io(), extLoc, options); //TODO: Handle error gracefully.
-    }
-    return arc.extract(alloc, io, extLoc, options); //TODO: Handle error gracefully.
 }
 
 fn handleArgs(args: std.process.Args, out: *Writer) !void {
     var arg_iter = args.iterate();
     defer arg_iter.deinit();
-    _ = arg_iter.next(); // args[0] is the application launch command.
+    _ = arg_iter.skip(); // args[0] is the application launch command.
     while (arg_iter.next()) |arg| {
         if (std.mem.eql(u8, arg, "-o")) {
             const nxt = arg_iter.next();

src/c.h

@@ -1,5 +1,7 @@
-#include <zstd.h>
+#include <zlib.h>
-#include <zlib-ng.h>
+#include <lzma.h>
-// #include <lzma.h>
-#include <lzo/minilzo.h>
 #include <lz4.h>
+#include <zstd.h>
+#ifdef ALLOW_LZO
+#include <lzo/minilzo.h>
+#endif

src/c_decomp.zig

@@ -0,0 +1,61 @@
+const std = @import("std");
+
+const c = @import("c");
+
+const Error = @import("decomp.zig").Error;
+
+pub fn zlibDecompress(_: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
+    var strem: c.z_stream = .{
+        .next_in = in.ptr,
+        .avail_in = @truncate(in.len),
+        .next_out = out.ptr,
+        .avail_out = @truncate(out.len),
+    };
+    var res = c.inflateInit(&strem);
+    if (res != c.Z_OK) return Error.ReadFailed;
+    defer _ = c.inflateEnd(&strem);
+
+    res = c.inflate(&strem, c.Z_FULL_FLUSH);
+    if (res != c.Z_OK) return Error.ReadFailed;
+
+    return strem.total_out;
+}
+pub fn lzmaDecompress(_: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
+    var strem: c.lzma_stream = .{
+        .next_in = in.ptr,
+        .avail_in = in.len,
+        .next_out = out.ptr,
+        .avail_out = out.len,
+    };
+    var res = c.lzma_auto_decoder(&strem, out.len * 2, 0);
+    if (res != c.LZMA_OK) return Error.ReadFailed;
+    defer c.lzma_end(&strem);
+
+    while (res == c.LZMA_OK)
+        res = c.lzma_code(&strem, c.LZMA_RUN);
+    if (res != c.LZMA_FINISH) return Error.ReadFailed;
+
+    return strem.total_out;
+}
+pub fn lzoDecompress(_: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
+    var out_len = out.len;
+    const res = c.lzo1x_decompress(in.ptr, in.len, out.ptr, &out_len, null);
+    if (res != c.LZO_E_OK) return Error.ReadFailed;
+    return out_len;
+}
+pub fn lz4Decompress(_: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
+    const res = c.LZ4_decompress_safe(
+        in.ptr,
+        out.ptr,
+        @bitCast(@as(u32, @truncate(in.len))),
+        @bitCast(@as(u32, @truncate(out.len))),
+    );
+    if (res < 0) return Error.ReadFailed;
+    return @abs(res);
+}
+pub fn zstdDecompress(_: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
+    const res = c.ZSTD_decompress(out.ptr, out.len, in.ptr, in.len);
+    if (c.ZSTD_isError(res) != 0)
+        return Error.ReadFailed;
+    return res;
+}

src/data/extractor.zig

@@ -0,0 +1,102 @@
+const std = @import("std");
+const Io = std.Io;
+
+const DecompCache = @import("../decomp_cache.zig");
+const DataBlock = @import("../inode.zig").DataBlock;
+
+const Extractor = @This();
+
+cache: *DecompCache,
+block_size: u32,
+
+start: u64,
+size: u64,
+blocks: []DataBlock,
+
+frag_data: ?[]u8 = null,
+frag_offset: u32 = 0,
+
+pub fn init(cache: *DecompCache, block_size: u32, size: u64, start: u64, blocks: []DataBlock) Extractor {
+    return .{
+        .cache = cache,
+        .block_size = block_size,
+
+        .start = start,
+        .size = size,
+        .blocks = blocks,
+    };
+}
+
+pub fn addFragment(self: *Extractor, data: []u8, offset: u32) void {
+    self.frag_data = data;
+    self.frag_offset = offset;
+}
+
+pub fn asyncExtract(self: Extractor, io: Io, fil: Io.File) Error!void {
+    try fil.writePositionalAll(io, &.{&.{0}}, self.size - 1);
+
+    var map = try fil.createMemoryMap(io, .{ .len = self.size, .protection = .{ .write = true } });
+    defer map.destroy(io);
+
+    var group: Io.Group = .init;
+    defer group.cancel(io);
+
+    var ret_err: ?Error = null;
+
+    var offset = self.start;
+    for (0..self.blocks.len) |i| {
+        group.async(io, blockThread, .{ self, io, map, offset, i, &ret_err });
+
+        offset += self.blocks[i].size;
+    }
+    if (self.frag_data != null)
+        group.async(io, fragThread, .{ self, map });
+
+    group.await(io) catch |err| return ret_err orelse err;
+
+    try map.write(io);
+}
+
+fn blockThread(self: Extractor, io: Io, map: Io.File.MemoryMap, read_offset: u64, idx: usize, ret_err: *?Error) error{Canceled}!void {
+    const write_pos = idx * self.block_size;
+    const size = if (self.frag_data == null and idx == self.block_size.len - 1)
+        self.size % self.block_size
+    else
+        self.block_size;
+    const block = self.blocks[idx];
+
+    if (block.size == 0) {
+        @memset(map.memory[write_pos..][0..size], 0);
+        return;
+    }
+    if (block.uncompressed) {
+        @memcpy(map[write_pos..][0..size], self.cache.map.memory[read_offset..][0..size]);
+        return;
+    }
+    const data = self.cache.get(io, read_offset, block.size, size) catch |err| switch (err) {
+        error.Canceled => {
+            io.recancel();
+            return error.Canceled;
+        },
+        else => |e| {
+            ret_err.* = e;
+            return error.Canceled;
+        },
+    };
+    defer self.cache.finished(io, read_offset);
+    if (data.len != size) {
+        std.debug.print("Size of decompression at {} is {} and should be {}\n", .{ read_offset, data.len, size });
+        return Error.BadDecompressionSize;
+    }
+    @memcpy(map[write_pos..][0..size], data);
+}
+fn fragThread(self: Extractor, map: Io.File.MemoryMap) error{Canceled}!void {
+    const write_pos = self.blocks.len * self.block_size;
+    const size = self.size % self.block_size;
+
+    @memcpy(map.memory[write_pos..][0..size], self.frag_data.?[self.frag_offset..][0..size]);
+}
+
+// Types
+
+pub const Error = error{BadDecompressionSize} || Io.File.WritePositionalError || Io.File.MemoryMap.CreateError;

src/data/reader.zig

@@ -0,0 +1,151 @@
+const std = @import("std");
+const Io = std.Io;
+
+const DecompCache = @import("../decomp_cache.zig");
+const DataBlock = @import("../inode.zig").DataBlock;
+
+const Reader = @This();
+
+io: Io,
+
+cache: *DecompCache,
+block_size: u32,
+
+size: u64,
+blocks: []DataBlock,
+
+frag_data: ?[]u8 = null,
+frag_offset: u32 = 0,
+
+cur_offset: u64 = 0,
+next_offset: u64,
+
+idx: u32 = 0,
+cur_block_sparse: bool = false,
+
+interface: Io.Reader = .{
+    .buffer = &[0]u8{},
+    .end = 0,
+    .seek = 0,
+    .vtable = &.{
+        .stream = stream,
+        .discard = discard,
+        .readVec = readVec,
+    },
+},
+
+pub fn init(io: Io, cache: *DecompCache, block_size: u32, size: u64, start: u64, blocks: []DataBlock) Reader {
+    return .{
+        .io = io,
+
+        .cache = cache,
+        .block_size = block_size,
+
+        .size = size,
+        .blocks = blocks,
+
+        .next_offset = start,
+    };
+}
+pub fn deinit(self: Reader) void {
+    self.cache.finished(self.io);
+}
+
+pub fn addFragment(self: *Reader, data: []u8, offset: u32) void {
+    self.frag_data = data;
+    self.frag_offset = offset;
+}
+
+fn advance(self: *Reader) Io.Reader.Error!void {
+    errdefer self.interface.end = 0;
+    self.interface.seek = 0;
+
+    if (self.idx > self.blocks.len) return error.EndOfStream;
+    defer self.idx += 1;
+    self.cache.finished(self.io, self.cur_offset);
+
+    if (self.idx == self.blocks.len) {
+        if (self.frag_data == null) return error.EndOfStream;
+        self.cur_offset = 0;
+
+        const size = self.size % self.block_size;
+        self.interface.buffer = self.frag_data.?[self.frag_offset..][0..size];
+        self.interface.end = size;
+        return;
+    }
+
+    const block = self.blocks[self.idx];
+
+    const size = if (self.idx == self.blocks.len - 1 and self.frag_data == null)
+        self.size % self.block_size
+    else
+        self.block_size;
+
+    if (block.size == 0) {
+        self.interface.buffer = &[0]u8{};
+        self.cur_block_sparse = true;
+        self.interface.end = size;
+        return;
+    } else {
+        self.cur_block_sparse = false;
+    }
+
+    self.cur_offset = self.next_offset;
+    self.next_offset = self.cur_offset + block.size;
+
+    if (block.uncompressed) {
+        self.interface.buffer = self.cache.map.memory[self.cur_offset..][0..size];
+        self.interface.end = size;
+        return;
+    }
+    const data = self.cache.get(self.io, self.cur_offset, block.size, size);
+    if (data.len != size) {
+        std.debug.print("Size of decompression at {} is {} and should be {}\n", .{ self.cur_offset, data.len, size });
+        return Io.Reader.Error.ReadFailed;
+    }
+    self.interface.buffer = data;
+    self.interface.end = size;
+}
+
+fn stream(r: *Io.Reader, w: *Io.Writer, limit: Io.Limit) Io.Reader.StreamError!usize {
+    const self: *Reader = @fieldParentPtr("interface", r);
+    if (r.seek >= r.end) {
+        try self.advance();
+    }
+    const to_write = @min(@intFromEnum(limit), r.end - r.seek);
+    const wrote = try if (self.cur_block_sparse)
+        w.splatByte(0, to_write)
+    else
+        w.write(r.buffer[r.seek..][0..to_write]);
+    r.seek += wrote;
+    return wrote;
+}
+fn discard(r: *Io.Reader, limit: Io.Limit) Io.Reader.Error!usize {
+    if (r.seek >= r.end) {
+        const self: *Reader = @fieldParentPtr("interface", r);
+        try self.advance();
+    }
+    const to_discard = @min(@intFromEnum(limit), r.end - r.seek);
+    r.seek += to_discard;
+    return to_discard;
+}
+fn readVec(r: *Io.Reader, vec: [][]u8) Io.Reader.Error!usize {
+    const self: *Reader = @fieldParentPtr("interface", r);
+    if (r.seek >= r.end) {
+        try self.advance();
+    }
+    var total: usize = 0;
+    for (vec) |v| {
+        const to_copy = @min(v.len, r.end - r.seek);
+        if (self.cur_block_sparse) {
+            @memset(v[0..to_copy], 0);
+        } else {
+            @memcpy(v[0..to_copy], r.buffer[r.seek..][0..to_copy]);
+        }
+        total += to_copy;
+        r.seek += to_copy;
+
+        if (r.seek >= r.end) break;
+    }
+    return total;
+}

src/decomp.zig

@@ -1,25 +1,14 @@
 const std = @import("std");
-const Io = std.Io;
 
 const options = @import("options");
 
-const lzma = @import("decomp/zig_lzma.zig");
+const c_decomp = @import("c_decomp.zig");
-const xz = @import("decomp/zig_xz.zig");
+const zig_decomp = @import("zig_decomp.zig");
-const Decompressor = @import("util/decompressor.zig");
 
-const zlib = if (options.use_zig_decomp) @import("decomp/zig_zlib.zig") else @import("decomp/c_zlib.zig");
+pub const Error = error{} || std.Io.Reader.UnlimitedAllocError;
-<<<<<<< HEAD
-const lzo = if (options.use_zig_decomp or !options.allow_lzo) void else @import("decomp/c_lzo.zig");
-=======
-const lzma = if (options.use_zig_decomp) @import("decomp/zig_lzma.zig") else @import("decomp/c_lzma.zig");
-const lzo = if (options.use_zig_decomp or options.allow_lzo) void else @import("decomp/c_lzo.zig");
-const xz = if (options.use_zig_decomp) @import("decomp/zig_xz.zig") else @import("decomp/c_xz.zig");
->>>>>>> dfbfbda (Build is working again (on Zig master branch))
-const lz4 = if (options.use_zig_decomp) void else @import("decomp/c_lz4.zig");
-const zstd = if (options.use_zig_decomp) @import("decomp/zig_zstd.zig") else @import("decomp/c_zstd.zig");
 
 pub const Enum = enum(u16) {
-    gzip = 1,
+    zlib = 1,
     lzma,
     lzo,
     xz,
@@ -27,78 +16,26 @@ pub const Enum = enum(u16) {
     zstd,
 };
 
-pub fn StatelessDecomp(val: Enum) !*const Decompressor {
+pub const Fn = *const fn (std.mem.Allocator, in: []u8, out: []u8) Error!usize;
-    return switch (val) {
+
-        .gzip => &zlib.stateless_decompressor,
+pub fn DecompFn(comp: Enum) !Fn {
-        .lzma => &lzma.stateless_decompressor,
+    return if (options.use_zig_decomp)
-        .lzo => if (options.use_zig_decomp or !options.allow_lzo)
+        switch (comp) {
-            error.LzoUnsupported
+            .zlib => zig_decomp.zlibDecompress,
+            .lzma => zig_decomp.lzmaDecompress,
+            .xz => zig_decomp.xzDecompress,
+            .zstd => zig_decomp.zstdDecompress,
+            .lz4 => error.Lz4Unsupported,
+            .lzo => error.LzoUnsupported,
+        }
+    else switch (comp) {
+        .zlib => c_decomp.zlibDecompress,
+        .lzma, .xz => c_decomp.lzmaDecompress,
+        .zstd => c_decomp.zstdDecompress,
+        .lz4 => c_decomp.lz4Decompress,
+        .lzo => if (options.allow_lzo)
+            c_decomp.zstdDecompress
         else
-            &lzo.stateless_decompressor,
+            error.LzoUnsupported,
-        .xz => &xz.stateless_decompressor,
-        .lz4 => if (options.use_zig_decomp)
-            error.Lz4Unsupported
-        else
-            &lz4.stateless_decompressor,
-        .zstd => &zstd.stateless_decompressor,
     };
 }
-
-pub const Decomp = union(enum) {
-    gzip: zlib,
-    lzma: lzma,
-    lzo: lzo,
-    xz: xz,
-    lz4: lz4,
-    zstd: zstd,
-
-<<<<<<< HEAD
-    pub fn init(val: Enum, alloc: std.mem.Allocator, io: std.Io, block_size: u32) !Decomp {
-        return switch (val) {
-            .gzip => .{ .gzip = zlib.init(alloc, io, block_size) },
-            .lzma => .{ .lzma = .{} },
-            .lzo => .{ .lzo = .{} },
-            .xz => .{ .xz = .{} },
-            .lz4 => .{ .lz4 = .{} },
-            .zstd => .{ .zstd = zstd.init(alloc, io, block_size) },
-=======
-    pub fn init(val: Enum, alloc: std.mem.Allocator, io: Io, block_size: u32) !Decomp {
-        return switch (val) {
-            .gzip => .{ .gzip = if (options.use_zig_decomp) try zlib.init(alloc, io, block_size) else try zlib.init(alloc, io) },
-            .lzma => .{ .lzma = if (options.use_zig_decomp) try lzma.init(alloc, io, block_size) else .{} },
-            .lzo => if (options.use_zig_decomp or !options.allow_lzo) error.LzoUnsupported else .{ .lzo = .{} },
-            .xz => .{ .xz = if (options.use_zig_decomp) try xz.init(alloc, io, block_size) else .{} },
-            .lz4 => if (options.use_zig_decomp) error.Lz4Unsupported else .{ .lz4 = .{} },
-            .zstd => .{ .zstd = if (options.use_zig_decomp) try zstd.init(alloc, io, block_size) else try zstd.init(alloc, io) },
->>>>>>> dfbfbda (Build is working again (on Zig master branch))
-        };
-    }
-    pub fn deinit(self: *Decomp, alloc: std.mem.Allocator) void {
-        if (options.use_zig_decomp) {
-            switch (self.*) {
-                .gzip => self.gzip.deinit(),
-                .lzma => self.lzma.deinit(),
-                .xz => self.xz.deinit(),
-                .zstd => self.zstd.deinit(),
-                else => {},
-            }
-        } else {
-            switch (self.*) {
-                .gzip => self.gzip.deinit(alloc),
-                .zstd => self.zstd.deinit(alloc),
-                else => {},
-            }
-        }
-    }
-
-    pub fn decompressor(self: *Decomp) *const Decompressor {
-        return switch (self.*) {
-            .gzip => &self.gzip.interface,
-            .lzma => &lzma.stateless_decompressor,
-            .lzo => if (options.use_zig_decomp or !options.allow_lzo) unreachable else &lzo.stateless_decompressor,
-            .xz => &xz.stateless_decompressor,
-            .lz4 => if (options.use_zig_decomp) unreachable else &lz4.stateless_decompressor,
-            .zstd => &self.zstd.interface,
-        };
-    }
-};

src/decomp/c_lz4.zig

@@ -1,19 +0,0 @@
-const std = @import("std");
-
-const c = @import("c");
-
-const Decompressor = @import("../util/decompressor.zig");
-const Error = Decompressor.Error;
-
-pub const stateless_decompressor: Decompressor = .{ .decomp_fn = statelessDecomp };
-
-fn statelessDecomp(_: ?*const Decompressor, _: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-<<<<<<< HEAD
-    const res = c.LZ4_decompress_fast(in.ptr, out.ptr, @truncate(out.len));
-=======
-    const out_len: c_int = @bitCast(@as(u32, @truncate(out.len)));
-    const res = c.LZ4_decompress_fast(in.ptr, out.ptr, out_len);
->>>>>>> dfbfbda (Build is working again (on Zig master branch))
-    if (res < 0) return Error.ReadFailed;
-    return @abs(res);
-}

src/decomp/c_lzma.zig

@@ -1,44 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-const Reader = std.Io.Reader;
-const zstd = std.compress.zstd;
-const Node = std.SinglyLinkedList.Node;
-
-const c = @import("c");
-
-const Decompressor = @import("../util/decompressor.zig");
-const Error = Decompressor.Error;
-
-const Queue = std.Io.Queue(c.lzma_stream);
-
-const Self = @This();
-
-pub const stateless_decompressor: Decompressor = .{ .decomp_fn = statelessDecomp };
-
-fn statelessDecomp(_: ?*const Decompressor, _: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    var stream: c.lzma_stream = .{
-        .next_in = in.ptr,
-        .avail_in = in.len,
-        .next_out = out.ptr,
-        .avail_out = out.len,
-    };
-
-    var res = c.lzma_alone_decoder(&stream, stream.avail_out * 2);
-    if (res != c.LZMA_OK) return Error.ReadFailed;
-    while (res == c.LZMA_OK)
-        res = c.lzma_code(&stream, c.LZMA_RUN);
-    if (res != c.LZMA_FINISH) return Error.ReadFailed;
-    return stream.total_out;
-}
-
-// lzma_allocator
-
-// fn lzmaAlloc(ptr: ?*anyopaque, size: usize, _: usize) callconv(.c) ?*anyopaque {
-//     var alloc: *std.mem.Allocator = @ptrCast(@alignCast(ptr));
-//     return alloc.rawAlloc(size, .@"1", 0);
-// }
-// fn lzmaFree(ptr: ?*anyopaque, mem_ptr: ?*anyopaque) callconv(.c) void {
-//     if (mem_ptr == null) return;
-//     var alloc: *std.mem.Allocator = @ptrCast(@alignCast(ptr));
-//     alloc.free(@as([*]u8, @ptrCast(mem_ptr.?)));
-// }

src/decomp/c_lzo.zig

@@ -1,24 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-const Reader = std.Io.Reader;
-const zstd = std.compress.zstd;
-const Node = std.SinglyLinkedList.Node;
-
-const c = @import("c");
-
-const Decompressor = @import("../util/decompressor.zig");
-const Error = Decompressor.Error;
-
-const Queue = std.Io.Queue(c.lzma_stream);
-
-const Self = @This();
-
-pub const stateless_decompressor: Decompressor = .{ .decomp_fn = statelessDecomp };
-
-fn statelessDecomp(_: ?*const Decompressor, _: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    _ = c.lzo_init();
-    var out_len = out.len;
-    const res = c.lzo1x_decompress_safe(in.ptr, in.len, out.ptr, &out_len, null);
-    if (res != c.LZO_E_OK) return Error.ReadFailed;
-    return out_len;
-}

src/decomp/c_xz.zig

@@ -1,45 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-const Reader = std.Io.Reader;
-const zstd = std.compress.zstd;
-const Node = std.SinglyLinkedList.Node;
-
-const c = @import("c");
-
-const Decompressor = @import("../util/decompressor.zig");
-const Error = Decompressor.Error;
-
-const Queue = std.Io.Queue(c.lzma_stream);
-
-const Self = @This();
-
-pub const stateless_decompressor: Decompressor = .{ .decomp_fn = statelessDecomp };
-
-fn statelessDecomp(_: ?*const Decompressor, _: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    var stream: c.lzma_stream = .{
-        .next_in = in.ptr,
-        .avail_in = in.len,
-        .next_out = out.ptr,
-        .avail_out = out.len,
-    };
-
-    var res = c.lzma_alone_decoder(&stream, stream.avail_out * 2);
-    if (res != c.LZMA_OK) return Error.ReadFailed;
-    while (res == c.LZMA_OK)
-        res = c.lzma_code(&stream, c.LZMA_RUN);
-    if (res != c.LZMA_FINISH) return Error.ReadFailed;
-    return stream.total_out;
-}
-
-// lzma_allocator
-
-// fn lzmaAlloc(ptr: ?*anyopaque, size: usize, _: usize) callconv(.c) ?*anyopaque {
-//     var alloc: *std.mem.Allocator = @ptrCast(@alignCast(ptr));
-//     const mem = alloc.alloc(u8, size) catch return null;
-//     return mem.ptr;
-// }
-// fn lzmaFree(ptr: ?*anyopaque, mem_ptr: ?*anyopaque) callconv(.c) void {
-//     if (mem_ptr == null) return;
-//     var alloc: *std.mem.Allocator = @ptrCast(@alignCast(ptr));
-//     alloc.free(@as([*]u8, @ptrCast(mem_ptr.?)));
-// }

src/decomp/c_zlib.zig

@@ -1,97 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-const Reader = std.Io.Reader;
-const zstd = std.compress.zstd;
-const Node = std.SinglyLinkedList.Node;
-
-const c = @import("c");
-
-const Decompressor = @import("../util/decompressor.zig");
-const Error = Decompressor.Error;
-
-const Queue = std.Io.Queue(c.zng_stream);
-
-const Self = @This();
-
-interface: Decompressor = .{ .decomp_fn = decomp },
-
-io: Io,
-
-ctx: []c.zng_stream,
-ctx_queue: Queue,
-
-pub fn init(alloc: std.mem.Allocator, io: Io) !Self {
-    const buf = try alloc.alloc(c.zng_stream, 20); // TODO: Choose a better number instead of a random one.
-    var queue: Queue = .init(buf);
-    for (0..20) |_|
-        try queue.putOne(io, .{});
-
-    return .{
-        .io = io,
-
-        .ctx = buf,
-        .ctx_queue = queue,
-    };
-}
-pub fn deinit(self: *Self, alloc: std.mem.Allocator) void {
-    self.ctx_queue.close(self.io);
-    alloc.free(self.ctx);
-}
-
-fn decomp(d: ?*const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    if (d == null) {
-        return statelessDecomp(d, alloc, in, out);
-    }
-    var self: *Self = @fieldParentPtr("interface", @constCast(d.?));
-
-    var stream = self.ctx_queue.getOne(self.io) catch return Error.ReadFailed;
-    defer self.ctx_queue.putOne(self.io, stream) catch {};
-
-    stream.next_in = in.ptr;
-    stream.avail_in = @truncate(in.len);
-    stream.next_out = out.ptr;
-    stream.avail_out = @truncate(out.len);
-
-    try zlibDecomp(&stream);
-
-    return stream.total_out;
-}
-
-inline fn zlibDecomp(stream: *c.zng_stream) !void {
-    _ = c.zng_inflateReset(stream);
-
-    const res = c.zng_inflate(stream, c.Z_FULL_FLUSH);
-    if (res != c.Z_OK) return Error.ReadFailed;
-}
-
-// Stateless
-
-pub const stateless_decompressor: Decompressor = .{ .decomp_fn = statelessDecomp };
-
-fn statelessDecomp(_: ?*const Decompressor, _: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    var stream: c.zng_stream = .{
-        .next_in = in.ptr,
-        .avail_in = @truncate(in.len),
-        .next_out = out.ptr,
-        .avail_out = @truncate(out.len),
-    };
-    try zlibDecomp(&stream);
-    return stream.total_out;
-}
-
-// zalloc
-
-fn zalloc(ptr: ?*anyopaque, size: c_uint, len: c_uint) callconv(.c) ?*anyopaque {
-    var alloc: *std.mem.Allocator = @ptrCast(@alignCast(ptr));
-    return alloc.rawAlloc(size * len, .@"1", 0);
-}
-fn zfree(ptr: ?*anyopaque, mem_ptr: ?*anyopaque) callconv(.c) void {
-<<<<<<< HEAD
-    var alloc: *std.mem.Allocator = @ptrCast(@alignCast(ptr));
-    alloc.rawFree(@ptrCast(mem_ptr), .@"1", 0);
-=======
-    if (mem_ptr == null) return;
-    var alloc: *std.mem.Allocator = @ptrCast(@alignCast(ptr));
-    alloc.free(@as([*]u8, @ptrCast(mem_ptr.?)));
->>>>>>> dfbfbda (Build is working again (on Zig master branch))
-}

src/decomp/c_zstd.zig

@@ -1,71 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-const Reader = std.Io.Reader;
-const zstd = std.compress.zstd;
-const Node = std.SinglyLinkedList.Node;
-
-const c = @import("c");
-
-const Decompressor = @import("../util/decompressor.zig");
-const Error = Decompressor.Error;
-
-const Queue = std.Io.Queue(?*c.ZSTD_DCtx);
-
-const Self = @This();
-
-interface: Decompressor = .{ .decomp_fn = decomp },
-
-io: Io,
-
-ctx: []?*c.ZSTD_DCtx,
-ctx_queue: Queue,
-
-pub fn init(alloc: std.mem.Allocator, io: Io) !Self {
-    const buf = try alloc.alloc(?*c.ZSTD_DCtx, 20); // TODO: Choose a better number instead of a random one.
-    var queue: Queue = .init(buf);
-    for (0..20) |_|
-        try queue.putOne(io, c.ZSTD_createDCtx());
-
-    return .{
-        .io = io,
-
-        .ctx = buf,
-        .ctx_queue = queue,
-    };
-}
-pub fn deinit(self: *Self, alloc: std.mem.Allocator) void {
-    self.ctx_queue.close(self.io);
-    for (self.ctx) |ctx|
-        _ = c.ZSTD_freeDCtx(ctx);
-    alloc.free(self.ctx);
-}
-
-fn decomp(d: ?*const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    // TODO: Fix
-    //
-    // if (d == null) {
-    return statelessDecomp(d, alloc, in, out);
-    // }
-    // var self: *Self = @fieldParentPtr("interface", @constCast(d.?));
-
-    // const ctx = self.ctx_queue.getOne(self.io) catch return Error.ReadFailed;
-    // defer self.ctx_queue.putOne(self.io, ctx) catch {};
-
-    // _ = c.ZSTD_DCtx_reset(ctx, c.ZSTD_reset_session_only);
-
-    // const res = c.ZSTD_decompressDCtx(ctx, out.ptr, out.len, in.ptr, in.len);
-    // if (c.ZSTD_isError(res) != 0)
-    //     return Error.ReadFailed;
-    // return res;
-}
-
-// Stateless
-
-pub const stateless_decompressor: Decompressor = .{ .decomp_fn = statelessDecomp };
-
-fn statelessDecomp(_: ?*const Decompressor, _: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    const res = c.ZSTD_decompress(out.ptr, out.len, in.ptr, in.len);
-    if (c.ZSTD_isError(res) != 0)
-        return Error.ReadFailed;
-    return res;
-}

src/decomp/zig_lzma.zig

@@ -1,81 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-const Reader = std.Io.Reader;
-const lzma = std.compress.lzma;
-const Node = std.SinglyLinkedList.Node;
-
-const Decompressor = @import("../util/decompressor.zig");
-const Error = Decompressor.Error;
-
-const Queue = Io.Queue([]u8);
-
-const Self = @This();
-
-const Buffer = struct {
-    node: Node,
-    buf: []u8,
-};
-
-interface: Decompressor = .{ .decomp_fn = decomp },
-
-alloc: std.mem.Allocator,
-io: Io,
-
-block_size: u32,
-buf: [][]u8,
-buf_queue: Queue,
-
-pub fn init(alloc: std.mem.Allocator, io: Io, block_size: u32) !Self {
-    const buf = try alloc.alloc([]u8, 20); // TODO: Choose a better number instead of a random one.
-    var queue: Queue = .init(buf);
-    for (0..20) |_|
-        try queue.putOne(io, try alloc.alloc(u8, block_size));
-
-    return .{
-        .alloc = alloc,
-        .io = io,
-
-        .block_size = block_size,
-        .buf = buf,
-        .buf_queue = queue,
-    };
-}
-pub fn deinit(self: *Self) void {
-    self.buf_queue.close(self.io);
-    for (self.buf) |buf|
-        self.alloc.free(buf);
-    self.alloc.free(self.buf);
-}
-
-fn decomp(d: ?*const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    if (d == null) {
-        return statelessDecomp(d, alloc, in, out);
-    }
-    var self: *Self = @fieldParentPtr("interface", @constCast(d.?));
-
-    var buf = self.buf_queue.getOne(self.io) catch return Error.ReadFailed;
-    defer self.buf_queue.putOne(self.io, buf) catch {};
-
-    return lzmaDecomp(self.alloc, &buf, in, out) catch return Error.ReadFailed;
-}
-
-inline fn lzmaDecomp(alloc: std.mem.Allocator, buffer: *[]u8, in: []u8, out: []u8) !usize {
-    var rdr: Reader = .fixed(in);
-    var d = try lzma.Decompress.initOptions(&rdr, alloc, buffer.*, .{}, in.len * 2);
-    defer {
-        buffer.* = d.takeBuffer();
-        d.deinit();
-    }
-
-    return d.reader.readSliceShort(out);
-}
-
-// Stateless
-
-pub const stateless_decompressor: Decompressor = .{ .decomp_fn = statelessDecomp };
-
-fn statelessDecomp(_: ?*const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    var buf = try alloc.alloc(u8, in.len);
-    defer alloc.free(buf);
-    return lzmaDecomp(alloc, &buf, in, out) catch return Error.ReadFailed;
-}

src/decomp/zig_xz.zig

@@ -1,81 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-const Reader = std.Io.Reader;
-const xz = std.compress.xz;
-const Node = std.SinglyLinkedList.Node;
-
-const Decompressor = @import("../util/decompressor.zig");
-const Error = Decompressor.Error;
-
-const Queue = Io.Queue([]u8);
-
-const Self = @This();
-
-const Buffer = struct {
-    node: Node,
-    buf: []u8,
-};
-
-interface: Decompressor = .{ .decomp_fn = decomp },
-
-alloc: std.mem.Allocator,
-io: Io,
-
-block_size: u32,
-buf: [][]u8,
-buf_queue: Queue,
-
-pub fn init(alloc: std.mem.Allocator, io: Io, block_size: u32) !Self {
-    const buf = try alloc.alloc([]u8, 20); // TODO: Choose a better number instead of a random one.
-    var queue: Queue = .init(buf);
-    for (0..20) |_|
-        try queue.putOne(io, try alloc.alloc(u8, block_size));
-
-    return .{
-        .alloc = alloc,
-        .io = io,
-
-        .block_size = block_size,
-        .buf = buf,
-        .buf_queue = queue,
-    };
-}
-pub fn deinit(self: *Self) void {
-    self.buf_queue.close(self.io);
-    for (self.buf) |buf|
-        self.alloc.free(buf);
-    self.alloc.free(self.buf);
-}
-
-fn decomp(d: ?*const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    if (d == null) {
-        return statelessDecomp(d, alloc, in, out);
-    }
-    var self: *Self = @fieldParentPtr("interface", @constCast(d.?));
-
-    var buf = self.buf_queue.getOne(self.io) catch return Error.ReadFailed;
-    defer self.buf_queue.putOne(self.io, buf) catch {};
-
-    return xzDecomp(self.alloc, &buf, in, out) catch return Error.ReadFailed;
-}
-
-inline fn xzDecomp(alloc: std.mem.Allocator, buffer: *[]u8, in: []u8, out: []u8) !usize {
-    var rdr: Reader = .fixed(in);
-    var d = try xz.Decompress.init(&rdr, alloc, buffer.*);
-    defer {
-        buffer.* = d.takeBuffer();
-        d.deinit();
-    }
-
-    return d.reader.readSliceShort(out);
-}
-
-// Stateless
-
-pub const stateless_decompressor: Decompressor = .{ .decomp_fn = statelessDecomp };
-
-fn statelessDecomp(_: ?*const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    var buf = try alloc.alloc(u8, in.len);
-    defer alloc.free(buf);
-    return xzDecomp(alloc, &buf, in, out) catch return Error.ReadFailed;
-}

src/decomp/zig_zlib.zig

@@ -1,77 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-const flate = std.compress.flate;
-const Node = std.SinglyLinkedList.Node;
-const Reader = Io.Reader;
-
-const Decompressor = @import("../util/decompressor.zig");
-const Error = Decompressor.Error;
-
-const Queue = Io.Queue([]u8);
-
-const Self = @This();
-
-const Buffer = struct {
-    node: Node,
-    buf: []u8,
-};
-
-interface: Decompressor = .{ .decomp_fn = decomp },
-
-alloc: std.mem.Allocator,
-io: Io,
-
-block_size: u32,
-buf: [][]u8,
-buf_queue: Queue,
-
-pub fn init(alloc: std.mem.Allocator, io: Io, block_size: u32) !Self {
-    const buf = try alloc.alloc([]u8, 20); // TODO: Choose a better number instead of a random one.
-    var queue: Queue = .init(buf);
-    for (0..20) |_|
-        try queue.putOne(io, try alloc.alloc(u8, block_size));
-
-    return .{
-        .alloc = alloc,
-        .io = io,
-
-        .block_size = block_size,
-        .buf = buf,
-        .buf_queue = queue,
-    };
-}
-pub fn deinit(self: *Self) void {
-    self.buf_queue.close(self.io);
-    for (self.buf) |buf|
-        self.alloc.free(buf);
-    self.alloc.free(self.buf);
-}
-
-fn decomp(d: ?*const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    if (d == null) {
-        return statelessDecomp(d, alloc, in, out);
-    }
-    var self: *Self = @fieldParentPtr("interface", @constCast(d.?));
-
-    const buf = self.buf_queue.getOne(self.io) catch return Error.ReadFailed;
-    defer self.buf_queue.putOne(self.io, buf) catch {};
-
-    return zlibDecomp(buf, in, out);
-}
-
-inline fn zlibDecomp(buffer: []u8, in: []u8, out: []u8) !usize {
-    var rdr: Reader = .fixed(in);
-    var d = flate.Decompress.init(&rdr, .zlib, buffer);
-
-    return d.reader.readSliceShort(out);
-}
-
-// Stateless
-
-pub const stateless_decompressor: Decompressor = .{ .decomp_fn = statelessDecomp };
-
-fn statelessDecomp(_: ?*const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    const buf = try alloc.alloc(u8, out.len);
-    defer alloc.free(buf);
-    return zlibDecomp(buf, in, out);
-}

src/decomp/zig_zstd.zig

@@ -1,73 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-const Reader = std.Io.Reader;
-const zstd = std.compress.zstd;
-
-const Decompressor = @import("../util/decompressor.zig");
-const Error = Decompressor.Error;
-
-const Queue = std.Io.Queue([]u8);
-
-const Self = @This();
-
-interface: Decompressor = .{ .decomp_fn = decomp },
-
-alloc: std.mem.Allocator,
-io: Io,
-
-block_size: u32,
-buf: [][]u8,
-buf_queue: Queue,
-
-pub fn init(alloc: std.mem.Allocator, io: Io, block_size: u32) !Self {
-    const buf = try alloc.alloc([]u8, 5); // TODO: Choose a better number instead of a random one.
-    var queue: Queue = .init(buf);
-    for (buf) |_|
-        try queue.putOne(io, try alloc.alloc(u8, block_size + zstd.block_size_max));
-
-    return .{
-        .alloc = alloc,
-        .io = io,
-
-        .block_size = block_size,
-        .buf = buf,
-        .buf_queue = queue,
-    };
-}
-pub fn deinit(self: *Self) void {
-    self.buf_queue.close(self.io);
-    for (self.buf) |buf|
-        self.alloc.free(buf);
-    self.alloc.free(self.buf);
-}
-
-fn decomp(d: ?*const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    if (d == null) {
-        const buf = try alloc.alloc(u8, in.len * 2);
-        defer alloc.free(buf);
-        return zstdDecomp(buf, in, out);
-    }
-    var self: *Self = @fieldParentPtr("interface", @constCast(d.?));
-
-    const buf = self.buf_queue.getOne(self.io) catch return Error.ReadFailed;
-    defer self.buf_queue.putOne(self.io, buf) catch {};
-
-    return zstdDecomp(buf, in, out);
-}
-
-inline fn zstdDecomp(buffer: []u8, in: []u8, out: []u8) !usize {
-    var rdr: Reader = .fixed(in);
-    var d = zstd.Decompress.init(&rdr, buffer, .{ .window_len = @truncate(out.len) });
-
-    return d.reader.readSliceShort(out);
-}
-
-// Stateless
-
-pub const stateless_decompressor: Decompressor = .{ .decomp_fn = statelessDecomp };
-
-fn statelessDecomp(_: ?*const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    const buf = try alloc.alloc(u8, out.len + zstd.block_size_max);
-    defer alloc.free(buf);
-    return zstdDecomp(buf, in, out);
-}

src/decomp_cache.zig

@@ -0,0 +1,116 @@
+const std = @import("std");
+const Io = std.Io;
+const File = Io.File;
+const MemoryMap = File.MemoryMap;
+const Atomic = std.atomic.Value;
+
+const Decomp = @import("decomp.zig");
+
+const DecompCache = @This();
+
+alloc: std.mem.Allocator,
+map: MemoryMap,
+decomp_fn: Decomp.Fn,
+
+cache: std.AutoHashMap(u64, Cache),
+mut: std.Io.RwLock = .init,
+cond: std.Io.Condition = .init,
+
+max_mem: u64,
+cur_mem: u64 = 0,
+
+pub fn init(alloc: std.mem.Allocator, map: MemoryMap, compression: Decomp.Enum, max_mem: u64) !DecompCache {
+    return .{
+        .alloc = alloc,
+        .map = map,
+        .decomp_fn = try Decomp.DecompFn(compression),
+
+        .cache = .init(alloc),
+
+        .max_mem = max_mem,
+    };
+}
+pub fn deinit(self: *DecompCache, io: Io) void {
+    self.mut.lockUncancelable(io);
+
+    var iter = self.cache.valueIterator();
+    while (iter.next()) |v|
+        self.alloc.free(v.data);
+    self.cache.deinit();
+}
+
+pub fn get(self: *DecompCache, io: Io, offset: u64, compressed_size: u32, max_size: u32) ![]u8 {
+    {
+        try self.mut.lockShared(io);
+        defer self.mut.unlockShared(io);
+
+        const cache = self.cache.getPtr(offset);
+        if (cache != null) {
+            _ = cache.?.usage.fetchAdd(1, .acquire);
+            return cache.?.data;
+        }
+    }
+    try self.mut.lock(io);
+    defer self.mut.unlock(io);
+
+    const cache = try self.cache.getOrPut(offset);
+    if (cache.found_existing) {
+        _ = cache.value_ptr.usage.fetchAdd(1, .acquire);
+        return cache.value_ptr.data;
+    }
+    errdefer self.cache.removeByPtr(cache.key_ptr);
+
+    try self.ensureSpace(io, max_size);
+
+    var out = try self.alloc.alloc(u8, max_size);
+    errdefer self.alloc.free(out);
+
+    const decomp_size = try self.decomp_fn(self.alloc, self.map.memory[offset..][0..compressed_size], out);
+    if (decomp_size != max_size) {
+        if (!self.alloc.resize(out, decomp_size)) {
+            const new_out = try self.alloc.alloc(u8, decomp_size);
+            @memcpy(new_out, out[0..decomp_size]);
+            out = new_out;
+        } else {
+            out.len = decomp_size;
+        }
+    }
+    self.cur_mem += decomp_size;
+
+    cache.value_ptr.data = out;
+    _ = cache.value_ptr.usage.fetchAdd(1, .acquire);
+    return out;
+}
+pub fn finished(self: *DecompCache, io: Io, offset: u64) void {
+    const cache = self.cache.getPtr(offset);
+    if (cache == null) {
+        std.debug.print("Finished using cache, but cache does not exist: {}\n", .{offset});
+        return;
+    }
+    const use = cache.?.usage.fetchSub(1, .acquire);
+    if (use == 0)
+        self.cond.broadcast(io);
+}
+
+fn ensureSpace(self: *DecompCache, io: Io, size: u64) !void {
+    while (self.cur_mem + size > self.max_mem) {
+        var iter = self.cache.valueIterator();
+        while (iter.next()) |cache| {
+            if (cache.usage.load(.unordered) == 0) {
+                self.alloc.free(cache.data);
+                self.cur_mem -= cache.data.len;
+
+                if (self.cur_mem + size <= self.max_mem) return;
+            }
+        }
+        if (self.cur_mem + size <= self.max_mem) return;
+        try self.cond.wait(io, &self.mut.mutex);
+    }
+}
+
+// Types
+
+const Cache = struct {
+    data: []u8,
+    usage: Atomic(u32),
+};

src/directory.zig

@@ -1,69 +1,83 @@
 const std = @import("std");
-const Reader = std.Io.Reader;
+const Io = std.Io;
+const Reader = Io.Reader;
 
 const Inode = @import("inode.zig");
 
-pub const Error = error{OutOfMemory} || Reader.Error;
+const Directory = @This();
 
-const DirEntry = @This();
+entries: []Entry,
 
-block_start: u32,
+pub fn init(alloc: std.mem.Allocator, rdr: *Reader, size: u32) Error!Directory {
-block_offset: u16,
+    if (size <= 3) return .{ .entries = &[0]Entry{} };
-type: Inode.Type,
-name: []const u8,
 
-pub fn deinit(self: DirEntry, alloc: std.mem.Allocator) void {
+    var entries: std.ArrayList(Entry) = try .initCapacity(alloc, 50);
-    alloc.free(self.name);
-}
-
-pub fn readDirectory(alloc: std.mem.Allocator, rdr: *Reader, size: u32) Error![]DirEntry {
-    var hdr: Header = undefined;
-    var raw: RawEntry = undefined;
-    var out: std.ArrayList(DirEntry) = try .initCapacity(alloc, 30);
     errdefer {
-        for (out.items) |ent|
+        for (entries.items) |ent|
-            alloc.free(ent.name);
+            ent.deinit(alloc);
-        out.deinit(alloc);
+        entries.deinit(alloc);
     }
 
-    var tot_red: u32 = 3;
+    var read: u32 = 3;
-    while (tot_red < size) {
+    while (read < size) {
+        var hdr: Header = undefined;
         try rdr.readSliceEndian(Header, @ptrCast(&hdr), .little);
-        try out.ensureUnusedCapacity(alloc, hdr.count + 1);
+        read += @sizeOf(Header);
-
-        tot_red += @sizeOf(Header);
 
+        try entries.ensureUnusedCapacity(alloc, hdr.count + 1);
         for (0..hdr.count + 1) |_| {
+            var raw: RawEntry = undefined;
             try rdr.readSliceEndian(RawEntry, @ptrCast(&raw), .little);
 
-            const new_name = try alloc.alloc(u8, raw.name_size + 1);
+            const name = try alloc.alloc(u8, raw.name_size + 1);
-            try rdr.readSliceEndian(u8, new_name, .little);
+            errdefer alloc.free(name);
+            try rdr.readSliceEndian(u8, name, .little);
 
-            const new = out.addOneAssumeCapacity();
+            entries.appendAssumeCapacity(.{
-            new.* = .{
+                .inode_num = if (raw.inode_num_offset > 0)
+                    hdr.inode_num + @abs(raw.inode_num_offset)
+                else
+                    hdr.inode_num - @abs(raw.inode_num_offset),
                 .block_start = hdr.block_start,
                 .block_offset = raw.block_offset,
                 .type = raw.type,
-                .name = new_name,
+                .name = name,
-            };
+            });
+        }
+    }
 
-            tot_red += @sizeOf(RawEntry) + raw.name_size + 1;
+    return .{ .entries = try entries.toOwnedSlice(alloc) };
 }
-    }
+pub fn deinit(self: Directory, alloc: std.mem.Allocator) void {
-    return out.toOwnedSlice(alloc);
+    for (self.entries) |entry|
+        entry.deinit(alloc);
+    alloc.free(self.entries);
 }
 
 // Types
 
+pub const Error = Reader.Error || std.mem.Allocator.Error;
+
+pub const Entry = struct {
+    inode_num: u32,
+    block_start: u32,
+    block_offset: u16,
+    type: Inode.Enum,
+    name: []const u8,
+
+    pub fn deinit(self: Entry, alloc: std.mem.Allocator) void {
+        alloc.free(self.name);
+    }
+};
+
 const Header = extern struct {
     count: u32,
     block_start: u32,
-    num: u32,
+    inode_num: u32,
 };
-
 const RawEntry = extern struct {
     block_offset: u16,
-    num_offset: i16,
+    inode_num_offset: i16,
-    type: Inode.Type,
+    type: Inode.Enum,
     name_size: u16,
 };

src/extract.zig

@@ -0,0 +1,283 @@
+const std = @import("std");
+const Io = std.Io;
+
+const Atomic = std.atomic.Value;
+
+const DecompCache = @import("decomp_cache.zig");
+const ExtractionOptions = @import("options.zig");
+const Inode = @import("inode.zig");
+const Superblock = @import("archive.zig").Superblock;
+const Directory = @import("directory.zig");
+const DataExtractor = @import("data/extractor.zig");
+const DataReader = @import("data/reader.zig");
+const Lookup = @import("lookup.zig");
+
+pub fn extract(alloc: std.mem.Allocator, io: Io, inode: Inode, cache: *DecompCache, super: Superblock, ext_loc: []const u8, options: ExtractionOptions) !void {
+    const path = std.mem.trim(u8, ext_loc, "/");
+
+    var buf: [50]ReturnUnion = undefined;
+    var sel: Io.Select(ReturnUnion) = .init(io, &buf);
+
+    defer {
+        while (sel.cancel()) |ret| {
+            switch (ret) {
+                .dir_ret => |d| {
+                    const res = d catch continue;
+                    alloc.free(res.path);
+                },
+                .file_ret => |f| {
+                    const res = f catch continue;
+                    alloc.free(res.path);
+                },
+                else => {},
+            }
+        }
+    }
+
+    var frag_table: Lookup.Table(Lookup.FragmentEntry) = .init(alloc, cache, super.frag_start, super.frag_count);
+    defer frag_table.deinit();
+
+    var ret_loop = io.async(returnLoop, .{ alloc, &sel, options });
+
+    try extractReal(alloc, io, cache, super, &sel, &frag_table, path, inode, null, false);
+
+    ret_loop.await(io) catch |err| {
+        // TODO: Drain sel
+        return err;
+    };
+}
+
+fn extractReal(
+    alloc: std.mem.Allocator,
+    io: Io,
+    cache: *DecompCache,
+    super: Superblock,
+    sel: *Io.Select(ReturnUnion),
+    frag_table: *Lookup.Table(Lookup.FragmentEntry),
+    path: []const u8,
+    inode: Inode,
+    parent: ?*Atomic(usize),
+    origin: bool,
+) Error!void {
+    try io.checkCancel();
+
+    switch (inode.data) {
+        .dir, .ext_dir => sel.async(
+            .dir_ret,
+            extractDir,
+            .{ alloc, io, cache, super, sel, frag_table, path, inode, parent, origin },
+        ),
+        .file, .ext_file => sel.async(
+            .file_ret,
+            extractFile,
+            .{ alloc, io, cache, super.block_size, frag_table, path, inode, parent, origin },
+        ),
+        else => return error.Canceled,
+    }
+}
+
+fn extractDir(
+    alloc: std.mem.Allocator,
+    io: Io,
+    cache: *DecompCache,
+    super: Superblock,
+    sel: *Io.Select(ReturnUnion),
+    frag_table: *Lookup.Table(Lookup.FragmentEntry),
+    path: []const u8,
+    inode: Inode,
+    parent: ?*Atomic(usize),
+    origin: bool,
+) Error!DirReturn {
+    defer {
+        if (parent != null)
+            _ = parent.?.fetchSub(1, .acquire);
+        if (!origin) inode.deinit(alloc);
+    }
+    errdefer if (!origin) alloc.free(path);
+
+    const dir = inode.directory(alloc, io, cache, super.dir_start) catch |err| switch (err) {
+        error.NotDirectory => unreachable,
+        else => |e| return e,
+    };
+    defer dir.deinit(alloc);
+
+    const sub_files = try alloc.create(Atomic(usize));
+    sub_files.* = .init(dir.entries.len);
+
+    const ret: DirReturn = .{
+        .path = path,
+        .sub_files = sub_files,
+        .origin = origin,
+
+        .uid_idx = inode.hdr.uid_idx,
+        .gid_idx = inode.hdr.gid_idx,
+        .mod_time = inode.hdr.mod_time,
+        .permissions = inode.hdr.permission,
+
+        .xattr_idx = switch (inode.data) {
+            .ext_dir => |d| if (d.xattr_idx != 0xFFFFFFFF) d.xattr_idx else null,
+            else => null,
+        },
+    };
+
+    for (dir.entries) |entry| {
+        const new_inode: Inode = try .initDirEntry(alloc, io, cache, super.inode_start, super.block_size, entry);
+        errdefer new_inode.deinit(alloc);
+
+        const new_path = try std.mem.concat(alloc, u8, &.{ path, "/", entry.name });
+
+        try extractReal(
+            alloc,
+            io,
+            cache,
+            super,
+            sel,
+            frag_table,
+            new_path,
+            new_inode,
+            sub_files,
+            false,
+        );
+    }
+    return ret;
+}
+fn extractFile(
+    alloc: std.mem.Allocator,
+    io: Io,
+    cache: *DecompCache,
+    block_size: u32,
+    frag_table: *Lookup.Table(Lookup.FragmentEntry),
+    path: []const u8,
+    inode: Inode,
+    parent: ?*Atomic(usize),
+    origin: bool,
+) Error!FileReturn {
+    defer {
+        if (parent != null)
+            _ = parent.?.fetchSub(1, .acquire);
+        if (!origin) inode.deinit(alloc);
+    }
+    errdefer if (!origin) alloc.free(path);
+
+    var atomic = try Io.Dir.cwd().createFileAtomic(io, path, .{});
+    defer atomic.deinit(io);
+
+    var ret: FileReturn = .{
+        .path = path,
+        .origin = origin,
+
+        .uid_idx = inode.hdr.uid_idx,
+        .gid_idx = inode.hdr.gid_idx,
+        .permissions = inode.hdr.permission,
+        .mod_time = inode.hdr.mod_time,
+    };
+
+    const data: DataExtractor = switch (inode.data) {
+        .file => |f| blk: {
+            var data: DataExtractor = .init(cache, block_size, f.size, f.data_start, f.blocks);
+            if (f.frag_idx != 0xFFFFFFFF) {
+                const entry: Lookup.FragmentEntry = try frag_table.get(io, f.frag_idx);
+                if (entry.size.uncompressed) {
+                    data.addFragment(cache.map.memory[entry.start..][0..entry.size.size], f.frag_offset);
+                } else {
+                    const block = try cache.get(io, entry.start, entry.size.size, block_size);
+                    data.addFragment(block, f.frag_offset);
+                }
+            }
+            break :blk data;
+        },
+        .ext_file => |f| blk: {
+            var data: DataExtractor = .init(cache, block_size, f.size, f.data_start, f.blocks);
+            if (f.frag_idx != 0xFFFFFFFF) {
+                const entry: Lookup.FragmentEntry = try frag_table.get(io, f.frag_idx);
+                if (entry.size.uncompressed) {
+                    data.addFragment(cache.map.memory[entry.start..][0..entry.size.size], f.frag_offset);
+                } else {
+                    const block = try cache.get(io, entry.start, entry.size.size, block_size);
+                    data.addFragment(block, f.frag_offset);
+                }
+            }
+            if (f.xattr_idx != 0xFFFFFFFF)
+                ret.xattr_idx = f.xattr_idx;
+            break :blk data;
+        },
+        else => unreachable,
+    };
+    try data.asyncExtract(io, atomic.file);
+
+    try atomic.link(io);
+
+    return ret;
+}
+
+// Loop
+
+fn returnLoop(alloc: std.mem.Allocator, sel: *Io.Select(ReturnUnion), options: ExtractionOptions) !void {
+    while (true) {
+        const finished = try sel.await();
+
+        switch (finished) {
+            .dir_ret => |d| {
+                const ret = try d;
+                if (ret.sub_files.load(.unordered) != 0) {
+                    sel.queue.putOne(sel.io, .{ .dir_ret = ret }) catch |err| {
+                        if (!ret.origin) alloc.free(ret.path);
+                        return err;
+                    };
+                    continue;
+                }
+                if (!ret.origin) alloc.free(ret.path);
+                alloc.destroy(ret.sub_files);
+
+                if (!options.ignore_permissions and !options.ignore_xattr) {
+                    // TODO: set permissions & xattr.
+                }
+            },
+            .file_ret => |f| {
+                const ret = try f;
+                if (!ret.origin) alloc.free(ret.path);
+
+                if (!options.ignore_permissions and !options.ignore_xattr) {
+                    // TODO: set permissions & xattr.
+                }
+            },
+            .void_ret => |v| try v,
+        }
+
+        if (sel.group.token.load(.unordered) == null) break;
+    }
+}
+
+// Utility types
+
+const ReturnUnion = union(enum) {
+    file_ret: Error!FileReturn,
+    dir_ret: Error!DirReturn,
+    void_ret: Error!void,
+};
+
+const Error = error{Canceled} || Directory.Error || Io.Dir.CreateFileAtomicError || Io.File.Atomic.LinkError || DataExtractor.Error;
+
+const FileReturn = struct {
+    path: []const u8,
+    origin: bool,
+
+    uid_idx: u32,
+    gid_idx: u32,
+    mod_time: u32,
+    permissions: u16,
+
+    xattr_idx: ?u32 = null,
+};
+const DirReturn = struct {
+    path: []const u8,
+    sub_files: *Atomic(usize),
+    origin: bool,
+
+    uid_idx: u32,
+    gid_idx: u32,
+    mod_time: u32,
+    permissions: u16,
+
+    xattr_idx: ?u32 = null,
+};

src/file.zig

@@ -1,94 +1,102 @@
-//! An easier to use wrapper around an inode.
-
 const std = @import("std");
 const Io = std.Io;
 
 const Archive = @import("archive.zig");
-const DirEntry = @import("directory.zig");
+const Directory = @import("directory.zig");
 const ExtractionOptions = @import("options.zig");
 const Inode = @import("inode.zig");
-const DataExtractor = @import("util/data_extractor.zig");
-const Decompressor = @import("util/decompressor.zig");
-const MetadataReader = @import("util/metadata.zig");
-const SharedCache = @import("util/shared_cache.zig");
 
-const File = @This();
+const SfsFile = @This();
 
 alloc: std.mem.Allocator,
-
+archive: *Archive,
-archive: Archive,
 
 inode: Inode,
 name: []const u8,
 
-/// Creates a new File from an inode. Takes ownership of the Inode and creates a copy of the given name.
+/// The given allocator must have been used to create the Inode and name.
-/// Requires the given allocator was used to create the Inode.
+pub fn init(alloc: std.mem.Allocator, archive: *Archive, inode: Inode, name: []const u8) SfsFile {
-pub fn init(alloc: std.mem.Allocator, archive: Archive, in: Inode, name: []const u8) !File {
-    const new_name = try alloc.alloc(u8, name.len);
-    @memcpy(new_name, name);
     return .{
         .alloc = alloc,
-
         .archive = archive,
 
-        .inode = in,
+        .inode = inode,
+        .name = name,
+    };
+}
+pub fn initDirEntry(alloc: std.mem.Allocator, io: Io, archive: *Archive, entry: Directory.Entry) !SfsFile {
+    const new_name = try alloc.alloc(u8, entry.name.len);
+    defer alloc.free(new_name);
+    @memcpy(new_name, entry.name);
+
+    return .{
+        .alloc = alloc,
+        .archive = archive,
+
+        .inode = try .initDirEntry(
+            alloc,
+            io,
+            &archive.cache,
+            archive.super.inode_start,
+            archive.super.block_size,
+            entry,
+        ),
         .name = new_name,
     };
 }
-pub fn fromDirEntry(alloc: std.mem.Allocator, archive: Archive, ent: DirEntry) !File {
+/// Creates a new copy of the given SfsFile using the given allocator
-    var rdr = archive.file.readerAt(archive.super.inode_start + ent.block_start);
+pub fn copy(self: SfsFile, alloc: std.mem.Allocator) !SfsFile {
-    var meta: MetadataReader = .init(alloc, &rdr, archive.stateless_decomp);
+    const new_name = try alloc(u8, self.name.len);
-    try meta.interface.discardAll(ent.block_offset);
+    errdefer alloc.free(new_name);
 
-    var in: Inode = try .read(alloc, &meta.interface, archive.super.block_size);
+    return .{
-    errdefer in.deinit(alloc);
+        .alloc = alloc,
-    return .init(alloc, archive, in, ent.name);
+        .archive = self.archive,
+
+        .inode = try self.inode.copy(alloc),
+        .name = new_name,
+    };
 }
-pub fn deinit(self: File) void {
+pub fn deinit(self: SfsFile) void {
-    self.alloc.free(self.name);
     self.inode.deinit(self.alloc);
+    self.alloc.free(self.name);
 }
 
-pub fn open(self: File, alloc: std.mem.Allocator, io: Io, filepath: []const u8) !File {
+/// Attempts to open the filepath if the SfsFile is a directory.
-    const entries = try self.inode.readDirectory(
+/// If the given path refers to itself (such as "" or "."), a copied SfsFile is returned.
-        alloc,
+pub fn open(self: SfsFile, alloc: std.mem.Allocator, io: Io, filepath: []const u8) !SfsFile {
-        self.archive.file,
-        self.archive.stateless_decomp,
-        self.archive.super.dir_start,
-    );
-    defer {
-        for (entries) |ent|
-            alloc.free(ent.name);
-        alloc.free(entries);
-    }
     const path = std.mem.trim(u8, filepath, "/");
+
     const first_element: []const u8 = std.mem.sliceTo(path, '/');
 
-    var search_slice = entries;
+    const dir: Directory = try self.inode.directory(alloc, io, &self.archive.cache, self.archive.super.dir_start);
+    defer dir.deinit(alloc);
+
+    var cur_slice = dir.entries;
     var idx: usize = undefined;
-    while (search_slice.len > 0) {
+    while (cur_slice.len > 0) {
-        idx = search_slice.len / 2;
+        idx = cur_slice.len / 2;
-        const middle = search_slice[idx];
+        switch (std.mem.order(u8, first_element, cur_slice[idx].name)) {
-        switch (std.mem.order(u8, first_element, middle.name)) {
             .eq => break,
-            .lt => search_slice = search_slice[0..idx],
+            .lt => cur_slice = cur_slice[0..idx],
-            .gt => search_slice = search_slice[idx + 1 ..],
+            .gt => cur_slice = cur_slice[idx..],
         }
-    } else return Error.FileNotFound;
+    } else {
+        return error.NotFound;
+    }
+    if (first_element.len == path.len) return .initDirEntry(alloc, io, self.archive, cur_slice[idx]);
+    if (cur_slice[idx].type != .dir) return error.NotFound;
+    const tmp_file: SfsFile = try .initDirEntry(alloc, io, self.archive, cur_slice[idx]);
+    defer tmp_file.deinit();
 
-    const first_elem_file = try fromDirEntry(alloc, self.archive, search_slice[idx]);
+    return tmp_file.open(alloc, io, path[first_element.len..]);
-    if (first_element.len == path.len)
-        return first_elem_file;
-    defer first_elem_file.deinit();
-    return first_elem_file.open(alloc, io, path[first_element.len + 1 ..]);
 }
 
-pub fn extract(self: File, alloc: std.mem.Allocator, io: Io, filepath: []const u8, options: ExtractionOptions) !void {
+pub fn extract(self: SfsFile, alloc: std.mem.Allocator, io: Io, ext_dir: []const u8, options: ExtractionOptions) !void {
-    return self.inode.extract(alloc, io, self.archive.file, self.archive.super, filepath, options);
+    _ = self;
+    _ = alloc;
+    _ = io;
+    _ = ext_dir;
+    _ = options;
+    return error.TODO;
 }
-
-// Types
-
-pub const Error = error{
-    FileNotFound,
-} || Inode.Error;

src/frag.zig

@@ -1,85 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-
-const BlockSize = @import("inode_data/file.zig").BlockSize;
-const LookupTable = @import("lookup_table.zig");
-const Decompressor = @import("util/decompressor.zig");
-const MetadataReader = @import("util/metadata.zig");
-const OffsetFile = @import("util/offset_file.zig");
-
-const FragManager = @This();
-
-pub const FragEntry = extern struct {
-    start: u64,
-    size: BlockSize,
-    _: u32,
-};
-
-alloc: std.mem.Allocator,
-fil: OffsetFile,
-decomp: *const Decompressor,
-block_size: u32,
-
-entries: []FragEntry,
-
-frag_cache: std.array_hash_map.Auto(u32, []u8),
-cache_mut: std.Io.RwLock = .init,
-
-pub fn init(alloc: std.mem.Allocator, fil: OffsetFile, decomp: *const Decompressor, frag_start: u64, frag_num: u32, block_size: u32) !FragManager {
-    const first_offset: u64 = std.mem.readInt(u64, @ptrCast(fil.map.memory[frag_start .. frag_start + 8]), .little);
-
-    var rdr = fil.readerAt(first_offset);
-    var meta: MetadataReader = .init(alloc, &rdr, decomp);
-
-    const entries = try alloc.alloc(FragEntry, frag_num);
-    errdefer alloc.free(entries);
-
-    try meta.interface.readSliceEndian(FragEntry, entries, .little);
-
-    return .{
-        .alloc = alloc,
-        .fil = fil,
-        .decomp = decomp,
-        .block_size = block_size,
-
-        .entries = entries,
-
-        .frag_cache = .empty,
-    };
-}
-pub fn deinit(self: *FragManager, io: Io) void {
-    self.cache_mut.lockUncancelable(io);
-    self.alloc.free(self.entries);
-    for (self.frag_cache.values()) |v|
-        self.alloc.free(v);
-    self.frag_cache.deinit(self.alloc);
-}
-
-pub fn get(self: *FragManager, io: Io, idx: u32) ![]u8 {
-    {
-        try self.cache_mut.lockShared(io);
-        defer self.cache_mut.unlockShared(io);
-        if (self.frag_cache.contains(idx))
-            return self.frag_cache.get(idx).?;
-    }
-
-    try self.cache_mut.lock(io);
-    defer self.cache_mut.unlock(io);
-
-    if (self.frag_cache.contains(idx))
-        return self.frag_cache.get(idx).?;
-
-    const entry = self.entries[idx];
-
-    const out = try self.alloc.alloc(u8, if (entry.size.uncompressed) entry.size.size else self.block_size);
-
-    if (entry.size.uncompressed) {
-        @memcpy(out, self.fil.map.memory[entry.start .. entry.start + entry.size.size]);
-    } else {
-        @branchHint(.likely);
-        _ = try self.decomp.Decompress(self.alloc, self.fil.map.memory[entry.start .. entry.start + entry.size.size], out);
-    }
-
-    try self.frag_cache.put(self.alloc, idx, out);
-    return out;
-}

src/inode.zig

@@ -1,169 +1,118 @@
-//! A file-system object. Represents a File or directory.
-
 const std = @import("std");
-const Reader = std.Io.Reader;
 const Io = std.Io;
+const Reader = Io.Reader;
 
-const Archive = @import("archive.zig");
+const DecompCache = @import("decomp_cache.zig");
-const Decomp = @import("decomp.zig").Decomp;
+const Directory = @import("directory.zig");
-const DirEntry = @import("directory.zig");
+const MetadataReader = @import("meta_rdr.zig");
-const ExtractionOptions = @import("options.zig");
-const FragEntry = @import("frag.zig").FragEntry;
-const FragManager = @import("frag.zig");
-const dir = @import("inode_data/dir.zig");
-const file = @import("inode_data/file.zig");
-const misc = @import("inode_data/misc.zig");
-const LookupTable = @import("lookup_table.zig");
-const CachedTable = LookupTable.CachedTable;
-const DataExtractor = @import("util/data_extractor.zig");
-const DataReader = @import("util/data_reader.zig");
-const Decompressor = @import("util/decompressor.zig");
-const MetadataReader = @import("util/metadata.zig");
-const OffsetFile = @import("util/offset_file.zig");
-const SharedCache = @import("util/shared_cache.zig");
-const XattrTable = @import("xattr_table.zig");
 
 const Inode = @This();
 
 hdr: Header,
 data: Data,
 
-pub fn read(alloc: std.mem.Allocator, rdr: *Reader, block_size: u32) !Inode {
+/// Read an inode given an inode Ref.
+pub fn initRef(alloc: std.mem.Allocator, io: Io, cache: *DecompCache, inode_start: u64, block_size: u32, ref: Ref) !Inode {
+    var meta: MetadataReader = .init(io, cache, inode_start + ref.block_start);
+    defer meta.deinit(io);
+    try meta.interface.discardAll(ref.block_offset);
+
+    return .init(alloc, &meta.interface, block_size);
+}
+pub fn initDirEntry(alloc: std.mem.Allocator, io: Io, cache: *DecompCache, inode_start: u64, block_size: u32, entry: Directory.Entry) !Inode {
+    var meta: MetadataReader = .init(io, cache, inode_start + entry.block_start);
+    defer meta.deinit(io);
+    try meta.interface.discardAll(entry.block_offset);
+
+    return .init(alloc, &meta.interface, block_size);
+}
+/// Read the inode from the given Reader.
+pub fn init(alloc: std.mem.Allocator, rdr: *Reader, block_size: u32) !Inode {
     var hdr: Header = undefined;
     try rdr.readSliceEndian(Header, @ptrCast(&hdr), .little);
+    const data: Data = switch (hdr.type) {
+        .dir => .{ .dir = try .init(rdr) },
+        .file => .{ .file = try .init(alloc, rdr, block_size) },
+        .symlink => .{ .symlink = try .init(alloc, rdr) },
+        .block_dev => .{ .block_dev = try .init(rdr) },
+        .char_dev => .{ .char_dev = try .init(rdr) },
+        .fifo => .{ .fifo = try .init(rdr) },
+        .socket => .{ .socket = try .init(rdr) },
+        .ext_dir => .{ .ext_dir = try .init(rdr) },
+        .ext_file => .{ .ext_file = try .init(alloc, rdr, block_size) },
+        .ext_symlink => .{ .ext_symlink = try .init(alloc, rdr) },
+        .ext_block_dev => .{ .ext_block_dev = try .init(rdr) },
+        .ext_char_dev => .{ .ext_char_dev = try .init(rdr) },
+        .ext_fifo => .{ .ext_fifo = try .init(rdr) },
+        .ext_socket => .{ .ext_socket = try .init(rdr) },
+    };
     return .{
         .hdr = hdr,
-        .data = switch (hdr.inode_type) {
+        .data = data,
-            .dir => .{ .dir = try .read(rdr) },
-            .file => .{ .file = try .read(alloc, rdr, block_size) },
-            .symlink => .{ .symlink = try .read(alloc, rdr) },
-            .block_dev => .{ .block_dev = try .read(rdr) },
-            .char_dev => .{ .char_dev = try .read(rdr) },
-            .fifo => .{ .fifo = try .read(rdr) },
-            .socket => .{ .socket = try .read(rdr) },
-            .ext_dir => .{ .ext_dir = try .read(rdr) },
-            .ext_file => .{ .ext_file = try .read(alloc, rdr, block_size) },
-            .ext_symlink => .{ .ext_symlink = try .read(alloc, rdr) },
-            .ext_block_dev => .{ .ext_block_dev = try .read(rdr) },
-            .ext_char_dev => .{ .ext_char_dev = try .read(rdr) },
-            .ext_fifo => .{ .ext_fifo = try .read(rdr) },
-            .ext_socket => .{ .ext_socket = try .read(rdr) },
-        },
     };
 }
+pub fn copy(self: Inode, alloc: std.mem.Allocator) !Inode {
+    var new_inode = self;
+    switch (new_inode.data) {
+        .file => |*f| {
+            if (f.blocks.len > 0) {
+                f.blocks = try alloc.alloc(DataBlock, f.blocks.len);
+                @memcpy(f.blocks, self.data.file.blocks);
+            }
+        },
+        .ext_file => |*f| {
+            if (f.blocks.len > 0) {
+                f.blocks = try alloc.alloc(DataBlock, f.blocks.len);
+                @memcpy(f.blocks, self.data.ext_file.blocks);
+            }
+        },
+        .symlink => |*s| {
+            s.target = try alloc.alloc(u8, s.target.len);
+            @memcpy(s.target, self.data.symlink.target);
+        },
+        .ext_symlink => |*s| {
+            s.target = try alloc.alloc(u8, s.target.len);
+            @memcpy(s.target, self.data.ext_symlink.target);
+        },
+    }
+    return new_inode;
+}
 pub fn deinit(self: Inode, alloc: std.mem.Allocator) void {
     switch (self.data) {
-        .file => |d| d.deinit(alloc),
+        .file => |f| f.deinit(alloc),
-        .symlink => |d| d.deinit(alloc),
+        .ext_file => |f| f.deinit(alloc),
-        .ext_file => |d| d.deinit(alloc),
+        .symlink => |s| s.deinit(alloc),
-        .ext_symlink => |d| d.deinit(alloc),
+        .ext_symlink => |s| s.deinit(alloc),
         else => {},
     }
 }
 
-// Utility Functions
+// Utility functions
 
-/// Read the directory entries
+pub fn directory(self: Inode, alloc: std.mem.Allocator, io: Io, cache: *DecompCache, dir_start: u64) !Directory {
-pub fn readDirectory(self: Inode, alloc: std.mem.Allocator, fil: OffsetFile, decomp: *const Decompressor, dir_offset: u64) ![]DirEntry {
     return switch (self.data) {
-        .dir => |d| readDirFromData(alloc, fil, decomp, dir_offset, d),
+        .dir => |d| readDirectory(alloc, io, cache, dir_start, d),
-        .ext_dir => |d| readDirFromData(alloc, fil, decomp, dir_offset, d),
+        .ext_dir => |d| readDirectory(alloc, io, cache, dir_start, d),
-        else => Error.NotDirectory,
+        else => error.NotDirectory,
     };
 }
-fn readDirFromData(alloc: std.mem.Allocator, fil: OffsetFile, decomp: *const Decompressor, dir_offset: u64, d: anytype) ![]DirEntry {
+fn readDirectory(alloc: std.mem.Allocator, io: Io, cache: *DecompCache, dir_start: u64, d: anytype) !Directory {
-    var rdr = fil.readerAt(dir_offset + d.block_start);
+    var meta: MetadataReader = .init(io, cache, dir_start + d.block_start);
-    var meta: MetadataReader = .init(alloc, &rdr, decomp);
+    defer meta.deinit(io);
     try meta.interface.discardAll(d.block_offset);
 
-    return DirEntry.readDirectory(alloc, &meta.interface, d.size);
+    return .init(alloc, &meta.interface, d.size);
-}
-/// Get a reader for a regular file's data.
-pub fn dataReader(self: Inode, alloc: std.mem.Allocator, io: Io, fil: OffsetFile, cache: *SharedCache, decomp: *const Decompressor, block_size: u32) !DataReader {
-    return switch (self.data) {
-        .file => |f| getReaderFromData(alloc, io, fil, cache, decomp, block_size, f),
-        .ext_file => |f| getReaderFromData(alloc, io, fil, cache, decomp, block_size, f),
-        else => Error.NotRegularFile,
-    };
-}
-fn getReaderFromData(alloc: std.mem.Allocator, io: Io, fil: OffsetFile, cache: *SharedCache, decomp: *const Decompressor, block_size: u32, d: anytype) !DataReader {
-    const ext: DataReader = .init(alloc, io, fil, cache, decomp, block_size, d.size, d.block_start, d.blocks);
-    if (d.frag_block_offset == 0xFFFFFFFF) {
-        // TODO:
-        return error.TODO;
-    }
-    return ext;
-}
-/// Get an extractor for a regular file's data.
-pub fn dataExtractor(self: Inode, fil: OffsetFile, cache: *SharedCache, decomp: *const Decompressor, block_size: u32) !DataExtractor {
-    return switch (self.data) {
-        .file => |f| getExtractorFromData(fil, cache, decomp, block_size, f),
-        .ext_file => |f| getExtractorFromData(fil, cache, decomp, block_size, f),
-        else => Error.NotRegularFile,
-    };
-}
-fn getExtractorFromData(fil: OffsetFile, cache: *SharedCache, decomp: *const Decompressor, block_size: u32, d: anytype) !DataExtractor {
-    const ext: DataExtractor = .init(fil, cache, decomp, block_size, d.size, d.block_start, d.blocks);
-    if (d.frag_block_offset == 0xFFFFFFFF) {
-        // TODO:
-        return error.TODO;
-    }
-    return ext;
-}
-/// Get a symlink's target path
-pub fn symlinkTarget(self: Inode) ![]const u8 {
-    return switch (self.data) {
-        .symlink => |s| s.target,
-        .ext_symlink => |s| s.target,
-        else => Error.NotSymlink,
-    };
-}
-/// Get inode's gid
-pub fn gid(self: Inode, alloc: std.mem.Allocator, io: Io, fil: OffsetFile, decomp: *const Decompressor, id_table_start: u64) !u16 {
-    return LookupTable.lookupValue(u16, alloc, io, decomp, fil, id_table_start, self.hdr.gid_idx);
-}
-/// Get inode's uid
-pub fn uid(self: Inode, alloc: std.mem.Allocator, io: Io, fil: OffsetFile, decomp: *const Decompressor, id_table_start: u64) !u16 {
-    return LookupTable.lookupValue(u16, alloc, io, decomp, fil, id_table_start, self.hdr.uid_idx);
-}
-/// Get the inode's xattr values as an index into the Archive's xattr table.
-/// Returns error.NoXattr if the inode doesn't have extended attributes.
-pub fn xattrIndex(self: Inode) !u32 {
-    const idx = switch (self.data) {
-        .ext_dir => |e| e.xattr_idx,
-        .ext_file => |e| e.xattr_idx,
-        .ext_symlink => |e| e.xattr_idx,
-        .ext_block_dev => |e| e.xattr_idx,
-        .ext_char_dev => |e| e.xattr_idx,
-        .ext_fifo => |e| e.xattr_idx,
-        .ext_socket => |e| e.xattr_idx,
-        else => return error.NoXattr,
-    };
-    if (idx == 0xFFFFFFFF) return error.NoXattr;
-    return idx;
-}
-// Get an inode's xattr values. If the inode does not have xattr values (including if the inode is not an extended type), an empty slice is returned.
-pub fn xattrValues(self: Inode, alloc: std.mem.Allocator, io: Io, fil: OffsetFile, decomp: *const Decompressor, xattr_table_start: u64) ![]XattrTable.XattrOwned {
-    const idx = self.xattrIndex() catch &[0]XattrTable.XattrOwned{};
-    return XattrTable.statelessLookup(alloc, io, decomp, fil, xattr_table_start, idx);
 }
 
 // Types
 
-pub const Error = error{
-    NotDirectory,
-    NotRegularFile,
-    NotSymlink,
-    NotExtended,
-};
-
 pub const Ref = packed struct(u64) {
     block_offset: u16,
     block_start: u32,
-    _: u16 = 0,
+    _: u16,
 };
 
-pub const Type = enum(u16) {
+pub const Enum = enum(u16) {
     dir = 1,
     file,
     symlink,
@@ -180,456 +129,270 @@ pub const Type = enum(u16) {
     ext_socket,
 };
 
-pub const Data = union(Type) {
-    dir: dir.Dir,
-    file: file.File,
-    symlink: misc.Symlink,
-    block_dev: misc.Dev,
-    char_dev: misc.Dev,
-    fifo: misc.IPC,
-    socket: misc.IPC,
-    ext_dir: dir.ExtDir,
-    ext_file: file.ExtFile,
-    ext_symlink: misc.ExtSymlink,
-    ext_block_dev: misc.ExtDev,
-    ext_char_dev: misc.ExtDev,
-    ext_fifo: misc.ExtIPC,
-    ext_socket: misc.ExtIPC,
-};
-
 pub const Header = extern struct {
-    inode_type: Type,
+    type: Enum,
-    permissions: u16,
+    permission: u16,
     uid_idx: u16,
     gid_idx: u16,
     mod_time: u32,
     num: u32,
 };
 
-// Extract
+pub const Data = union(Enum) {
-
+    dir: Dir,
-const ExtractError = error{ MknodFailed, CannotSetXattr } || DataExtractor.Error || DirEntry.Error ||
+    file: File,
-    Decompressor.Error || Io.File.Atomic.InitError || Io.File.Atomic.LinkError || Io.Dir.SymLinkError;
+    symlink: Symlink,
-const PathRet = struct {
+    block_dev: Device,
-    path: []const u8,
+    char_dev: Device,
-    inode: Inode,
+    fifo: IPC,
-    origin: bool,
+    socket: IPC,
-
+    ext_dir: ExtDir,
-    fn deinit(self: PathRet, alloc: std.mem.Allocator) void {
+    ext_file: ExtFile,
-        if (self.origin) return;
+    ext_symlink: ExtSymlink,
-        alloc.free(self.path);
+    ext_block_dev: ExtDevice,
-        self.inode.deinit(alloc);
+    ext_char_dev: ExtDevice,
-    }
+    ext_fifo: ExtIPC,
-    fn setMetadata(self: PathRet, alloc: std.mem.Allocator, io: Io, id_table: *CachedTable(u16), xattr_table: ?*XattrTable, options: ExtractionOptions) !void {
+    ext_socket: ExtIPC,
-        var fil = try Io.Dir.cwd().openFile(io, self.path, .{});
-        defer fil.close(io);
-
-        const inode = self.inode;
-
-        if (!options.ignore_permissions) {
-            try fil.setPermissions(io, @enumFromInt(inode.hdr.permissions));
-            try fil.setOwner(io, try id_table.get(io, inode.hdr.uid_idx), try id_table.get(io, inode.hdr.gid_idx));
-        }
-        if (xattr_table != null) {
-            const idx = inode.xattrIndex() catch return;
-
-            const xattrs = try xattr_table.?.get(alloc, io, idx);
-            defer {
-                for (xattrs) |x|
-                    x.deinit(alloc);
-                alloc.free(xattrs);
-            }
-
-            const sentinel_path = try std.mem.concatWithSentinel(alloc, u8, &[_][]const u8{self.path}, 0);
-            defer alloc.free(sentinel_path);
-            for (xattrs) |x| {
-                const xattr_ret = std.os.linux.fsetxattr(fil.handle, x.key, x.value.ptr, x.value.len, 0);
-                if (xattr_ret != 0)
-                    return ExtractError.CannotSetXattr;
-            }
-        }
-    }
-};
-fn DirCompare(_: void, a: PathRet, b: PathRet) std.math.Order {
-    return std.math.order(std.mem.count(u8, a.path, "/"), std.mem.count(u8, b.path, "/"));
-}
-const ExtractReturnUnion = union(enum) {
-    path_ret: ExtractError!PathRet,
-};
-const Tables = struct {
-    id: LookupTable.CachedTable(u16),
-    frag: LookupTable.CachedTable(FragEntry),
-    xattr: XattrTable,
 };
 
-/// Extracts the given inode to the given path. If the inode not a directory, the given path must not exist.
+pub const DataBlock = packed struct(u32) {
-/// If the inode is a directory the path must not exist or be a directory.
+    size: u24,
-pub fn extract(
+    uncompressed: bool,
-    self: Inode,
+    _: u7,
-    alloc: std.mem.Allocator,
-    io: Io,
-    fil: OffsetFile,
-    super: Archive.Superblock,
-    filepath: []const u8,
-    options: ExtractionOptions,
-) !void {
-    const path = std.mem.trimEnd(u8, filepath, "/");
-
-    var decomp_base: Decomp = try .init(super.compression, alloc, io, super.block_size);
-    decomp_base.deinit(alloc);
-    const decomp = decomp_base.decompressor();
-
-    var frag_mgr: FragManager = try .init(alloc, fil, decomp, super.frag_start, super.frag_count, super.block_size);
-    defer frag_mgr.deinit(io);
-
-    if (options.single_threaded)
-        return self.extractSinglethreaded(alloc, io, fil, super, path, options, decomp, &frag_mgr);
-
-    var sel_buf: [10]ExtractReturnUnion = undefined;
-    var sel: Io.Select(ExtractReturnUnion) = .init(io, &sel_buf);
-    defer sel.cancelDiscard();
-
-    var loop = io.async(finishLoop, .{ alloc, io, fil, decomp, super, options, &sel });
-
-    sel.async(.path_ret, extractRealAsync, .{ self, alloc, io, fil, super, decomp, &sel, &frag_mgr, path, true });
-
-    try loop.await(io);
-}
-fn extractRealAsync(
-    self: Inode,
-    alloc: std.mem.Allocator,
-    io: Io,
-    fil: OffsetFile,
-    super: Archive.Superblock,
-    decomp: *const Decompressor,
-    sel: *Io.Select(ExtractReturnUnion),
-    frag_mgr: *FragManager,
-    path: []const u8,
-    origin: bool,
-) ExtractError!PathRet {
-    errdefer {
-        if (!origin) {
-            self.deinit(alloc);
-            alloc.free(path);
-        }
-    }
-    switch (self.hdr.inode_type) {
-        .dir, .ext_dir => {
-            try Io.Dir.cwd().createDir(io, path, @enumFromInt(0o777));
-
-            const entries = self.readDirectory(alloc, fil, decomp, super.dir_start) catch |err| switch (err) {
-                Error.NotDirectory, Error.NotExtended, Error.NotRegularFile, Error.NotSymlink => unreachable,
-                else => |e| return e,
-            };
-            defer {
-                for (entries) |e|
-                    e.deinit(alloc);
-                alloc.free(entries);
-            }
-
-            for (entries) |e| {
-                const new_path = try std.mem.concat(alloc, u8, &[_][]const u8{ path, "/", e.name });
-                errdefer alloc.free(new_path);
-
-                var rdr = fil.readerAt(super.inode_start + e.block_start);
-                var meta: MetadataReader = .init(alloc, &rdr, decomp);
-                try meta.interface.discardAll(e.block_offset);
-
-                const new_inode = try read(alloc, &meta.interface, super.block_size);
-                errdefer new_inode.deinit(alloc);
-
-                sel.async(.path_ret, extractRealAsync, .{ new_inode, alloc, io, fil, super, decomp, sel, frag_mgr, new_path, false });
-            }
-        },
-        .file, .ext_file => {
-            var atomic = try Io.Dir.cwd().createFileAtomic(io, path, .{ .make_path = true });
-            defer atomic.deinit(io);
-
-            var ext: DataExtractor = switch (self.data) {
-                .file => |f| blk: {
-                    var ext: DataExtractor = .init(fil, decomp, super.block_size, f.size, f.block_start, f.block_sizes);
-                    if (f.frag_idx != 0xFFFFFFFF)
-                        ext.addFrag(f.frag_block_offset, try frag_mgr.get(io, f.frag_idx));
-                    break :blk ext;
-                },
-                .ext_file => |f| blk: {
-                    var ext: DataExtractor = .init(fil, decomp, super.block_size, f.size, f.block_start, f.block_sizes);
-                    if (f.frag_idx != 0xFFFFFFFF)
-                        ext.addFrag(f.frag_block_offset, try frag_mgr.get(io, f.frag_idx));
-                    break :blk ext;
-                },
-                else => unreachable,
 };
 
-            try ext.extractAsync(alloc, io, atomic.file);
+const Dir = extern struct {
+    block_start: u32,
+    hard_links: u32,
+    size: u16,
+    block_offset: u16,
+    parent: u32,
 
-            try atomic.link(io);
+    const Self = @This();
-        },
-        .symlink, .ext_symlink => try Io.Dir.cwd().symLink(io, self.symlinkTarget() catch unreachable, path, .{}),
-        else => {
-            var mode: u32 = undefined;
-            var dev: u32 = 0;
 
-            const DT = std.posix.DT;
+    fn init(rdr: *Reader) !Self {
-
+        var dir: Self = undefined;
-            switch (self.data) {
+        try rdr.readSliceEndian(Self, @ptrCast(&dir), .little);
-                .char_dev => |d| {
+        return dir;
-                    dev = d.dev;
-                    mode = DT.CHR;
-                },
-                .ext_char_dev => |d| {
-                    dev = d.dev;
-                    mode = DT.CHR;
-                },
-                .block_dev => |d| {
-                    dev = d.dev;
-                    mode = DT.BLK;
-                },
-                .ext_block_dev => |d| {
-                    dev = d.dev;
-                    mode = DT.BLK;
-                },
-                .fifo, .ext_fifo => mode = DT.FIFO,
-                .socket, .ext_socket => mode = DT.SOCK,
-                else => unreachable,
     }
+};
+const ExtDir = extern struct {
+    hard_links: u32,
+    size: u32,
+    block_start: u32,
+    parent: u32,
+    idx_count: u16,
+    block_offset: u16,
+    xattr_idx: u32,
+    // []DirIndex
 
-            const sentinel_path = try std.mem.concatWithSentinel(alloc, u8, &[_][]const u8{path}, 0);
+    const Self = @This();
-            const res = std.os.linux.mknod(sentinel_path, mode, dev);
+
-            alloc.free(sentinel_path);
+    fn init(rdr: *Reader) !Self {
-            if (res != 0)
+        var dir: Self = undefined;
-                return ExtractError.MknodFailed;
+        try rdr.readSliceEndian(Self, @ptrCast(&dir), .little);
-        },
+        return dir;
     }
+};
+
+const File = struct {
+    data_start: u32,
+    frag_idx: u32,
+    frag_offset: u32,
+    size: u32,
+    blocks: []DataBlock,
+
+    const Raw = extern struct {
+        data_start: u32,
+        frag_idx: u32,
+        frag_offset: u32,
+        size: u32,
+    };
+
+    const Self = @This();
+
+    pub fn init(alloc: std.mem.Allocator, rdr: *Reader, block_size: u32) !Self {
+        var raw: Raw = undefined;
+        try rdr.readSliceEndian(Raw, @ptrCast(&raw), .little);
+
+        var blocks_num = raw.size / block_size;
+        if (raw.frag_idx == 0xFFFFFFFF and raw.size % block_size > 0)
+            blocks_num += 1;
+
+        const blocks: []DataBlock = try alloc.alloc(DataBlock, blocks_num);
+        errdefer alloc.free(blocks);
+
+        try rdr.readSliceEndian(DataBlock, blocks, .little);
         return .{
-        .path = path,
+            .data_start = raw.data_start,
-        .inode = self,
+            .frag_idx = raw.frag_idx,
-        .origin = origin,
+            .frag_offset = raw.frag_offset,
+            .size = raw.size,
+            .blocks = blocks,
         };
     }
-fn finishLoop(alloc: std.mem.Allocator, io: Io, fil: OffsetFile, decomp: *const Decompressor, super: Archive.Superblock, options: ExtractionOptions, sel: *Io.Select(ExtractReturnUnion)) !void {
+    pub fn deinit(self: File, alloc: std.mem.Allocator) void {
-    var id_table: CachedTable(u16) = .init(alloc, fil, decomp, super.id_start, super.id_count);
+        alloc.free(self.blocks);
-    defer id_table.deinit(io);
-
-    var xattr_table: ?XattrTable = if (super.flags.xattr_never or options.ignore_xattr or !@hasField(std.os, "linux"))
-        null
-    else
-        try .init(alloc, fil, decomp, super.xattr_start);
-    defer if (xattr_table != null) xattr_table.?.deinit(io);
-
-    var dir_queue: std.PriorityDequeue(PathRet, void, DirCompare) = .empty;
-    defer dir_queue.deinit(alloc);
-
-    while (true) {
-        if (sel.group.token.load(.unordered) == null) break;
-
-        const ret = try sel.await();
-        const path_ret = try ret.path_ret;
-
-        if (options.ignore_permissions and xattr_table == null) {
-            path_ret.deinit(alloc);
-            continue;
     }
-
-        if (path_ret.inode.hdr.inode_type == .dir or path_ret.inode.hdr.inode_type == .ext_dir) {
-            try dir_queue.push(alloc, path_ret);
-            continue;
-        }
-        defer path_ret.deinit(alloc);
-
-        try path_ret.setMetadata(alloc, io, &id_table, if (xattr_table == null) null else &xattr_table.?, options);
-    }
-
-    while (sel.cancel()) |ret| {
-        const path_ret = try ret.path_ret;
-
-        if (options.ignore_permissions and xattr_table == null) {
-            path_ret.deinit(alloc);
-            continue;
-        }
-
-        if (path_ret.inode.hdr.inode_type == .dir or path_ret.inode.hdr.inode_type == .ext_dir) {
-            try dir_queue.push(alloc, path_ret);
-            continue;
-        }
-
-        defer path_ret.deinit(alloc);
-        try path_ret.setMetadata(alloc, io, &id_table, if (xattr_table == null) null else &xattr_table.?, options);
-    }
-
-    var iter = dir_queue.iterator();
-    while (iter.next()) |path_ret| {
-        defer path_ret.deinit(alloc);
-        try path_ret.setMetadata(alloc, io, &id_table, if (xattr_table == null) null else &xattr_table.?, options);
-    }
-}
-/// Extracts the given inode to the given path. If the inode not a directory, the given path must not exist.
-/// If the inode is a directory the path must not exist or be a directory.
-fn extractSinglethreaded(
-    self: Inode,
-    alloc: std.mem.Allocator,
-    io: Io,
-    fil: OffsetFile,
-    super: Archive.Superblock,
-    path: []const u8,
-    options: ExtractionOptions,
-    decomp: *const Decompressor,
-    frag: *FragManager,
-) !void {
-    var id_table: CachedTable(u16) = .init(alloc, fil, decomp, super.id_start, super.id_count);
-    defer id_table.deinit(io);
-
-    var xattr_table: ?XattrTable = if (super.flags.xattr_never or options.ignore_xattr or !@hasField(std.os, "linux"))
-        null
-    else
-        try .init(alloc, fil, decomp, super.xattr_start);
-    defer if (xattr_table != null) xattr_table.?.deinit(io);
-
-    return self.extractReal(
-        alloc,
-        io,
-        fil,
-        super,
-        decomp,
-        frag,
-        &id_table,
-        if (xattr_table == null) null else &xattr_table.?,
-        path,
-        options,
-    );
-}
-fn extractReal(
-    self: Inode,
-    alloc: std.mem.Allocator,
-    io: Io,
-    fil: OffsetFile,
-    super: Archive.Superblock,
-    decomp: *const Decompressor,
-    frag_mgr: *FragManager,
-    id_table: *CachedTable(u16),
-    xattr_table: ?*XattrTable,
-    path: []const u8,
-    options: ExtractionOptions,
-) !void {
-    switch (self.hdr.inode_type) {
-        .dir, .ext_dir => {
-            try Io.Dir.cwd().createDir(io, path, @enumFromInt(0o777));
-
-            const entries = self.readDirectory(alloc, fil, decomp, super.dir_start) catch |err| switch (err) {
-                Error.NotDirectory, Error.NotExtended, Error.NotRegularFile, Error.NotSymlink => unreachable,
-                else => |e| return e,
 };
-            defer {
+const ExtFile = struct {
-                for (entries) |e|
+    data_start: u64,
-                    e.deinit(alloc);
+    size: u64,
-                alloc.free(entries);
+    sparse: u64,
-            }
+    hard_links: u32,
+    frag_idx: u32,
+    frag_offset: u32,
+    xattr_idx: u32,
+    blocks: []DataBlock,
 
-            for (entries) |e| {
+    const Raw = extern struct {
-                const new_path = try std.mem.concat(alloc, u8, &[_][]const u8{ path, "/", e.name });
+        data_start: u64,
-                defer alloc.free(new_path);
+        size: u64,
-
+        sparse: u64,
-                var rdr = fil.readerAt(super.inode_start + e.block_start);
+        hard_links: u32,
-                var meta: MetadataReader = .init(alloc, &rdr, decomp);
+        frag_idx: u32,
-                try meta.interface.discardAll(e.block_offset);
+        frag_offset: u32,
-
+        xattr_idx: u32,
-                const new_inode = try read(alloc, &meta.interface, super.block_size);
-                defer new_inode.deinit(alloc);
-
-                try new_inode.extractReal(alloc, io, fil, super, decomp, frag_mgr, id_table, xattr_table, new_path, options);
-            }
-        },
-        .file, .ext_file => {
-            var atomic = try Io.Dir.cwd().createFileAtomic(io, path, .{ .make_path = true });
-            defer atomic.deinit(io);
-
-            var rdr: DataReader = switch (self.data) {
-                .file => |f| blk: {
-                    var ext: DataReader = try .init(alloc, io, fil, decomp, super.block_size, f.size, f.block_start, f.block_sizes);
-                    if (f.frag_idx != 0xFFFFFFFF)
-                        ext.addFrag(f.frag_block_offset, try frag_mgr.get(io, f.frag_idx));
-                    break :blk ext;
-                },
-                .ext_file => |f| blk: {
-                    var ext: DataReader = try .init(alloc, io, fil, decomp, super.block_size, f.size, f.block_start, f.block_sizes);
-                    if (f.frag_idx != 0xFFFFFFFF)
-                        ext.addFrag(f.frag_block_offset, try frag_mgr.get(io, f.frag_idx));
-                    break :blk ext;
-                },
-                else => unreachable,
     };
-            defer rdr.deinit();
 
-            var buf: [512 * 1024]u8 = undefined;
+    const Self = @This();
-            var wrt = atomic.file.writer(io, &buf);
 
-            _ = try rdr.interface.streamRemaining(&wrt.interface);
+    pub fn init(alloc: std.mem.Allocator, rdr: *Reader, block_size: u32) !Self {
+        var raw: Raw = undefined;
+        try rdr.readSliceEndian(Raw, @ptrCast(&raw), .little);
 
-            try wrt.flush();
+        var blocks_num = raw.size / block_size;
+        if (raw.frag_idx == 0xFFFFFFFF and raw.size % block_size > 0)
+            blocks_num += 1;
 
-            try atomic.link(io);
+        const blocks: []DataBlock = try alloc.alloc(DataBlock, blocks_num);
-        },
+        errdefer alloc.free(blocks);
-        .symlink, .ext_symlink => try Io.Dir.cwd().symLink(io, self.symlinkTarget() catch unreachable, path, .{}),
-        else => {
-            var mode: u32 = undefined;
-            var dev: u32 = 0;
 
-            const DT = std.posix.DT;
+        try rdr.readSliceEndian(DataBlock, blocks, .little);
+        return .{
+            .data_start = raw.data_start,
+            .size = raw.size,
+            .sparse = raw.sparse,
+            .hard_links = raw.hard_links,
+            .frag_idx = raw.frag_idx,
+            .frag_offset = raw.frag_offset,
+            .xattr_idx = raw.xattr_idx,
+            .blocks = blocks,
+        };
+    }
+    pub fn deinit(self: ExtFile, alloc: std.mem.Allocator) void {
+        alloc.free(self.blocks);
+    }
+};
 
-            switch (self.data) {
+const Symlink = struct {
-                .char_dev => |d| {
+    hard_links: u32,
-                    dev = d.dev;
+    target: []const u8,
-                    mode = DT.CHR;
+
-                },
+    const Raw = extern struct {
-                .ext_char_dev => |d| {
+        hard_links: u32,
-                    dev = d.dev;
+        target_size: u32,
-                    mode = DT.CHR;
+    };
-                },
+
-                .block_dev => |d| {
+    const Self = @This();
-                    dev = d.dev;
+
-                    mode = DT.BLK;
+    pub fn init(alloc: std.mem.Allocator, rdr: *Reader) !Self {
-                },
+        var raw: Raw = undefined;
-                .ext_block_dev => |d| {
+        try rdr.readSliceEndian(Raw, @ptrCast(&raw), .little);
-                    dev = d.dev;
+
-                    mode = DT.BLK;
+        const target = try alloc.alloc(u8, raw.target_size);
-                },
+        try rdr.readSliceEndian(u8, target, .little);
-                .fifo, .ext_fifo => mode = DT.FIFO,
+
-                .socket, .ext_socket => mode = DT.SOCK,
+        return .{
-                else => unreachable,
+            .hard_links = raw.hard_links,
+            .target = target,
+        };
+    }
+    pub fn deinit(self: Symlink, alloc: std.mem.Allocator) void {
+        alloc.free(self.target);
+    }
+};
+const ExtSymlink = struct {
+    hard_links: u32,
+    xattr_idx: u32,
+    target: []const u8,
+
+    const Raw = extern struct {
+        hard_links: u32,
+        target_size: u32,
+    };
+
+    const Self = @This();
+
+    pub fn init(alloc: std.mem.Allocator, rdr: *Reader) !Self {
+        var raw: Raw = undefined;
+        try rdr.readSliceEndian(Raw, @ptrCast(&raw), .little);
+
+        const target = try alloc.alloc(u8, raw.target_size);
+        errdefer alloc.free(target);
+        try rdr.readSliceEndian(u8, target, .little);
+
+        var xattr_idx: u32 = undefined;
+        try rdr.readSliceEndian(u32, @ptrCast(&xattr_idx), .little);
+
+        return .{
+            .hard_links = raw.hard_links,
+            .target = target,
+            .xattr_idx = xattr_idx,
+        };
     }
 
-            const sentinel_path = try std.mem.concatWithSentinel(alloc, u8, &[_][]const u8{path}, 0);
+    pub fn deinit(self: ExtSymlink, alloc: std.mem.Allocator) void {
-            const res = std.os.linux.mknod(sentinel_path, mode, dev);
+        alloc.free(self.target);
-            alloc.free(sentinel_path);
-            if (res != 0)
-                return ExtractError.MknodFailed;
-        },
     }
-    if (options.ignore_permissions and options.ignore_xattr) return;
+};
 
-    var f = try Io.Dir.cwd().openFile(io, path, .{});
+const Device = extern struct {
-    defer f.close(io);
+    hard_links: u32,
+    device: u32,
 
-    if (!options.ignore_permissions) {
+    const Self = @This();
-        try f.setPermissions(io, @enumFromInt(self.hdr.permissions));
-        try f.setOwner(io, try id_table.get(io, self.hdr.uid_idx), try id_table.get(io, self.hdr.gid_idx));
-    }
-    if (xattr_table != null) {
-        const idx = self.xattrIndex() catch return;
 
-        const xattrs = try xattr_table.?.get(alloc, io, idx);
+    fn init(rdr: *Reader) !Self {
-        defer {
+        var dir: Self = undefined;
-            for (xattrs) |x|
+        try rdr.readSliceEndian(Self, @ptrCast(&dir), .little);
-                x.deinit(alloc);
+        return dir;
-            alloc.free(xattrs);
     }
+};
+const ExtDevice = extern struct {
+    hard_links: u32,
+    device: u32,
+    xattr_idx: u32,
 
-        const sentinel_path = try std.mem.concatWithSentinel(alloc, u8, &[_][]const u8{path}, 0);
+    const Self = @This();
-        defer alloc.free(sentinel_path);
+
-        for (xattrs) |x| {
+    fn init(rdr: *Reader) !Self {
-            const xattr_ret = std.os.linux.fsetxattr(f.handle, x.key, x.value.ptr, x.value.len, 0);
+        var dir: Self = undefined;
-            if (xattr_ret != 0)
+        try rdr.readSliceEndian(Self, @ptrCast(&dir), .little);
-                return ExtractError.CannotSetXattr;
+        return dir;
     }
+};
+
+const IPC = extern struct {
+    hard_links: u32,
+
+    const Self = @This();
+
+    fn init(rdr: *Reader) !Self {
+        var dir: Self = undefined;
+        try rdr.readSliceEndian(Self, @ptrCast(&dir), .little);
+        return dir;
     }
+};
+const ExtIPC = extern struct {
+    hard_links: u32,
+    xattr_idx: u32,
+
+    const Self = @This();
+
+    fn init(rdr: *Reader) !Self {
+        var dir: Self = undefined;
+        try rdr.readSliceEndian(Self, @ptrCast(&dir), .little);
+        return dir;
     }
+};

src/inode_data/dir.zig

@@ -1,32 +0,0 @@
-const Reader = @import("std").Io.Reader;
-
-pub const Dir = extern struct {
-    block_start: u32,
-    hard_links: u32,
-    size: u16,
-    block_offset: u16,
-    parent_num: u32,
-
-    pub fn read(rdr: *Reader) !Dir {
-        var d: Dir = undefined;
-        try rdr.readSliceEndian(Dir, @ptrCast(&d), .little);
-        return d;
-    }
-};
-
-pub const ExtDir = extern struct {
-    hard_links: u32,
-    size: u32,
-    block_start: u32,
-    parent_num: u32,
-    idx_count: u16,
-    block_offset: u16,
-    xattr_idx: u32,
-    // index: []DirIndex
-
-    pub fn read(rdr: *Reader) !ExtDir {
-        var d: ExtDir = undefined;
-        try rdr.readSliceEndian(ExtDir, @ptrCast(&d), .little);
-        return d;
-    }
-};

src/inode_data/file.zig

@@ -1,97 +0,0 @@
-const std = @import("std");
-const Reader = std.Io.Reader;
-
-pub const BlockSize = packed struct(u32) {
-    size: u24,
-    uncompressed: bool,
-    _: u7,
-};
-
-const FileRawRead = extern struct {
-    block_start: u32,
-    frag_idx: u32,
-    frag_block_offset: u32,
-    size: u32,
-};
-
-pub const File = struct {
-    block_start: u32,
-    frag_idx: u32,
-    frag_block_offset: u32,
-    size: u32,
-    block_sizes: []BlockSize,
-
-    pub fn read(alloc: std.mem.Allocator, rdr: *Reader, block_size: u32) !File {
-        var raw: FileRawRead = undefined;
-        try rdr.readSliceEndian(FileRawRead, @ptrCast(&raw), .little);
-
-        var num_blocks: u32 = raw.size / block_size;
-        if (raw.size % block_size != 0 and raw.frag_idx == 0xFFFFFFFF)
-            num_blocks += 1;
-
-        const sizes = try alloc.alloc(BlockSize, num_blocks);
-        errdefer alloc.free(sizes);
-        try rdr.readSliceEndian(BlockSize, sizes, .little);
-
-        return .{
-            .block_start = raw.block_start,
-            .frag_idx = raw.frag_idx,
-            .frag_block_offset = raw.frag_block_offset,
-            .size = raw.size,
-            .block_sizes = sizes,
-        };
-    }
-
-    pub fn deinit(self: File, alloc: std.mem.Allocator) void {
-        alloc.free(self.block_sizes);
-    }
-};
-
-const ExtFileRawRead = extern struct {
-    block_start: u64,
-    size: u64,
-    sparse: u64,
-    hard_links: u32,
-    frag_idx: u32,
-    frag_block_offset: u32,
-    xattr_idx: u32,
-};
-
-pub const ExtFile = struct {
-    block_start: u64,
-    size: u64,
-    sparse: u64,
-    hard_links: u32,
-    frag_idx: u32,
-    frag_block_offset: u32,
-    xattr_idx: u32,
-    block_sizes: []BlockSize,
-
-    pub fn read(alloc: std.mem.Allocator, rdr: *Reader, block_size: u32) !ExtFile {
-        var raw: ExtFileRawRead = undefined;
-        try rdr.readSliceEndian(ExtFileRawRead, @ptrCast(&raw), .little);
-
-        var num_blocks: u32 = @truncate(raw.size / block_size);
-        if (raw.size % block_size != 0 and raw.frag_idx == 0xFFFFFFFF)
-            num_blocks += 1;
-
-        const sizes = try alloc.alloc(BlockSize, num_blocks);
-        errdefer alloc.free(sizes);
-        try rdr.readSliceEndian(BlockSize, sizes, .little);
-
-        return .{
-            .block_start = raw.block_start,
-            .size = raw.size,
-            .sparse = raw.sparse,
-            .hard_links = raw.hard_links,
-            .frag_idx = raw.frag_idx,
-            .frag_block_offset = raw.frag_block_offset,
-            .xattr_idx = raw.xattr_idx,
-            .block_sizes = sizes,
-        };
-    }
-
-    pub fn deinit(self: ExtFile, alloc: std.mem.Allocator) void {
-        alloc.free(self.block_sizes);
-    }
-};

src/inode_data/misc.zig

@@ -1,98 +0,0 @@
-const std = @import("std");
-const Reader = std.Io.Reader;
-
-pub const Symlink = struct {
-    hard_links: u32,
-    target: []const u8,
-
-    pub fn read(alloc: std.mem.Allocator, rdr: *Reader) !Symlink {
-        var start: [8]u8 = undefined;
-        try rdr.readSliceAll(&start);
-        const target_size = std.mem.readInt(u32, start[4..8], .little);
-        const target = try alloc.alloc(u8, target_size + 1);
-        errdefer alloc.free(target);
-        try rdr.readSliceEndian(u8, target, .little);
-        return .{
-            .hard_links = std.mem.readInt(u32, start[0..4], .little),
-            .target = target,
-        };
-    }
-
-    pub fn deinit(self: Symlink, alloc: std.mem.Allocator) void {
-        alloc.free(self.target);
-    }
-};
-
-pub const ExtSymlink = struct {
-    hard_links: u32,
-    target: []const u8,
-    xattr_idx: u32,
-
-    pub fn read(alloc: std.mem.Allocator, rdr: *Reader) !ExtSymlink {
-        var start: [8]u8 = undefined;
-        try rdr.readSliceAll(&start);
-        const target_size = std.mem.readInt(u32, start[4..8], .little);
-        const target = try alloc.alloc(u8, target_size + 1);
-        errdefer alloc.free(target);
-        try rdr.readSliceEndian(u8, target, .little);
-        var xattr_idx: u32 = undefined;
-        try rdr.readSliceEndian(u32, @ptrCast(&xattr_idx), .little);
-        return .{
-            .hard_links = std.mem.readInt(u32, start[0..4], .little),
-            .target = target,
-            .xattr_idx = xattr_idx,
-        };
-    }
-
-    pub fn deinit(self: ExtSymlink, alloc: std.mem.Allocator) void {
-        alloc.free(self.target);
-    }
-};
-
-/// A block or character device.
-pub const Dev = extern struct {
-    hard_links: u32,
-    dev: u32,
-
-    pub fn read(rdr: *Reader) !Dev {
-        var d: Dev = undefined;
-        try rdr.readSliceEndian(Dev, @ptrCast(&d), .little);
-        return d;
-    }
-};
-
-/// An extended block or character device.
-pub const ExtDev = extern struct {
-    hard_links: u32,
-    dev: u32,
-    xattr_idx: u32,
-
-    pub fn read(rdr: *Reader) !ExtDev {
-        var d: ExtDev = undefined;
-        try rdr.readSliceEndian(ExtDev, @ptrCast(&d), .little);
-        return d;
-    }
-};
-
-/// A socket or FIFO file.
-pub const IPC = extern struct {
-    hard_links: u32,
-
-    pub fn read(rdr: *Reader) !IPC {
-        var d: IPC = undefined;
-        try rdr.readSliceEndian(IPC, @ptrCast(&d), .little);
-        return d;
-    }
-};
-
-/// An extended socket or FIFO file.
-pub const ExtIPC = extern struct {
-    hard_links: u32,
-    xattr_idx: u32,
-
-    pub fn read(rdr: *Reader) !ExtIPC {
-        var d: ExtIPC = undefined;
-        try rdr.readSliceEndian(ExtIPC, @ptrCast(&d), .little);
-        return d;
-    }
-};

src/lookup.zig

@@ -0,0 +1,114 @@
+const std = @import("std");
+const Io = std.Io;
+
+const DataBlock = @import("inode.zig").DataBlock;
+const InodeRef = @import("inode.zig").Ref;
+const DecompCache = @import("decomp_cache.zig");
+const MetadataReader = @import("meta_rdr.zig");
+
+pub fn stateless(comptime T: anytype, io: Io, cache: *DecompCache, table_start: u64, idx: u32) !T {
+    const PER_BLOCK = 8192 / @sizeOf(T);
+
+    const block = idx / PER_BLOCK;
+    const block_idx = idx % PER_BLOCK;
+
+    const offset_offset = table_start + (block * 8);
+    const offset: u64 = std.mem.readInt(u64, cache.map.memory[offset_offset..][0..2], .little);
+
+    var meta: MetadataReader = .init(io, cache, offset);
+    defer meta.deinit(io);
+    try meta.discardAll(block_idx * @sizeOf(T));
+
+    var new: T = undefined;
+    try meta.interface.readSliceEndian(T, @ptrCast(&new), .little);
+    return new;
+}
+
+pub fn Table(comptime T: anytype) type {
+    return struct {
+        const PER_BLOCK = 8192 / @sizeOf(T);
+
+        const LookupTable = @This();
+
+        alloc: std.mem.Allocator,
+
+        cache: *DecompCache,
+        table_start: u64,
+
+        num: u32,
+        values: std.AutoHashMap(u32, []T),
+        mut: Io.RwLock = .init,
+
+        pub fn init(alloc: std.mem.Allocator, cache: *DecompCache, table_start: u64, num_values: u32) LookupTable {
+            return .{
+                .alloc = alloc,
+
+                .cache = cache,
+                .table_start = table_start,
+
+                .num = num_values,
+                .values = .init(alloc),
+            };
+        }
+        pub fn deinit(self: *LookupTable) void {
+            var iter = self.values.valueIterator();
+            while (iter.next()) |v|
+                self.alloc.free(v);
+            self.values.deinit();
+        }
+
+        pub fn get(self: *LookupTable, io: Io, idx: u32) Error!T {
+            const block = idx / PER_BLOCK;
+            const block_idx = idx % PER_BLOCK;
+            {
+                try self.mut.lockShared(io);
+                defer self.mut.unlockShared(io);
+
+                const val = self.values.get(block);
+                if (val != null) return val.*[block_idx];
+            }
+            try self.mut.lock(io);
+            defer self.mut.unlock(io);
+
+            const val = try self.values.getOrPut(block);
+            if (val.found_existing)
+                return val.value_ptr.*[block_idx];
+            errdefer self.values.removeByPtr(val.key_ptr);
+
+            const offset_offset = self.table_start + (block * 8);
+            const offset: u64 = std.mem.readInt(u64, self.cache.map.memory[offset_offset..][0..2], .little);
+
+            var meta: MetadataReader = .init(io, self.cache, offset);
+            defer meta.deinit(io);
+
+            const size = if (block == ((self.num - 1) / PER_BLOCK))
+                self.num % PER_BLOCK
+            else
+                PER_BLOCK;
+
+            const new_block = try self.alloc.alloc(T, size);
+            errdefer self.alloc.free(new_block);
+            try meta.interface.readSliceEndian(T, new_block, .little);
+
+            val.value_ptr.* = new_block;
+
+            return new_block[block_idx];
+        }
+    };
+}
+
+// Types
+
+pub const Error = error{} || std.mem.Allocator.Error;
+
+pub const FragmentEntry = extern struct {
+    start: u64,
+    size: DataBlock,
+    _: u32,
+};
+
+pub const XattrEntry = extern struct {
+    ref: InodeRef,
+    count: u32,
+    size: u32,
+};

src/lookup_table.zig

@@ -1,125 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-
-const Decompressor = @import("util/decompressor.zig");
-const MetadataReader = @import("util/metadata.zig");
-const OffsetFile = @import("util/offset_file.zig");
-
-pub fn lookupValue(comptime T: anytype, alloc: std.mem.Allocator, decomp: *const Decompressor, file: OffsetFile, table_start: u64, idx: u32) !T {
-    const T_PER_BLOCK: u16 = 8192 / @sizeOf(T);
-
-    const block = idx / T_PER_BLOCK;
-    const block_offset = idx % T_PER_BLOCK;
-
-    const offset_pos = table_start + (8 * block);
-    const offset: u64 = std.mem.readInt(u64, @ptrCast(file.map.memory[offset_pos .. offset_pos + 8]), .little);
-
-    var rdr = file.readerAt(offset);
-    var meta: MetadataReader = .init(alloc, &rdr, decomp);
-
-    try meta.interface.discardAll(@sizeOf(T) * block_offset);
-    var out: T = undefined;
-    try meta.interface.readSliceEndian(T, @ptrCast(&out), .little);
-    return out;
-}
-
-pub const Error = Io.Cancelable || Io.File.Reader.SeekError || Io.Reader.ReadAllocError;
-
-pub fn CachedTable(comptime T: anytype) type {
-    return struct {
-        const T_PER_BLOCK: u16 = 8192 / @sizeOf(T);
-
-        const Table = @This();
-
-        alloc: std.mem.Allocator,
-        fil: OffsetFile,
-        decomp: *const Decompressor,
-
-        table_start: u64,
-        total_num: u32,
-
-        table: std.AutoHashMap(u32, []T),
-
-        mut: Io.RwLock = .init,
-
-        pub fn init(alloc: std.mem.Allocator, fil: OffsetFile, decomp: *const Decompressor, offset: u64, total_num: u32) Table {
-            return .{
-                .alloc = alloc,
-                .fil = fil,
-                .decomp = decomp,
-
-                .table_start = offset,
-                .total_num = total_num,
-
-                .table = .init(alloc),
-            };
-        }
-        pub fn deinit(self: *Table, io: Io) void {
-            self.mut.lockUncancelable(io);
-            var iter = self.table.valueIterator();
-            while (iter.next()) |val|
-                self.alloc.free(val.*);
-            self.table.deinit();
-        }
-
-        pub fn fill(self: *Table, io: Io) Error!void {
-            try self.mut.lock(io);
-            defer self.mut.unlock(io);
-
-            var num_blocks = self.total_num / T_PER_BLOCK;
-            if (self.total_num % T_PER_BLOCK > 0)
-                num_blocks += 1;
-
-            for (0..num_blocks) |block| {
-                const offset_pos = self.table_start + (8 * block);
-                const offset: u64 = std.mem.readInt(u64, @ptrCast(self.fil.map.memory[offset_pos .. offset_pos + 8]), .little);
-
-                const len: u16 = if (self.total_num % T_PER_BLOCK != 0 and block == (self.total_num - 1) / T_PER_BLOCK)
-                    @truncate(self.total_num % T_PER_BLOCK)
-                else
-                    T_PER_BLOCK;
-
-                var rdr = self.fil.readerAt(offset);
-                var meta: MetadataReader = .init(self.alloc, &rdr.interface, self.decomp);
-
-                const slice = try meta.interface.readSliceEndianAlloc(self.alloc, T, len, .little);
-                try self.table.put(@truncate(block), slice);
-            }
-        }
-
-        pub fn get(self: *Table, io: Io, idx: u32) Error!T {
-            const block = idx / T_PER_BLOCK;
-            const block_offset = idx % T_PER_BLOCK;
-
-            {
-                try self.mut.lockShared(io);
-                defer self.mut.unlockShared(io);
-
-                if (self.table.contains(block))
-                    return self.table.get(block).?[block_offset];
-            }
-
-            try self.mut.lock(io);
-            defer self.mut.unlock(io);
-
-            if (self.table.contains(block))
-                return self.table.get(block).?[block_offset];
-
-            const offset_pos = self.table_start + (8 * block);
-            const offset: u64 = std.mem.readInt(u64, @ptrCast(self.fil.map.memory[offset_pos .. offset_pos + 8]), .little);
-
-            const len: u16 = if (self.total_num % T_PER_BLOCK != 0 and block == (self.total_num - 1) / T_PER_BLOCK)
-                @truncate(self.total_num % T_PER_BLOCK)
-            else
-                T_PER_BLOCK;
-
-            var rdr = self.fil.readerAt(offset);
-            var meta: MetadataReader = .init(self.alloc, &rdr, self.decomp);
-
-            const slice = try meta.interface.readSliceEndianAlloc(self.alloc, T, len, .little);
-            try self.table.put(@truncate(block), slice);
-
-            return slice[block_offset];
-        }
-    };
-}

src/meta_rdr.zig

@@ -0,0 +1,109 @@
+const std = @import("std");
+const Io = std.Io;
+const Reader = Io.Reader;
+const Writer = Io.Writer;
+const Limit = Io.Limit;
+
+const DecompCache = @import("decomp_cache.zig");
+
+const MetadataReader = @This();
+
+io: Io,
+cache: *DecompCache,
+
+cur_offset: u64 = 0,
+next_offset: u64,
+
+interface: Reader = .{
+    .buffer = &[0]u8{},
+    .end = 0,
+    .seek = 0,
+    .vtable = &.{
+        .stream = stream,
+        .discard = discard,
+        .readVec = readVec,
+    },
+},
+
+pub fn init(io: Io, cache: *DecompCache, start: u64) MetadataReader {
+    return .{
+        .io = io,
+        .cache = cache,
+
+        .next_offset = start,
+    };
+}
+pub fn deinit(self: *MetadataReader, io: Io) void {
+    self.cache.finished(io, self.cur_offset);
+}
+
+fn advance(self: *MetadataReader) !void {
+    self.cache.finished(self.io, self.cur_offset);
+
+    self.interface.seek = 0;
+    errdefer self.interface.end = 0;
+
+    const hdr: Header = @bitCast(std.mem.readInt(u16, self.cache.map.memory[self.next_offset..][0..2], .little));
+    self.cur_offset = self.next_offset + 2;
+    self.next_offset = self.cur_offset + hdr.size;
+
+    if (hdr.uncompressed) {
+        self.interface.buffer = self.cache.map.memory[self.cur_offset..][0..hdr.size];
+        self.interface.end = hdr.size;
+        return;
+    }
+    self.interface.buffer = try self.cache.get(self.io, self.cur_offset, hdr.size, 8192);
+    self.interface.end = self.interface.buffer.len;
+}
+
+fn stream(r: *Reader, w: *Writer, limit: Limit) Reader.StreamError!usize {
+    if (r.seek >= r.end) {
+        const self: *MetadataReader = @fieldParentPtr("interface", r);
+        self.advance() catch |err| {
+            std.debug.print("error advancing metadata reader: {}\n", .{err});
+            return Reader.Error.ReadFailed;
+        };
+    }
+    const to_write = @min(r.end - r.seek, @intFromEnum(limit));
+    const wrote = try w.write(r.buffer[r.seek..][0..to_write]);
+    r.seek += wrote;
+    return wrote;
+}
+fn discard(r: *Reader, limit: Limit) Reader.Error!usize {
+    if (r.seek >= r.end) {
+        const self: *MetadataReader = @fieldParentPtr("interface", r);
+        self.advance() catch |err| {
+            std.debug.print("error advancing metadata reader: {}\n", .{err});
+            return Reader.Error.ReadFailed;
+        };
+    }
+    const to_discard = @min(r.end - r.seek, @intFromEnum(limit));
+    r.seek += to_discard;
+    return to_discard;
+}
+fn readVec(r: *Reader, vec: [][]u8) Reader.Error!usize {
+    if (r.seek >= r.end) {
+        const self: *MetadataReader = @fieldParentPtr("interface", r);
+        self.advance() catch |err| {
+            std.debug.print("error advancing metadata reader: {}\n", .{err});
+            return Reader.Error.ReadFailed;
+        };
+    }
+    var total: usize = 0;
+    for (vec) |v| {
+        const to_copy = @min(r.end - r.seek, v.len);
+        @memcpy(v[0..to_copy], r.buffer[r.seek..][0..to_copy]);
+        r.seek += to_copy;
+        total += to_copy;
+        if (r.seek >= r.end)
+            break;
+    }
+    return total;
+}
+
+// Types
+
+const Header = packed struct(u16) {
+    size: u15,
+    uncompressed: bool,
+};

src/options.zig

@@ -5,10 +5,6 @@ const Writer = std.Io.Writer;
 
 const ExtractionOptions = @This();
 
-/// Extract single-threaded only.
-/// Though not necessary if using Threaded.single_threaded,
-/// setting single_threaded is more efficient.
-single_threaded: bool = false,
 /// Don't set the file's owner & permissions after extraction
 ignore_permissions: bool = false,
 /// Don't set xattr values. Currently xattrs are never set anyway.
@@ -21,8 +17,6 @@ verbose: bool = false,
 verbose_writer: ?*Writer = null,
 
 pub const default: ExtractionOptions = .{};
-pub const default_single_threaded: ExtractionOptions = .{ .single_threaded = true };
-
 pub fn VerboseDefault(wrt: *Writer) !ExtractionOptions {
     return .{
         .verbose = true,

src/root.zig

@@ -2,5 +2,7 @@ pub const Archive = @import("archive.zig");
 pub const ExtractionOptions = @import("options.zig");
 
 test {
-    @import("std").testing.refAllDecls(@This());
+    const std = @import("std");
+
+    std.testing.refAllDecls(Archive);
 }

src/test.zig

@@ -0,0 +1,84 @@
+const std = @import("std");
+const stuff = @import("builtin");
+
+const Archive = @import("archive.zig");
+const Superblock = @import("super.zig").Superblock;
+
+const TestArchive = "testing/LinuxPATest.sfs";
+
+test "Basics" {
+    var fil = try std.fs.cwd().openFile(TestArchive, .{});
+    defer fil.close();
+    var sfs: Archive = try .init(std.testing.allocator, fil);
+    defer sfs.deinit();
+    if (sfs.super != LinuxPATestCorrectSuperblock) {
+        std.debug.print("Superblock wrong\nShould be: {}\n\nis: {}\n", .{ LinuxPATestCorrectSuperblock, sfs.super });
+        return error.BadSuperblock;
+    }
+}
+
+const TestFile = "Start.exe";
+const TestFileExtractLocation = "testing/Start.exe";
+
+test "ExtractSingleFile" {
+    std.fs.cwd().deleteFile(TestFileExtractLocation) catch {};
+    var fil = try std.fs.cwd().openFile(TestArchive, .{});
+    defer fil.close();
+    var sfs: Archive = try .init(std.testing.allocator, fil);
+    defer sfs.deinit();
+    var test_fil = try sfs.open(TestFile);
+    defer test_fil.deinit();
+    try test_fil.extract(TestFileExtractLocation, .Default);
+    //TODO: validate extracted file.
+}
+
+const TestFullExtractLocation = "testing/TestExtract";
+
+test "ExtractCompleteArchive" {
+    std.fs.cwd().deleteTree(TestFullExtractLocation) catch {};
+    var fil = try std.fs.cwd().openFile(TestArchive, .{});
+    defer fil.close();
+    var sfs: Archive = try .init(std.testing.allocator, fil);
+    defer sfs.deinit();
+    try sfs.extract(TestFullExtractLocation, .Default);
+}
+
+const LinuxPATestCorrectSuperblock: Superblock = .{
+    .magic = std.mem.readInt(u32, "hsqs", .little),
+    .inode_count = 2974,
+    .mod_time = 1632696724,
+    .block_size = 131072,
+    .frag_count = 264,
+    .compression = .zstd,
+    .block_log = 17,
+    .flags = .{
+        .inode_uncompressed = false,
+        .data_uncompressed = false,
+        .check = false,
+        .frag_uncompressed = false,
+        .fragment_never = false,
+        .fragment_always = false,
+        .duplicates = true,
+        .exportable = true,
+        .xattr_uncompressed = false,
+        .xattr_never = false,
+        .compression_options = false,
+        .ids_uncompressed = false,
+        ._ = 0,
+    },
+    .id_count = 1,
+    .ver_maj = 4,
+    .ver_min = 0,
+    .root_ref = .{
+        .block_offset = 1363,
+        .block_start = 29237,
+        ._ = 0,
+    },
+    .size = 106841744,
+    .id_start = 106841632,
+    .xattr_start = 106841720,
+    .inode_start = 106778274,
+    .dir_start = 106807998,
+    .frag_start = 106837747,
+    .export_start = 106841602,
+};

src/util/data_extractor.zig

@@ -1,162 +0,0 @@
-//! The DataExtractor is meant to extract a regular file's data to a given file asyncronously.
-
-const std = @import("std");
-const Io = std.Io;
-
-const FragEntry = @import("../frag.zig").FragEntry;
-const BlockSize = @import("../inode_data/file.zig").BlockSize;
-const Decompressor = @import("decompressor.zig");
-const OffsetFile = @import("offset_file.zig");
-
-// const SharedCache = @import("shared_cache.zig");
-
-pub const Error = Decompressor.Error || Io.File.MemoryMap.CreateError || Io.File.WritePositionalError;
-
-const DataExtractor = @This();
-
-fil: OffsetFile,
-decomp: *const Decompressor,
-block_size: u32,
-
-file_size: u64,
-start: u64,
-blocks: []BlockSize,
-
-frag_offset: u32 = 0,
-frag_block: ?[]u8 = null,
-
-err: ?Error = null,
-
-pub fn init(fil: OffsetFile, decomp: *const Decompressor, block_size: u32, file_size: u64, data_start: u64, blocks: []BlockSize) DataExtractor {
-    return .{
-        .fil = fil,
-        .decomp = decomp,
-        .block_size = block_size,
-
-        .file_size = file_size,
-        .start = data_start,
-        .blocks = blocks,
-    };
-}
-pub fn addFrag(self: *DataExtractor, frag_offset: u32, block: []u8) void {
-    self.frag_offset = frag_offset;
-    self.frag_block = block;
-}
-
-fn numBlocks(self: DataExtractor) usize {
-    var num = self.blocks.len;
-    if (self.frag_block != null) num += 1;
-    return num;
-}
-
-/// Starts extracting the data using the given group to spawn async tasks.
-pub fn extractConcurrent(self: DataExtractor, alloc: std.mem.Allocator, io: Io, fil: Io.File) (Error || Io.ConcurrentError)!void {
-    var group: Io.Group = .init;
-    defer group.cancel(io);
-    var err: ?Error = null;
-
-    var read_offset: u64 = self.start;
-    for (0..self.blocks.len) |idx| {
-        try group.concurrent(io, blockThread, .{ self, alloc, io, fil, read_offset, idx, &err });
-        read_offset += self.blocks[idx].size;
-    }
-    if (self.frag_block != null)
-        try group.concurrent(io, fragThread, .{ self, io, fil, &err });
-
-    group.await(io) catch |cancel| return err orelse cancel;
-}
-
-/// Starts extracting the data using the given group to spawn async tasks.
-pub fn extractAsync(self: DataExtractor, alloc: std.mem.Allocator, io: Io, fil: Io.File) Error!void {
-    var group: Io.Group = .init;
-    defer group.cancel(io);
-    var err: ?Error = null;
-
-    var read_offset: u64 = self.start;
-    for (0..self.blocks.len) |idx| {
-        group.async(io, blockThread, .{ self, alloc, io, fil, read_offset, idx, &err });
-        read_offset += self.blocks[idx].size;
-    }
-    if (self.frag_block != null)
-        group.async(io, fragThread, .{ self, io, fil, &err });
-
-    group.await(io) catch |cancel| return err orelse cancel;
-}
-
-fn blockThread(self: DataExtractor, alloc: std.mem.Allocator, io: Io, fil: Io.File, read_offset: u64, idx: usize, ret_err: *?Error) Io.Cancelable!void {
-    const block = self.blocks[idx];
-
-    const cur_block_size = if (idx == self.numBlocks() - 1)
-        self.file_size % self.block_size
-    else
-        self.block_size;
-
-    const write_offset = self.block_size * idx;
-
-    var wrt = fil.writer(io, &[0]u8{});
-    wrt.seekTo(write_offset) catch |err| {
-        ret_err.* = err;
-        if (err == error.Canceled) io.recancel();
-        return Io.Cancelable.Canceled;
-    };
-
-    if (block.size == 0) {
-        wrt.interface.splatByteAll(0, cur_block_size) catch |err| {
-            ret_err.* = err;
-            if (err == error.Canceled) io.recancel();
-            return Io.Cancelable.Canceled;
-        };
-    } else {
-        if (block.uncompressed) {
-            wrt.interface.writeAll(self.fil.map.memory[read_offset..][0..cur_block_size]) catch |err| {
-                ret_err.* = err;
-                if (err == error.Canceled) io.recancel();
-                return Io.Cancelable.Canceled;
-            };
-        } else {
-            @branchHint(.likely);
-
-            var tmp: [1024 * 1024]u8 = undefined;
-
-            _ = self.decomp.Decompress(alloc, self.fil.map.memory[read_offset..][0..block.size], tmp[0..cur_block_size]) catch |err| {
-                ret_err.* = err;
-                return Io.Cancelable.Canceled;
-            };
-
-            wrt.interface.writeAll(tmp[0..cur_block_size]) catch |err| {
-                ret_err.* = err;
-                if (err == error.Canceled) io.recancel();
-                return Io.Cancelable.Canceled;
-            };
-        }
-    }
-    wrt.flush() catch |err| {
-        ret_err.* = err;
-        if (err == error.Canceled) io.recancel();
-        return Io.Cancelable.Canceled;
-    };
-}
-fn fragThread(self: DataExtractor, io: Io, fil: Io.File, ret_err: *?Error) Io.Cancelable!void {
-    const cur_block_size = self.file_size % self.block_size;
-
-    const write_offset = self.blocks.len * self.block_size;
-
-    var wrt = fil.writer(io, &[0]u8{});
-    wrt.seekTo(write_offset) catch |err| {
-        ret_err.* = err;
-        if (err == error.Canceled) io.recancel();
-        return Io.Cancelable.Canceled;
-    };
-
-    wrt.interface.writeAll(self.frag_block.?[self.frag_offset..][0..cur_block_size]) catch |err| {
-        ret_err.* = err;
-        if (err == error.Canceled) io.recancel();
-        return Io.Cancelable.Canceled;
-    };
-
-    wrt.flush() catch |err| {
-        ret_err.* = err;
-        if (err == error.Canceled) io.recancel();
-        return Io.Cancelable.Canceled;
-    };
-}

src/util/data_reader.zig

@@ -1,189 +0,0 @@
-//! DataReader reads a regular file's data linearly from start to finish using Io.Reader interface.
-
-const std = @import("std");
-const Io = std.Io;
-const Reader = Io.Reader;
-const Writer = Io.Writer;
-const Limit = Io.Limit;
-
-const BlockSize = @import("../inode_data/file.zig").BlockSize;
-const Decompressor = @import("decompressor.zig");
-const OffsetFile = @import("offset_file.zig");
-
-// const SharedCache = @import("shared_cache.zig");
-
-const DataReader = @This();
-
-alloc: std.mem.Allocator,
-
-fil: OffsetFile,
-io: Io,
-decomp: *const Decompressor,
-block_size: u32,
-
-file_size: u64,
-cur_offset: u64,
-blocks: []BlockSize,
-
-frag_offset: u32 = 0,
-frag_block: ?[]u8 = null,
-
-block_idx: usize = 0,
-sparse_block: bool = false,
-
-interface: Io.Reader,
-
-pub fn init(alloc: std.mem.Allocator, io: Io, fil: OffsetFile, decomp: *const Decompressor, block_size: u32, file_size: u64, data_start: u64, blocks: []BlockSize) !DataReader {
-    return .{
-        .alloc = alloc,
-
-        .fil = fil,
-        .io = io,
-        .decomp = decomp,
-        .block_size = block_size,
-
-        .file_size = file_size,
-        .cur_offset = data_start,
-        .blocks = blocks,
-
-        .interface = .{
-            .buffer = try alloc.alloc(u8, block_size),
-            .seek = 0,
-            .end = 0,
-            .vtable = &.{
-                .stream = stream,
-                .discard = discard,
-                .readVec = readVec,
-            },
-        },
-    };
-}
-pub fn deinit(self: *DataReader) void {
-    self.alloc.free(self.interface.buffer);
-}
-pub fn addFrag(self: *DataReader, frag_offset: u32, block: []u8) void {
-    self.frag_offset = frag_offset;
-    self.frag_block = block;
-}
-
-fn numBlocks(self: DataReader) usize {
-    var num = self.blocks.len;
-    if (self.frag_block != null) num += 1;
-    return num;
-}
-fn advanceBuffer(self: *DataReader) !void {
-    if (self.block_idx >= self.numBlocks())
-        return Reader.Error.EndOfStream;
-
-    errdefer self.interface.end = 0;
-    defer self.block_idx += 1;
-
-    self.interface.end = if (self.block_idx == self.numBlocks() - 1)
-        self.file_size % self.block_size
-    else
-        self.block_size;
-
-    // Fragment
-    if (self.block_idx == self.blocks.len) {
-        @memcpy(self.interface.buffer[0..self.interface.end], self.frag_block.?[self.frag_offset .. self.frag_offset + self.interface.end]);
-        self.interface.seek = 0;
-        return;
-    }
-
-    // Normal Block
-    const block = self.blocks[self.block_idx];
-    if (block.size == 0) {
-        self.interface.seek = 0;
-        self.sparse_block = true;
-        return;
-    } else {
-        self.sparse_block = false;
-    }
-    if (block.uncompressed) {
-        @memcpy(self.interface.buffer[0..self.interface.end], self.fil.map.memory[self.cur_offset .. self.cur_offset + self.interface.end]);
-        self.cur_offset += self.interface.end;
-    } else {
-        @branchHint(.likely);
-
-        _ = try self.decomp.Decompress(self.alloc, self.fil.map.memory[self.cur_offset .. self.cur_offset + block.size], self.interface.buffer[0..self.interface.end]);
-        self.cur_offset += block.size;
-    }
-    self.interface.seek = 0;
-}
-
-fn stream(rdr: *Reader, wrt: *Writer, limit: Limit) Reader.StreamError!usize {
-    var data: *DataReader = @fieldParentPtr("interface", rdr);
-    if (rdr.seek == rdr.end)
-        data.advanceBuffer() catch |err| return switch (err) {
-            error.ReadFailed => error.ReadFailed,
-            error.EndOfStream => error.EndOfStream,
-            else => error.ReadFailed,
-        };
-
-    switch (limit) {
-        .nothing => return 0,
-        .unlimited => {
-            const wrote = if (data.sparse_block)
-                try wrt.splatByte(0, rdr.end - rdr.seek)
-            else
-                try wrt.write(rdr.buffer[rdr.seek..rdr.end]);
-            rdr.seek += wrote;
-            return wrote;
-        },
-        else => {
-            const to_read = @min(rdr.end - rdr.seek, @intFromEnum(limit));
-            const wrote = if (data.sparse_block)
-                try wrt.splatByte(0, to_read)
-            else
-                try wrt.write(rdr.buffer[rdr.seek .. rdr.seek + to_read]);
-            rdr.seek += wrote;
-            return wrote;
-        },
-    }
-}
-fn discard(rdr: *Reader, limit: Limit) Reader.Error!usize {
-    var data: *DataReader = @fieldParentPtr("interface", rdr);
-    if (rdr.seek == rdr.end)
-        data.advanceBuffer() catch |err| return switch (err) {
-            error.ReadFailed => error.ReadFailed,
-            error.EndOfStream => error.EndOfStream,
-            else => error.ReadFailed,
-        };
-
-    switch (limit) {
-        .nothing => return 0,
-        .unlimited => {
-            const adv = rdr.end - rdr.seek;
-            rdr.seek = rdr.end;
-            return adv;
-        },
-        else => {
-            const adv = @min(rdr.end - rdr.seek, @intFromEnum(limit));
-            rdr.seek += adv;
-            return adv;
-        },
-    }
-}
-fn readVec(rdr: *Reader, vec: [][]u8) Reader.Error!usize {
-    var data: *DataReader = @fieldParentPtr("interface", rdr);
-    if (rdr.seek == rdr.end)
-        data.advanceBuffer() catch |err| return switch (err) {
-            error.ReadFailed => error.ReadFailed,
-            error.EndOfStream => error.EndOfStream,
-            else => error.ReadFailed,
-        };
-
-    var wrote: usize = 0;
-    for (vec) |buf| {
-        if (rdr.seek == rdr.end) break;
-
-        const to_copy = @min(rdr.end - rdr.seek, buf.len);
-        if (data.sparse_block)
-            @memset(buf[0..to_copy], 0)
-        else
-            @memcpy(buf[0..to_copy], rdr.buffer[rdr.seek .. rdr.seek + to_copy]);
-        rdr.seek += to_copy;
-        wrote += to_copy;
-    }
-    return wrote;
-}

src/util/decompressor.zig

@@ -1,15 +0,0 @@
-//! A decompression interface
-
-const std = @import("std");
-
-const Decompressor = @This();
-
-pub const Error = std.Io.Reader.StreamError || std.mem.Allocator.Error;
-
-/// The actual decompression function.
-/// If the given decompressor is null, then the decompression should be done "stateless" without lasting allocations.
-decomp_fn: *const fn (?*const Decompressor, std.mem.Allocator, in: []u8, out: []u8) Error!usize,
-
-pub fn Decompress(self: *const Decompressor, alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
-    return self.decomp_fn(self, alloc, in, out);
-}

src/util/metadata.zig

@@ -1,103 +0,0 @@
-const std = @import("std");
-const Reader = std.Io.Reader;
-const Writer = std.Io.Writer;
-const Limit = std.Io.Limit;
-const StreamError = std.Io.Reader.StreamError;
-
-const Decompressor = @import("decompressor.zig");
-
-const BlockHeader = packed struct(u16) {
-    size: u15,
-    uncompressed: bool,
-};
-
-const This = @This();
-
-alloc: std.mem.Allocator,
-rdr: *Reader,
-decomp: *const Decompressor,
-
-cur_block_start: u32 = 0,
-next_start_start: u32 = 0,
-buf: [8192]u8 = undefined,
-
-err: ?anyerror = null,
-interface: Reader = .{
-    .buffer = &[0]u8{},
-    .end = 0,
-    .seek = 0,
-    .vtable = &.{
-        .stream = stream,
-        .discard = discard,
-        .readVec = readVec,
-        // TODO: Potentially add rebase so that we can guarentee that self.block_start & interface.seek is correct.
-    },
-},
-
-pub fn init(alloc: std.mem.Allocator, rdr: *Reader, decomp: *const Decompressor) This {
-    return .{
-        .alloc = alloc,
-        .rdr = rdr,
-        .decomp = decomp,
-    };
-}
-
-fn advance(self: *This) !void {
-    self.interface.seek = 0;
-    var hdr: BlockHeader = undefined;
-    try self.rdr.readSliceEndian(BlockHeader, @ptrCast(&hdr), .little);
-    self.cur_block_start = self.next_start_start;
-    self.next_start_start += hdr.size;
-    if (hdr.uncompressed) {
-        try self.rdr.readSliceEndian(u8, self.buf[0..hdr.size], .little);
-        self.interface.end = hdr.size;
-        self.interface.buffer = self.buf[0..hdr.size];
-        return;
-    } else {
-        @branchHint(.likely);
-        var tmp_buf: [8192]u8 = undefined;
-        try self.rdr.readSliceAll(tmp_buf[0..hdr.size]);
-        self.interface.end = try self.decomp.Decompress(self.alloc, tmp_buf[0..hdr.size], &self.buf);
-        self.interface.buffer = self.buf[0..self.interface.end];
-    }
-}
-
-fn stream(rdr: *Reader, wrt: *Writer, limit: Limit) StreamError!usize {
-    const self: *This = @fieldParentPtr("interface", rdr);
-    if (rdr.end == rdr.seek) self.advance() catch |err| {
-        self.err = err;
-        return StreamError.ReadFailed;
-    };
-    if (@intFromEnum(limit) == 0) return 0;
-    const to_write = @min(rdr.end - rdr.seek, @intFromEnum(limit));
-    const wrote = try wrt.write(self.buf[rdr.seek .. rdr.seek + to_write]);
-    self.interface.seek += wrote;
-    return wrote;
-}
-fn discard(rdr: *Reader, limit: Limit) Reader.Error!usize {
-    const self: *This = @fieldParentPtr("interface", rdr);
-    if (rdr.end == rdr.seek) self.advance() catch |err| {
-        self.err = err;
-        return error.ReadFailed;
-    };
-    if (@intFromEnum(limit) == 0) return 0;
-    const to_skip = @min(rdr.end - rdr.seek, @intFromEnum(limit));
-    rdr.seek += to_skip;
-    return to_skip;
-}
-fn readVec(rdr: *Reader, vec: [][]u8) Reader.Error!usize {
-    const self: *This = @fieldParentPtr("interface", rdr);
-    if (rdr.end == rdr.seek) self.advance() catch |err| {
-        self.err = err;
-        return error.ReadFailed;
-    };
-    var cur_red: usize = 0;
-    for (vec) |s| {
-        const to_copy: usize = @min(rdr.end - rdr.seek, s.len);
-        @memcpy(s[0..to_copy], self.buf[rdr.seek .. rdr.seek + to_copy]);
-        rdr.seek += to_copy;
-        cur_red += to_copy;
-        if (rdr.end == rdr.seek) break;
-    }
-    return cur_red;
-}

src/util/misc.zig

@@ -1,25 +0,0 @@
-//! Miscellaneous utility functions.
-
-const std = @import("std");
-const Io = std.Io;
-
-const Inode = @import("../inode.zig");
-const Decompressor = @import("decompressor.zig");
-const MetadataReader = @import("metadata.zig");
-const OffsetFile = @import("offset_file.zig");
-
-/// check is the path is referencing itself ("" or ".").
-/// separators must be trimmed before calling this function for it to work properly.
-pub fn pathIsSelf(path: []const u8) bool {
-    if (path.len == 0) return true;
-    if (path.len > 1) return false;
-    return path[0] == '.';
-}
-/// Creates an Inode from an Inode.Ref.
-pub fn inodeFromRef(alloc: std.mem.Allocator, file: OffsetFile, decomp: *const Decompressor, inode_start: u64, block_size: u32, ref: Inode.Ref) !Inode {
-    var rdr = file.readerAt(inode_start + ref.block_start);
-    var meta: MetadataReader = .init(alloc, &rdr, decomp);
-    try meta.interface.discardAll(ref.block_offset);
-
-    return .read(alloc, &meta.interface, block_size);
-}

src/util/offset_file.zig

@@ -1,27 +0,0 @@
-//! A File where it's meaningful (to us) content starts at a given offset.
-
-const std = @import("std");
-const Io = std.Io;
-const File = Io.File;
-const Reader = Io.Reader;
-
-const OffsetFile = @This();
-
-map: Io.File.MemoryMap,
-
-pub fn init(io: Io, fil: File, archive_size: u64, init_offset: u64) !OffsetFile {
-    return .{
-        .map = try fil.createMemoryMap(io, .{
-            .protection = .{ .read = true, .write = false, .execute = false },
-            .len = archive_size,
-            .offset = init_offset,
-        }),
-    };
-}
-pub fn deinit(self: *OffsetFile, io: Io) void {
-    self.map.destroy(io);
-}
-
-pub fn readerAt(self: OffsetFile, offset: u64) Reader {
-    return .fixed(self.map.memory[offset..]);
-}

src/util/shared_cache.zig

@@ -1,52 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-const Node = std.SinglyLinkedList.Node;
-
-const SharedCache = @This();
-
-pub const CACHE_SIZE = 1024 * 1024;
-
-pub const BufferNode = struct {
-    node: Node,
-    cache: [CACHE_SIZE]u8,
-};
-
-alloc: std.mem.Allocator,
-
-caches: std.ArrayList(BufferNode),
-cache_queue: std.SinglyLinkedList,
-queue_mut: Io.Mutex,
-
-pub fn init(alloc: std.mem.Allocator, init_cache_size: u32) !SharedCache {
-    const caches: std.ArrayList(BufferNode) = try .initCapacity(alloc, init_cache_size);
-    var queue: std.SinglyLinkedList = .{};
-    for (caches.items) |item|
-        queue.prepend(&item.node);
-    return .{
-        .alloc = alloc,
-
-        .caches = caches,
-        .cache_queue = queue,
-    };
-}
-pub fn deinit(self: *SharedCache) void {
-    self.caches.deinit(self.alloc);
-}
-
-pub fn getCache(self: *SharedCache, io: Io) !*BufferNode {
-    self.queue_mut.lock(io);
-    const nxt = self.cache_queue.popFirst();
-    self.queue_mut.unlock(io);
-    if (nxt == null) {
-        const new = try self.caches.addOne(self.alloc);
-        new.* = .{
-            .node = .{},
-            .cache = undefined,
-        };
-        return new;
-    }
-    return @fieldParentPtr("node", nxt.?);
-}
-pub fn returnCache(self: *SharedCache, buf: *BufferNode) void {
-    self.cache_queue.prepend(buf);
-}

src/xattr_table.zig

@@ -1,292 +0,0 @@
-const std = @import("std");
-const Io = std.Io;
-
-const InodeRef = @import("inode.zig").Ref;
-const LookupTable = @import("lookup_table.zig");
-const Decompressor = @import("util/decompressor.zig");
-const MetadataReader = @import("util/metadata.zig");
-const OffsetFile = @import("util/offset_file.zig");
-
-const XattrCachedTable = @This();
-
-alloc: std.mem.Allocator,
-
-fil: OffsetFile,
-decomp: *const Decompressor,
-
-kv_start: u64,
-
-table: LookupTable.CachedTable(TableValue),
-value_cache: std.AutoHashMap(InodeRef, []const u8),
-value_mut: Io.RwLock = .init,
-
-pub fn init(alloc: std.mem.Allocator, fil: OffsetFile, decomp: *const Decompressor, xattr_start: u64) !XattrCachedTable {
-    const start: u64 = std.mem.readInt(u64, @ptrCast(fil.map.memory[xattr_start .. xattr_start + 8]), .little);
-    const num: u64 = std.mem.readInt(u64, @ptrCast(fil.map.memory[xattr_start + 8 .. xattr_start + 16]), .little);
-
-    return .{
-        .alloc = alloc,
-
-        .fil = fil,
-        .decomp = decomp,
-
-        .kv_start = start,
-
-        .table = .init(alloc, fil, decomp, xattr_start + 16, num),
-        .value_cache = .init(alloc),
-    };
-}
-pub fn deinit(self: *XattrCachedTable, io: Io) void {
-    self.value_mut.lockUncancelable(io);
-    self.table.deinit(io);
-    self.value_cache.deinit();
-}
-
-pub fn get(self: *XattrCachedTable, alloc: std.mem.Allocator, io: Io, idx: u32) ![]XattrSemiOwned {
-    const lookup = try self.table.get(io, idx);
-
-    var rdr = self.fil.readerAt(self.kv_start + lookup.ref.block_start);
-    var meta: MetadataReader = .init(alloc, &rdr, self.decomp);
-    try meta.interface.discardAll(lookup.ref.block_offset);
-
-    const out = try alloc.alloc(XattrSemiOwned, lookup.count);
-    errdefer alloc.free(out);
-
-    for (0..lookup.count) |i| {
-        var key_entry: KeyEntry = undefined;
-        try meta.interface.readSliceEndian(KeyEntry, @ptrCast(&key_entry), .little);
-
-        const key: [:0]u8 = switch (key_entry.type.namespace) {
-            .user => blk: {
-                const tmp = try alloc.alloc(u8, key_entry.name_size + 1 + 5);
-                errdefer alloc.free(tmp);
-                try meta.interface.readSliceEndian(u8, tmp[5 .. tmp.len - 1], .little);
-                @memcpy(tmp[0..5], "user.");
-                tmp[tmp.len - 1] = 0;
-                break :blk @ptrCast(tmp);
-            },
-            .trusted => blk: {
-                const tmp = try alloc.alloc(u8, key_entry.name_size + 1 + 8);
-                errdefer alloc.free(tmp);
-                try meta.interface.readSliceEndian(u8, tmp[8 .. tmp.len - 1], .little);
-                @memcpy(tmp[0..8], "trusted.");
-                tmp[tmp.len - 1] = 0;
-                break :blk @ptrCast(tmp);
-            },
-            .security => blk: {
-                const tmp = try alloc.alloc(u8, key_entry.name_size + 1 + 9);
-                errdefer alloc.free(tmp);
-                try meta.interface.readSliceEndian(u8, tmp[9 .. tmp.len - 1], .little);
-                @memcpy(tmp[0..9], "security.");
-                tmp[tmp.len - 1] = 0;
-                break :blk @ptrCast(tmp);
-            },
-        };
-        errdefer alloc.free(key);
-
-        if (key_entry.type.out_of_line) {
-            var value: ValueOutOfLineEntry = undefined;
-            try meta.interface.readSliceEndian(ValueOutOfLineEntry, @ptrCast(&value), .little);
-
-            out[i] = .{
-                .key = key,
-                .value = try self.valueAt(io, value.ref),
-            };
-            continue;
-        }
-        const val_ref: InodeRef = .{ .block_start = meta.cur_block_start, .block_offset = @truncate(meta.interface.seek) };
-
-        {
-            try self.value_mut.lockShared(io);
-            defer self.value_mut.unlockShared(io);
-            if (self.value_cache.contains(val_ref)) {
-                out[i] = .{
-                    .key = key,
-                    .value = try self.valueAt(io, val_ref),
-                };
-                continue;
-            }
-        }
-        try self.value_mut.lock(io);
-        defer self.value_mut.unlock(io);
-
-        if (self.value_cache.contains(val_ref)) {
-            out[i] = .{
-                .key = key,
-                .value = try self.valueAt(io, val_ref),
-            };
-            continue;
-        }
-
-        var val_size: u32 = undefined;
-        try meta.interface.readSliceEndian(u32, @ptrCast(&val_size), .little);
-
-        const val = try self.alloc.alloc(u8, val_size);
-        errdefer alloc.free(val);
-        try meta.interface.readSliceEndian(u8, val, .little);
-
-        try self.value_cache.put(val_ref, val);
-        out[i] = .{
-            .key = key,
-            .value = val,
-        };
-    }
-    return out;
-}
-
-fn valueAt(self: *XattrCachedTable, io: Io, ref: InodeRef) ![]const u8 {
-    try self.value_mut.lock(io);
-    defer self.value_mut.unlock(io);
-
-    if (self.value_cache.contains(ref)) return self.value_cache.get(ref).?;
-
-    var rdr = self.fil.readerAt(self.kv_start + ref.block_start);
-    var meta: MetadataReader = .init(self.alloc, &rdr, self.decomp);
-    try meta.interface.discardAll(ref.block_offset);
-
-    var val_size: u32 = undefined;
-    try meta.interface.readSliceEndian(u32, @ptrCast(&val_size), .little);
-
-    const val = try self.alloc.alloc(u8, val_size);
-    errdefer self.alloc.free(val);
-    try meta.interface.readSliceEndian(u8, val, .little);
-
-    try self.value_cache.put(ref, val);
-    return val;
-}
-
-// Types
-
-/// An Xattr return value where the reciever only owns the key value.
-pub const XattrSemiOwned = struct {
-    key: [:0]const u8,
-    value: []const u8,
-
-    pub fn deinit(self: XattrSemiOwned, alloc: std.mem.Allocator) void {
-        alloc.free(self.key);
-    }
-};
-/// An Xattr return value where the reciever owns both the key & value.
-pub const XattrOwned = struct {
-    key: [:0]const u8,
-    value: []const u8,
-
-    pub fn deinit(self: XattrSemiOwned, alloc: std.mem.Allocator) void {
-        alloc.free(self.key);
-        alloc.free(self.value);
-    }
-};
-
-const TableValue = extern struct {
-    ref: InodeRef,
-    count: u32,
-    size: u32,
-};
-
-const KeyEntry = extern struct {
-    type: XattrPrefix,
-    name_size: u16,
-};
-const ValueOutOfLineEntry = extern struct {
-    _: u32,
-    ref: InodeRef,
-};
-
-const XattrPrefix = packed struct(u16) {
-    namespace: enum(u8) {
-        user,
-        trusted,
-        security,
-
-        fn prefixSize(self: @This()) u16 {
-            return switch (self) {
-                .user => 5,
-                .trusted => 8,
-                .security => 9,
-            };
-        }
-    },
-    out_of_line: bool,
-    _: u7,
-};
-
-// Stateless
-
-pub fn statelessLookup(alloc: std.mem.Allocator, io: Io, decomp: *const Decompressor, fil: OffsetFile, table_start: u64, idx: u16) ![]XattrOwned {
-    const kv_start: u64 = std.mem.readInt(u64, @ptrCast(fil.map.memory[table_start .. table_start + 8]), .little);
-
-    const lookup = try LookupTable.lookupValue(TableValue, alloc, io, decomp, fil, table_start + 16, idx);
-
-    var rdr = fil.readerAt(kv_start + lookup.ref.block_start);
-    var meta: MetadataReader = .init(alloc, &rdr.interface, decomp);
-    try meta.interface.discardAll(lookup.ref.block_offset);
-
-    const out = try alloc.alloc(XattrOwned, lookup.count);
-    errdefer alloc.free(out);
-
-    for (0..lookup.count) |i| {
-        const key_entry: KeyEntry = undefined;
-        try meta.interface.readSliceEndian(KeyEntry, @ptrCast(&key_entry), .little);
-
-        const key = switch (key_entry.type.namespace) {
-            .user => blk: {
-                const tmp = try alloc.alloc(u8, key_entry.name_size + 1 + 5);
-                errdefer alloc.free(tmp);
-                try meta.interface.readSliceEndian(u8, tmp[5 .. tmp.len - 1], .little);
-                @memset(tmp[0..5], "user.");
-                break :blk tmp;
-            },
-            .trusted => blk: {
-                const tmp = try alloc.alloc(u8, key_entry.name_size + 1 + 8);
-                errdefer alloc.free(tmp);
-                try meta.interface.readSliceEndian(u8, tmp[8 .. tmp.len - 1], .little);
-                @memset(tmp[0..8], "trusted.");
-                break :blk tmp;
-            },
-            .security => blk: {
-                const tmp = try alloc.alloc(u8, key_entry.name_size + 1 + 9);
-                errdefer alloc.free(tmp);
-                try meta.interface.readSliceEndian(u8, tmp[9 .. tmp.len - 1], .little);
-                @memset(tmp[0..9], "security.");
-                break :blk tmp;
-            },
-        };
-        key[key.len - 1] = 0;
-        errdefer alloc.free(key);
-
-        if (key_entry.type.out_of_line) {
-            const value: ValueOutOfLineEntry = undefined;
-            try meta.interface.readSliceEndian(ValueOutOfLineEntry, @ptrCast(&value), .little);
-
-            var ool_rdr = fil.readerAt(kv_start + value.ref.block_start);
-            var ool_meta: MetadataReader = .init(alloc, &ool_rdr.interface, decomp);
-            try ool_meta.interface.discardAll(value.ref.block_offset);
-
-            var val_size: u32 = undefined;
-            try ool_meta.interface.readSliceEndian(val_size, @ptrCast(&val_size), .little);
-
-            const val = try alloc.alloc(u8, val_size);
-            errdefer alloc.free(val);
-            try ool_meta.interface.readSliceEndian(u8, val, .little);
-
-            out[i] = .{
-                .key = key,
-                .value = val,
-            };
-            continue;
-        }
-
-        var val_size: u32 = undefined;
-        try meta.interface.readSliceEndian(val_size, @ptrCast(&val_size), .little);
-
-        const val = try alloc.alloc(u8, val_size);
-        errdefer alloc.free(val);
-        try meta.interface.readSliceEndian(u8, val, .little);
-
-        out[i] = .{
-            .key = key,
-            .value = val,
-        };
-    }
-    return out;
-}

src/zig_decomp.zig

@@ -0,0 +1,40 @@
+const std = @import("std");
+const Reader = std.Io.Reader;
+const flate = std.compress.flate;
+const zstd = std.compress.zstd;
+const xz = std.compress.xz;
+const lzma = std.compress.lzma;
+
+const Error = @import("decomp.zig").Error;
+
+pub fn zlibDecompress(_: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
+    var buf: [flate.max_window_len]u8 = undefined;
+
+    var rdr: Reader = .fixed(in);
+    var decomp: flate.Decompress = .init(&rdr, .zlib, &buf);
+
+    return decomp.reader.readSliceShort(out);
+}
+pub fn zstdDecompress(alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
+    const buf = try alloc.alloc(u8, in.len + zstd.block_size_max);
+    defer alloc.free(buf);
+
+    var rdr: Reader = .fixed(in);
+    var decomp: zstd.Decompress = .init(&rdr, buf, .{ .window_len = in.len });
+
+    return decomp.reader.readSliceShort(out);
+}
+pub fn lzmaDecompress(alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
+    var rdr: Reader = .fixed(in);
+    var decomp: lzma.Decompress = .initOptions(&rdr, alloc, &[0]u8{}, .{}, 2 * out.len);
+    defer decomp.deinit();
+
+    return decomp.reader.readSliceShort(out);
+}
+pub fn xzDecompress(alloc: std.mem.Allocator, in: []u8, out: []u8) Error!usize {
+    var rdr: Reader = .fixed(in);
+    var decomp: xz.Decompress = .init(&rdr, alloc, &[0]u8{});
+    defer decomp.deinit();
+
+    return decomp.reader.readSliceShort(out);
+}