denshooter/mxtasking
1
0
Fork 0
mirror of https://github.com/mmueller41/mxtasking.git synced 2026-01-21 12:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Replaced unique_ptrs with simple pointers, as Genode's stdcxx does not provide the former."

Browse Source 
This reverts commit cb25f9d5bb.
This commit is contained in:
Michael Müller
2022-07-26 17:31:25 +02:00
parent e734ffd0d8
commit f33eb0d32f
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mx/tasking/runtime.h
View File

@@ -2,7 +2,7 @@
#include "scheduler.h" #include "scheduler.h"
#include "task.h" #include "task.h"
#include <iostream> /* TODO: Find Genode replacement, IO streams crash on Genode */ #include <iostream> /* TODO: Find Genode replacement, IO streams crash on Genode */
#include <memory> /* DOne: Deos this work with Genode? */ #include <memory> /* TODO: Deos this work with Genode? */
#include <mx/memory/dynamic_size_allocator.h> #include <mx/memory/dynamic_size_allocator.h>
#include <mx/memory/fixed_size_allocator.h> #include <mx/memory/fixed_size_allocator.h>
#include <mx/memory/task_allocator_interface.h> #include <mx/memory/task_allocator_interface.h>
@@ -39,8 +39,8 @@ public:
// Create a new resource allocator. // Create a new resource allocator.
if (_resource_allocator == nullptr) if (_resource_allocator == nullptr)
{ {
_resource_allocator = new (memory::GlobalHeap::allocate_cache_line_aligned( _resource_allocator.reset(new (memory::GlobalHeap::allocate_cache_line_aligned(
sizeof(memory::dynamic::Allocator))) memory::dynamic::Allocator(); sizeof(memory::dynamic::Allocator))) memory::dynamic::Allocator());
} }
else if (_resource_allocator->is_free()) else if (_resource_allocator->is_free())
{ {
@@ -55,32 +55,32 @@ public:
// Create a new task allocator. // Create a new task allocator.
if (use_system_allocator) if (use_system_allocator)
{ {
_task_allocator = new (memory::GlobalHeap::allocate_cache_line_aligned(sizeof( _task_allocator.reset(new (memory::GlobalHeap::allocate_cache_line_aligned(sizeof(
memory::SystemTaskAllocator<config::task_size()>))) memory::SystemTaskAllocator<config::task_size()>(); memory::SystemTaskAllocator<config::task_size()>))) memory::SystemTaskAllocator<config::task_size()>());
} }
else else
{ {
_task_allocator = new ( _task_allocator.reset(new (
memory::GlobalHeap::allocate_cache_line_aligned(sizeof(memory::fixed::Allocator<config::task_size()>))) memory::GlobalHeap::allocate_cache_line_aligned(sizeof(memory::fixed::Allocator<config::task_size()>)))
memory::fixed::Allocator<config::task_size()>(core_set); memory::fixed::Allocator<config::task_size()>(core_set));
} }
// Create a new scheduler. // Create a new scheduler.
const auto need_new_scheduler = _scheduler == nullptr || *_scheduler != core_set; const auto need_new_scheduler = _scheduler == nullptr || *_scheduler != core_set;
if (need_new_scheduler) if (need_new_scheduler)
{ {
_scheduler = new (memory::GlobalHeap::allocate_cache_line_aligned(sizeof(Scheduler))) _scheduler.reset(new (memory::GlobalHeap::allocate_cache_line_aligned(sizeof(Scheduler)))
Scheduler(core_set, prefetch_distance, *_resource_allocator); Scheduler(core_set, prefetch_distance, *_resource_allocator));
} }
else else
{ {
_scheduler = nullptr; _scheduler->reset();
} }
// Create a new resource builder. // Create a new resource builder.
if (_resource_builder == nullptr || need_new_scheduler) if (_resource_builder == nullptr || need_new_scheduler)
{ {
_resource_builder = new(memory::GlobalHeap::heap()) resource::Builder(*_scheduler, *_resource_allocator); _resource_builder = std::make_unique<resource::Builder>(*_scheduler, *_resource_allocator);
} }
return true; return true;
@@ -234,16 +234,16 @@ public:
private: private:
// Scheduler to spawn tasks. // Scheduler to spawn tasks.
inline static Scheduler *_scheduler = nullptr; inline static std::unique_ptr<Scheduler> _scheduler = {nullptr};
// Allocator to allocate tasks (could be systems malloc or our Multi-level allocator). // Allocator to allocate tasks (could be systems malloc or our Multi-level allocator).
inline static memory::TaskAllocatorInterface *_task_allocator = nullptr; inline static std::unique_ptr<memory::TaskAllocatorInterface> _task_allocator = {nullptr};
// Allocator to allocate resources. // Allocator to allocate resources.
inline static memory::dynamic::Allocator *_resource_allocator = nullptr; inline static std::unique_ptr<memory::dynamic::Allocator> _resource_allocator = {nullptr};
// Allocator to allocate data objects. // Allocator to allocate data objects.
inline static resource::Builder *_resource_builder = nullptr; inline static std::unique_ptr<resource::Builder> _resource_builder = {nullptr};
}; };
/** /**