Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove sys_init syscall

Invoke initlog from forkret on first user process
  • Loading branch information...
commit d10d324e79bdcd7d7ab57952e6b140009737e868 1 parent 39f8cc5
Frans Kaashoek authored
Showing with 7 additions and 13 deletions.
  1. +0 −2  initcode.S
  2. +1 −1  main.c
  3. +6 −0 proc.c
  4. +0 −9 syscall.c
  5. +0 −1  syscall.h
2  initcode.S
View
@@ -7,8 +7,6 @@
# exec(init, argv)
.globl start
start:
- movl $SYS_init, %eax
- int $T_SYSCALL
pushl $argv
pushl $init
pushl $0 // where caller pc would be
2  main.c
View
@@ -60,7 +60,7 @@ mpmain(void)
scheduler(); // start running processes
}
-pde_t enterpgdir[];
+pde_t enterpgdir[]; // For entry.S
// Start the non-boot (AP) processors.
static void
6 proc.c
View
@@ -322,8 +322,14 @@ yield(void)
void
forkret(void)
{
+ static int first = 1;
// Still holding ptable.lock from scheduler.
release(&ptable.lock);
+
+ if (first) {
+ first = 0;
+ initlog();
+ }
// Return to "caller", actually trapret (see allocproc).
}
9 syscall.c
View
@@ -99,15 +99,7 @@ extern int sys_wait(void);
extern int sys_write(void);
extern int sys_uptime(void);
-int
-sys_init(void)
-{
- initlog();
- return 0;
-}
-
static int (*syscalls[])(void) = {
-[SYS_init] sys_init,
[SYS_fork] sys_fork,
[SYS_exit] sys_exit,
[SYS_wait] sys_wait,
@@ -122,7 +114,6 @@ static int (*syscalls[])(void) = {
[SYS_sbrk] sys_sbrk,
[SYS_sleep] sys_sleep,
[SYS_uptime] sys_uptime,
-// File system calls that are run in a transaction:
[SYS_open] sys_open,
[SYS_write] sys_write,
[SYS_mknod] sys_mknod,
1  syscall.h
View
@@ -1,5 +1,4 @@
// System call numbers
-#define SYS_init 0
#define SYS_fork 1
#define SYS_exit 2
#define SYS_wait 3
Please sign in to comment.
Something went wrong with that request. Please try again.