From f229e43c6b960b56579bd3600d80760b98dd02b0 Mon Sep 17 00:00:00 2001 From: churl Date: Sun, 5 Jun 2022 16:51:11 +0200 Subject: [PATCH] reformat --- c_os/kernel/threads/Dispatch.cc | 10 ++++------ c_os/kernel/threads/Dispatch.h | 13 ++++++------- c_os/kernel/threads/Scheduler.h | 26 ++++++++++++-------------- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/c_os/kernel/threads/Dispatch.cc b/c_os/kernel/threads/Dispatch.cc index f027df4..3b8f07f 100644 --- a/c_os/kernel/threads/Dispatch.cc +++ b/c_os/kernel/threads/Dispatch.cc @@ -16,7 +16,6 @@ #include "kernel/threads/Dispatch.h" - /***************************************************************************** * Methode: Dispatcher::start * *---------------------------------------------------------------------------* @@ -25,14 +24,13 @@ * Parameter: * * first Zu startender Thread. * *****************************************************************************/ -void Dispatcher::start (Thread& first) { +void Dispatcher::start(Thread& first) { if (!active) { active = &first; - active->start (); + active->start(); } } - /***************************************************************************** * Methode: Dispatcher::dispatch * *---------------------------------------------------------------------------* @@ -41,8 +39,8 @@ void Dispatcher::start (Thread& first) { * Parameter: * * next Thread der die CPU erhalten soll. * *****************************************************************************/ -void Dispatcher::dispatch (Thread& next) { +void Dispatcher::dispatch(Thread& next) { Thread* current = active; active = &next; - current->switchTo (next); + current->switchTo(next); } diff --git a/c_os/kernel/threads/Dispatch.h b/c_os/kernel/threads/Dispatch.h index a7275f0..993549e 100644 --- a/c_os/kernel/threads/Dispatch.h +++ b/c_os/kernel/threads/Dispatch.h @@ -19,17 +19,16 @@ #include "kernel/threads/Thread.h" class Dispatcher { - private: - Thread* active; // aktiver Thread + Thread* active; // aktiver Thread - Dispatcher(const Dispatcher ©); // Verhindere Kopieren + Dispatcher(const Dispatcher& copy) = delete; // Verhindere Kopieren public: - Dispatcher () : active (0) {} - void start (Thread& first); - void dispatch (Thread& next); - Thread* get_active () { return active; } + Dispatcher() : active(0) {} + void start(Thread& first); + void dispatch(Thread& next); + Thread* get_active() { return active; } }; #endif diff --git a/c_os/kernel/threads/Scheduler.h b/c_os/kernel/threads/Scheduler.h index 14bead5..f532d3c 100644 --- a/c_os/kernel/threads/Scheduler.h +++ b/c_os/kernel/threads/Scheduler.h @@ -17,30 +17,28 @@ #include "lib/Queue.h" class Scheduler : public Dispatcher { - private: - Scheduler (const Scheduler ©); // Verhindere Kopieren - -private: - Queue readyQueue; // auf die CPU wartende Threads - + Scheduler(const Scheduler& copy) = delete; // Verhindere Kopieren + + Queue readyQueue; // auf die CPU wartende Threads + public: - Scheduler () {} + Scheduler() {} // Scheduler starten - void schedule (); - + void schedule(); + // Thread in readyQueue eintragen - void ready (Thread * that); - + void ready(Thread* that); + // Thread terminiert sich selbst - void exit (); + void exit(); // Thread mit 'Gewalt' terminieren - void kill (Thread * that); + void kill(Thread* that); // CPU freiwillig abgeben und Auswahl des naechsten Threads - void yield (); + void yield(); }; #endif