RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:48:10 +00:00
Code Issues Activity Actions

Process now maps regions immediately when they are allocated.

Browse source 
This avoids having to do a separate MM.mapRegionsForTask() pass.

Also, more Task => Process renaming that I apparently hadn't saved yet.
This commit is contained in:
Andreas Kling 2018-11-01 13:15:46 +01:00
parent 4e60551aec
commit 3e532ac7b6
14 changed files with 327 additions and 387 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Kernel/init.cpp
View file

@ -4,7 +4,7 @@
#include "i386.h"
#include "i8253.h"
#include "Keyboard.h"
#include "Task.h"
#include "Process.h"
#include "system.h"
#include "Disk.h"
#include "PIC.h"
@ -96,7 +96,7 @@ static void undertaker_main() NORETURN;
static void undertaker_main()
{
for (;;) {
Task::doHouseKeeping();
Process::doHouseKeeping();
sleep(300);
}
}
@ -178,9 +178,9 @@ static void init_stage2()
for (unsigned i = 0; i < 100; ++i) {
int error;
auto* shTask = Task::createUserTask("/bin/id", (uid_t)100, (gid_t)100, (pid_t)0, error);
auto* shProcess = Process::createUserProcess("/bin/id", (uid_t)100, (gid_t)100, (pid_t)0, error);
kprintf("malloc stats: alloc:%u free:%u\n", sum_alloc, sum_free);
kprintf("sizeof(Task):%u\n", sizeof(Task));
kprintf("sizeof(Process):%u\n", sizeof(Process));
kprintf("delta:%u\n",sum_alloc - lastAlloc);
lastAlloc = sum_alloc;
sleep(600);
@ -188,11 +188,11 @@ static void init_stage2()
#endif
int error;
auto* sh0 = Task::createUserTask("/bin/sh", (uid_t)100, (gid_t)100, (pid_t)0, error, nullptr, tty0);
auto* sh0 = Process::createUserProcess("/bin/sh", (uid_t)100, (gid_t)100, (pid_t)0, error, nullptr, tty0);
#ifdef SPAWN_MULTIPLE_SHELLS
auto* sh1 = Task::createUserTask("/bin/sh", (uid_t)100, (gid_t)100, (pid_t)0, error, nullptr, tty1);
auto* sh2 = Task::createUserTask("/bin/sh", (uid_t)100, (gid_t)100, (pid_t)0, error, nullptr, tty2);
auto* sh3 = Task::createUserTask("/bin/sh", (uid_t)100, (gid_t)100, (pid_t)0, error, nullptr, tty3);
auto* sh1 = Process::createUserProcess("/bin/sh", (uid_t)100, (gid_t)100, (pid_t)0, error, nullptr, tty1);
auto* sh2 = Process::createUserProcess("/bin/sh", (uid_t)100, (gid_t)100, (pid_t)0, error, nullptr, tty2);
auto* sh3 = Process::createUserProcess("/bin/sh", (uid_t)100, (gid_t)100, (pid_t)0, error, nullptr, tty3);
#endif
#if 0
@ -253,16 +253,16 @@ void init()
auto procfs = ProcFileSystem::create();
procfs->initialize();
Task::initialize();
Process::initialize();
Task::createKernelTask(undertaker_main, "undertaker");
Task::createKernelTask(init_stage2, "init");
Process::createKernelProcess(undertaker_main, "undertaker");
Process::createKernelProcess(init_stage2, "init");
scheduleNewTask();
scheduleNewProcess();
sti();
// This now becomes the idle task :^)
// This now becomes the idle process :^)
for (;;) {
asm("hlt");
}