include: one folder per subsystem, and includes that name it
Sixty-five headers sat side by side in include/, so `#include "irq.h"` said nothing about where irq.h was or what it belonged to, and errno.h, stat.h and fcntl.h at the top shadowed the system's for any host tool built with -I./include. They are in folders now -- arch/ core/ fs/ dev/ gfx/ net/ uapi/ (and ldls/ for the Linux driver layer) -- and every include names the folder, as Linux's do: "core/proc.h". Done mechanically and checked the hard way: the kernel built from this tree disassembles identically to the one built from the tree before it. The full image boots, and userland is the same set of programs. Paths in docs and comments follow; docs/guides/layout.md has a table of what is where, and tools/fix-includes.py rewrites old-style includes from the folders in the tree, for code written before this. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S1giNvrHTrPMPw7V6x1kQ4
This commit is contained in:
parent
0e39e711f1
commit
a1c965da1e
267 changed files with 1560 additions and 1440 deletions
10
tools/mkfs.c
10
tools/mkfs.c
|
|
@ -44,10 +44,10 @@
|
|||
#define stat xv6_stat
|
||||
#define sigset_t xv6_sigset_t
|
||||
#define dirent schfs_dirent
|
||||
#include "../include/types.h"
|
||||
#include "../include/param.h"
|
||||
#include "../include/fs.h"
|
||||
#include "../include/stat.h"
|
||||
#include "../include/core/types.h"
|
||||
#include "../include/core/param.h"
|
||||
#include "../include/fs/fs.h"
|
||||
#include "../include/uapi/stat.h"
|
||||
#undef dirent
|
||||
#undef stat
|
||||
#include <dirent.h>
|
||||
|
|
@ -730,7 +730,7 @@ check_disk_space(void)
|
|||
freeblock, fssize, nmeta, nlog, ninodeblocks, nbitmap + nibitmap);
|
||||
fprintf(stderr,
|
||||
" Which knob depends on the image:\n"
|
||||
" the main root image -> FSSIZE in include/param.h\n"
|
||||
" the main root image -> FSSIZE in include/core/param.h\n"
|
||||
" the ramdisk root -> RAMDISK_BLOCKS in the Makefile\n"
|
||||
" Before growing it, check whether the content belongs here at all:\n"
|
||||
" --exclude <path> drops a subtree, and --ninodes shrinks the\n"
|
||||
|
|
|
|||
Loading…
Reference in a new issue