ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-12 20:28:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/vfs: pass handle allocator to open(...)

Browse Source 
Opening a VFS handle previously involved allocating from the global heap
at each VFS file system. By amending open with an allocator argument,
dynamic allocation can be partitioned.

A new close method is used to deallocate open handles.

Issue #1751
Issue #1891
This commit is contained in:
Emery Hemingway
2016-03-30 15:24:19 +02:00
committed by Christian Helmuth
parent 98b9a24357
commit 82a7799638
11 changed files with 132 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
repos/os/include/vfs/dir_file_system.h
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (C) 2011-2014 Genode Labs GmbH
* Copyright (C) 2011-2016 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU General Public License version 2.
@ -397,7 +397,10 @@ class Vfs::Dir_file_system : public File_system
return 0;
}
Open_result open(char const *path, unsigned mode, Vfs_handle **out_handle) override
Open_result open(char const *path,
unsigned mode,
Vfs_handle **out_handle,
Allocator &alloc = *Genode::env()->heap()) override
{
/*
* If 'path' is a directory, we create a 'Vfs_handle'
@ -405,7 +408,7 @@ class Vfs::Dir_file_system : public File_system
* are subjected to the stacked file-system layout.
*/
if (is_directory(path)) {
*out_handle = new (env()->heap()) Vfs_handle(*this, *this, 0);
*out_handle = new (alloc) Vfs_handle(*this, *this, alloc, 0);
return OPEN_OK;
}
@ -423,23 +426,32 @@ class Vfs::Dir_file_system : public File_system
/* path equals directory name */
if (strlen(path) == 0) {
*out_handle = new (env()->heap()) Vfs_handle(*this, *this, 0);
*out_handle = new (alloc) Vfs_handle(*this, *this, alloc, 0);
return OPEN_OK;
}
/* path refers to any of our sub file systems */
for (File_system *fs = _first_file_system; fs; fs = fs->next) {
Open_result const err = fs->open(path, mode, out_handle);
if (err == OPEN_OK)
Open_result const err = fs->open(path, mode, out_handle, alloc);
switch (err) {
case OPEN_ERR_UNACCESSIBLE:
continue;
default:
return err;
}
}
/* path does not match any existing file or directory */
return OPEN_ERR_UNACCESSIBLE;
}
void close(Vfs_handle *handle) override
{
if (handle && (&handle->ds() == this))
destroy(handle->alloc(), handle);
}
Unlink_result unlink(char const *path) override
{
auto unlink_fn = [] (File_system &fs, char const *path)