diff options
| -rw-r--r-- | AK/Function.h | 2 | ||||
| -rw-r--r-- | Kernel/Process.cpp | 8 | ||||
| -rw-r--r-- | Kernel/TTY.h | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/AK/Function.h b/AK/Function.h index 99fc8089b5..c95dd90311 100644 --- a/AK/Function.h +++ b/AK/Function.h @@ -97,7 +97,7 @@ private: CallableWrapper(const CallableWrapper&) = delete; CallableWrapper& operator=(const CallableWrapper&) = delete; - Out call(In... in) const final { return m_callable(forward<In>(in)...); } + Out call(In... in) const final override { return m_callable(forward<In>(in)...); } private: CallableType m_callable; diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index d41ac99284..a0fdc848dc 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -23,6 +23,8 @@ #define COOL_GLOBALS #define MAX_PROCESS_GIDS 32 +static const dword scheduler_time_slice = 5; // *10 = 50ms + #ifdef COOL_GLOBALS struct CoolGlobals { dword current_pid; @@ -763,7 +765,7 @@ void Process::send_signal(int signal, Process* sender) ASSERT(signal < 32); // FIXME: Handle send_signal to self. - ASSERT(this != current); + ASSERT(this != sender); auto& action = m_signal_action_data[signal]; // FIXME: Implement SA_SIGINFO signal handlers. @@ -813,7 +815,7 @@ void Process::send_signal(int signal, Process* sender) dbgprintf("signal: %s(%u) sent %d to %s(%u)\n", sender->name().characters(), sender->pid(), signal, name().characters(), pid()); - if (sender == this) { + if (current == this) { sched_yield(); ASSERT_NOT_REACHED(); } @@ -972,7 +974,7 @@ bool scheduleNewProcess() static bool contextSwitch(Process* t) { - t->setTicksLeft(5); + t->setTicksLeft(scheduler_time_slice); t->didSchedule(); if (current == t) diff --git a/Kernel/TTY.h b/Kernel/TTY.h index 1770e53a3c..856e8c79d8 100644 --- a/Kernel/TTY.h +++ b/Kernel/TTY.h @@ -16,7 +16,7 @@ public: pid_t pgid() const { return m_pgid; } protected: - virtual bool isTTY() const final { return true; } + virtual bool isTTY() const final override { return true; } TTY(unsigned major, unsigned minor); void emit(byte); |