diff options
| author | Mole Shang <[email protected]> | 2024-02-16 10:20:27 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-16 10:20:27 +0800 |
| commit | a98c56a811142e5ede3332a7a444cca45f628769 (patch) | |
| tree | c93ff7090da7b6ef911932be283818c2f6a03784 /kernel/virtio_disk.c | |
| parent | 0d65be5d1d880afafbf08c2adb605cf9f72216e2 (diff) | |
| parent | 99015f3a985b2fd051606636743a2a2969b216e8 (diff) | |
| download | xv6-labs-a98c56a811142e5ede3332a7a444cca45f628769.tar.gz xv6-labs-a98c56a811142e5ede3332a7a444cca45f628769.tar.bz2 xv6-labs-a98c56a811142e5ede3332a7a444cca45f628769.zip | |
Merge branch 'lock' into thread
Conflicts:
.gitignore
Makefile
conf/lab.mk
Diffstat (limited to 'kernel/virtio_disk.c')
| -rw-r--r-- | kernel/virtio_disk.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/kernel/virtio_disk.c b/kernel/virtio_disk.c index ae6c164..dfca2bc 100644 --- a/kernel/virtio_disk.c +++ b/kernel/virtio_disk.c @@ -212,6 +212,28 @@ alloc3_desc(int *idx) return 0; } +#ifdef LAB_LOCK +// +// check that there are at most NBUF distinct +// struct buf's, which the lock lab requires. +// +static struct buf *xbufs[NBUF]; +static void +checkbuf(struct buf *b) +{ + for(int i = 0; i < NBUF; i++){ + if(xbufs[i] == b){ + return; + } + if(xbufs[i] == 0){ + xbufs[i] = b; + return; + } + } + panic("more than NBUF bufs"); +} +#endif + void virtio_disk_rw(struct buf *b, int write) { @@ -219,6 +241,10 @@ virtio_disk_rw(struct buf *b, int write) acquire(&disk.vdisk_lock); +#ifdef LAB_LOCK + checkbuf(b); +#endif + // the spec's Section 5.2 says that legacy block operations use // three descriptors: one for type/reserved/sector, one for the // data, one for a 1-byte status result. |