Imbus/pluto
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add new parameters for resize and alloc

Browse source
This commit is contained in:
Sam Tebbs 2020-08-15 15:33:41 +01:00
parent 651e07146d
commit 95885f4407
3 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/kernel/filesystem/initrd.zig
View file

@ -345,7 +345,7 @@ test "init with files cleans memory if OutOfMemory" {
}
// Ensure we have freed any memory allocated
try std.testing.allocator_instance.validate();
std.testing.expectEqual(false, std.testing.allocator_instance.detectLeaks());
}
}
@ -413,6 +413,14 @@ test "open fail with invalid flags" {
}
test "open fail with NoSuchFileOrDir" {
var ramdisk_bytes = try createInitrd(std.testing.allocator);
defer std.testing.allocator.free(ramdisk_bytes);
var initrd_stream = std.io.fixedBufferStream(ramdisk_bytes);
var fs = try InitrdFS.init(&initrd_stream, std.testing.allocator);
defer fs.deinit();
vfs.setRoot(fs.root_node);
expectError(error.NoSuchFileOrDir, vfs.openFile("/text10.txt", .NO_CREATION));
expectError(error.NoSuchFileOrDir, vfs.openDir("/temp/", .NO_CREATION));
}

11
src/kernel/filesystem/vfs.zig
View file

@ -246,6 +246,7 @@ fn traversePath(path: []const u8, flags: OpenFlags) (Allocator.Error || Error)!*
child: []const u8,
const Self = @This();
fn func(split: *std.mem.SplitIterator, node: *Node, rec_flags: OpenFlags) (Allocator.Error || Error)!Self {
// Get segment string. This will not be unreachable as we've made sure the spliterator has more segments left
const seg = split.next() orelse unreachable;
@ -560,8 +561,8 @@ test "mount" {
// The root fs
var testfs = try testInitFs(allocator);
defer testfs.deinit();
defer allocator.destroy(testfs);
defer testfs.deinit();
testfs.instance = 1;
root = testfs.tree.val;
@ -594,8 +595,8 @@ test "mount" {
test "traversePath" {
var allocator = testing.allocator;
var testfs = try testInitFs(allocator);
defer testfs.deinit();
defer allocator.destroy(testfs);
defer testfs.deinit();
root = testfs.tree.val;
// Get the root
@ -649,8 +650,8 @@ test "isFile" {
test "open" {
var testfs = try testInitFs(testing.allocator);
defer testfs.deinit();
defer testing.allocator.destroy(testfs);
defer testfs.deinit();
root = testfs.tree.val;
// Creating a file
@ -698,8 +699,8 @@ test "open" {
test "read" {
var testfs = try testInitFs(testing.allocator);
defer testfs.deinit();
defer testing.allocator.destroy(testfs);
defer testfs.deinit();
root = testfs.tree.val;
var test_file = try openFile("/foo.txt", .CREATE_FILE);
@ -736,8 +737,8 @@ test "read" {
test "write" {
var testfs = try testInitFs(testing.allocator);
defer testfs.deinit();
defer testing.allocator.destroy(testfs);
defer testfs.deinit();
root = testfs.tree.val;
var test_file = try openFile("/foo.txt", .CREATE_FILE);