summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2019-04-21 12:33:14 +0200
committerAndreas Kling <awesomekling@gmail.com>2019-04-21 12:33:14 +0200
commita9d09e9020465e7baf7e727b4e933f25d1ce7aa5 (patch)
treed3e69b8888b974286111cad44de772f7cde784c3
parent84f96c393c6d39908474202f10ea42cc569e0545 (diff)
downloadserenity-a9d09e9020465e7baf7e727b4e933f25d1ce7aa5.zip
Kernel: Get rid of the "cool globals" thingy.
This was something I used while debugging with Computron. I haven't needed it for months, so let's get rid of it. It's trivial to readd if needed.
-rw-r--r--Kernel/Process.cpp9
-rw-r--r--Kernel/Process.h20
-rw-r--r--Kernel/Scheduler.cpp4
3 files changed, 5 insertions, 28 deletions
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index c80b36cd39..ccfb0953c8 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -27,7 +27,6 @@
//#define TASK_DEBUG
//#define FORK_DEBUG
#define SIGNAL_DEBUG
-#define MAX_PROCESS_GIDS 32
//#define SHARED_BUFFER_DEBUG
static pid_t next_pid;
@@ -35,13 +34,8 @@ InlineLinkedList<Process>* g_processes;
static String* s_hostname;
static Lock* s_hostname_lock;
-CoolGlobals* g_cool_globals;
-
void Process::initialize()
{
-#ifdef COOL_GLOBALS
- g_cool_globals = reinterpret_cast<CoolGlobals*>(0x1000);
-#endif
next_pid = 0;
g_processes = new InlineLinkedList<Process>;
s_hostname = new String("courage");
@@ -1612,7 +1606,6 @@ int Process::sys$getgroups(ssize_t count, gid_t* gids)
{
if (count < 0)
return -EINVAL;
- ASSERT(m_gids.size() < MAX_PROCESS_GIDS);
if (!count)
return m_gids.size();
if (count != (int)m_gids.size())
@@ -1631,8 +1624,6 @@ int Process::sys$setgroups(ssize_t count, const gid_t* gids)
return -EINVAL;
if (!is_superuser())
return -EPERM;
- if (count >= MAX_PROCESS_GIDS)
- return -EINVAL;
if (!validate_read(gids, count))
return -EFAULT;
m_gids.clear();
diff --git a/Kernel/Process.h b/Kernel/Process.h
index 3029533852..90b0fc9108 100644
--- a/Kernel/Process.h
+++ b/Kernel/Process.h
@@ -1,15 +1,16 @@
#pragma once
#include <AK/Types.h>
-#include <Kernel/TTY/TTY.h>
-#include "Syscall.h"
-#include <Kernel/FileSystem/VirtualFileSystem.h>
-#include <Kernel/UnixTypes.h>
#include <AK/InlineLinkedList.h>
#include <AK/AKString.h>
#include <AK/Vector.h>
#include <AK/WeakPtr.h>
#include <AK/Weakable.h>
+#include <Kernel/FileSystem/VirtualFileSystem.h>
+#include <Kernel/TTY/TTY.h>
+#include <Kernel/Syscall.h>
+#include <Kernel/UnixTypes.h>
+
#include <Kernel/Thread.h>
#include <Kernel/Lock.h>
@@ -17,17 +18,6 @@ class FileDescriptor;
class PageDirectory;
class Region;
class VMObject;
-class Zone;
-class WSWindow;
-class GraphicsBitmap;
-
-#define COOL_GLOBALS
-#ifdef COOL_GLOBALS
-struct CoolGlobals {
- pid_t current_pid;
-};
-extern CoolGlobals* g_cool_globals;
-#endif
void kgettimeofday(timeval&);
diff --git a/Kernel/Scheduler.cpp b/Kernel/Scheduler.cpp
index 52b6cc3965..9b545bdcee 100644
--- a/Kernel/Scheduler.cpp
+++ b/Kernel/Scheduler.cpp
@@ -321,10 +321,6 @@ bool Scheduler::context_switch(Thread& thread)
current = &thread;
thread.set_state(Thread::Running);
-#ifdef COOL_GLOBALS
- g_cool_globals->current_pid = thread.process().pid();
-#endif
-
if (!thread.selector()) {
thread.set_selector(gdt_alloc_entry());
auto& descriptor = get_gdt_entry(thread.selector());