diff options
| author | Sanjit Bhat <[email protected]> | 2023-10-25 19:42:59 -0400 |
|---|---|---|
| committer | Sanjit Bhat <[email protected]> | 2023-10-25 19:42:59 -0400 |
| commit | 1ed40716eb54e371df9d1814b9129666b3fe4f09 (patch) | |
| tree | 84666aacb6d6a9554b09500c0b0420870af2e19e /kernel/main.c | |
| parent | 74c1eba516fdb0ec1a17b16be7e76613ccba92bf (diff) | |
| download | xv6-labs-1ed40716eb54e371df9d1814b9129666b3fe4f09.tar.gz xv6-labs-1ed40716eb54e371df9d1814b9129666b3fe4f09.tar.bz2 xv6-labs-1ed40716eb54e371df9d1814b9129666b3fe4f09.zip | |
release lab net
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()); |