diff options
| author | Mole Shang <[email protected]> | 2024-02-19 14:10:32 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-19 14:36:21 +0800 |
| commit | d86118fc80267649b4791c8c0c72ebd60edf1ef2 (patch) | |
| tree | b792b617b4df80a5803a9c1164d0e3fdfe9cfe31 /kernel/main.c | |
| parent | b20ef9d0210fd7d9403acde1857eed1b9880c0b2 (diff) | |
| parent | 0cf897cbe05fd8485162619db4244f4159d0eb52 (diff) | |
| download | xv6-labs-d86118fc80267649b4791c8c0c72ebd60edf1ef2.tar.gz xv6-labs-d86118fc80267649b4791c8c0c72ebd60edf1ef2.tar.bz2 xv6-labs-d86118fc80267649b4791c8c0c72ebd60edf1ef2.zip | |
Merge branch 'fs' into mmap
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/defs.h
user/user.h
Diffstat (limited to 'kernel/main.c')
| -rw-r--r-- | kernel/main.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel/main.c b/kernel/main.c index f0d3171..48c9555 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -12,6 +12,9 @@ main() { if(cpuid() == 0){ consoleinit(); +#if defined(LAB_LOCK) + statsinit(); +#endif printfinit(); printf("\n"); printf("xv6 kernel is booting\n"); @@ -28,11 +31,18 @@ main() iinit(); // inode table fileinit(); // file table virtio_disk_init(); // emulated hard disk +#ifdef LAB_NET + pci_init(); + sockinit(); +#endif userinit(); // first user process +#ifdef KCSAN + kcsaninit(); +#endif __sync_synchronize(); started = 1; } else { - while(started == 0) + while(atomic_read4((int *) &started) == 0) ; __sync_synchronize(); printf("hart %d starting\n", cpuid()); |