Re-added all C decompressors
Some cleanup Remove inode arena Added deinit to Archive to destroy the File.MemoryMap
This commit is contained in:
@@ -0,0 +1,77 @@
|
||||
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.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);
|
||||
}
|
||||
Reference in New Issue
Block a user