ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-07 19:34:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: remove global env from fd_alloc

Browse Source 
Issue #2280.
This commit is contained in:
Josef Söntgen 2017-02-22 13:26:33 +01:00 committed by Christian Helmuth
parent d6a92e956a
commit a79f7d234b
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/libports/include/libc-plugin/fd_alloc.h
View File

@ -73,7 +73,7 @@ namespace Libc {
/**
* Constructor
*/
File_descriptor_allocator();
File_descriptor_allocator(Genode::Allocator &md_alloc);
/**
* Allocate file descriptor

36
repos/libports/src/lib/libc/fd_alloc.cc
View File

@ -16,32 +16,32 @@
#include <util/construct_at.h>
#include <base/env.h>
#include <base/log.h>
#include <libc/allocator.h>
/* libc plugin interface */
#include <libc-plugin/fd_alloc.h>
namespace Libc {
File_descriptor_allocator *file_descriptor_allocator()
{
static bool constructed = 0;
static char placeholder[sizeof(File_descriptor_allocator)];
if (!constructed) {
Genode::construct_at<File_descriptor_allocator>(placeholder);
constructed = 1;
}
return reinterpret_cast<File_descriptor_allocator *>(placeholder);
}
}
using namespace Libc;
using namespace Genode;
File_descriptor_allocator::File_descriptor_allocator()
: Allocator_avl_tpl<File_descriptor>(Genode::env()->heap())
File_descriptor_allocator *Libc::file_descriptor_allocator()
{
static bool constructed = false;
static char placeholder[sizeof(File_descriptor_allocator)];
static Libc::Allocator md_alloc;
if (!constructed) {
Genode::construct_at<File_descriptor_allocator>(placeholder, md_alloc);
constructed = true;
}
return reinterpret_cast<File_descriptor_allocator *>(placeholder);
}
File_descriptor_allocator::File_descriptor_allocator(Genode::Allocator &md_alloc)
: Allocator_avl_tpl<File_descriptor>(&md_alloc)
{
add_range(0, MAX_NUM_FDS);
}

3
repos/libports/src/lib/libc/libc_mmap_registry.h
View File

@ -12,6 +12,9 @@
#include <base/env.h>
#include <base/log.h>
/* Genode libc includes */
#include <errno.h>
/* libc-internal includes */
#include <libc-plugin/plugin.h>