diff options
| author | Mole Shang <[email protected]> | 2024-02-17 11:55:33 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-17 12:22:07 +0800 |
| commit | e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd (patch) | |
| tree | fb42ba5be7a8ae608b968266f62fd71fa889a89d /kernel/main.c | |
| parent | a6af72924b115c1177d18d9b1eaba56623e4248b (diff) | |
| parent | d85aec2689c4250d0384904bdc11aa618c726bec (diff) | |
| download | xv6-labs-e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd.tar.gz xv6-labs-e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd.tar.bz2 xv6-labs-e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd.zip | |
Merge branch 'thread' into fs
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/param.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()); |