Jelajahi Sumber

Fix whiny build.

Andreas Kling 6 tahun lalu
induk
melakukan
71bffa9864
3 mengubah file dengan 7 tambahan dan 5 penghapusan
  1. 1 1
      AK/Function.h
  2. 5 3
      Kernel/Process.cpp
  3. 1 1
      Kernel/TTY.h

+ 1 - 1
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;

+ 5 - 3
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)

+ 1 - 1
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);