ref: 23e5f3b2f77164df7a4e9bb49a39c9a23ea7180e
parent: 9bbd5644ef54b9384da88c208088639a11ec4275
author: Noam Preil <noam@pixelhero.dev>
date: Mon Dec 25 09:20:05 EST 2023
cleanup
--- a/disk.c
+++ b/disk.c
@@ -3,7 +3,6 @@
#include <bio.h>
#include "neoventi.h"
-// Note: these should only be accessed via
VtArena *arenas = nil;
u32int numarenas = 0;
@@ -40,8 +39,9 @@
u16int nb = U16GET(ibuf);
ibuf += 6;
for(*entry = 0; *entry <= nb; *entry += 1){- if(memcmp(&ibuf[*entry * IEntrySize], score, 20) == 0)
+ if(memcmp(ibuf, score, 20) == 0)
return 1;
+ ibuf += IEntrySize;
}
return 0;
}
@@ -345,43 +345,41 @@
}
static void
+indexcalc(void)
+{+ index.buckets = index.sects[index.nsects-1].stop;
+ index.div = (((u64int)1<<32)+index.buckets-1) / index.buckets;
+ if((((u64int)1 << 32) - 1) / index.div + 1 != index.buckets)
+ sysfatal("corrupt index: divisor and buckets inconsistent");+}
+
+// The index header is found in the first section; parse it.
+static void
parseindex(void)
{- /* parse the index header from the first section */
u32int version;
- int i;
Biobufhdr bio;
- char *buf = malloc(index.sects[0].tabsize);
- char *line;
- if(Binits(&bio, index.sects[0].fd, OREAD, (uchar*)buf, index.sects[0].tabsize))
- sysfatal("failed to init biobuf: %r");+ uchar *buf = malloc(index.sects[0].tabsize + Bungetsize);
+ if(buf == nil)
+ sysfatal("insufficient memory to start up");+ // Binits cannot fail when given a valid mode; see /sys/src/libbio/binit.c:/^Binits
+ Binits(&bio, index.sects[0].fd, OREAD, buf, index.sects[0].tabsize+Bungetsize);
if(Bseek(&bio, index.sects[0].tabbase, 0) != index.sects[0].tabbase)
- sysfatal("seek failed: %r");- line = Brdline(&bio, '\n');
- if(memcmp(line, "venti index configuration", 25) != 0)
+ sysfatal("unable to read index header");+ if(memcmp(Brdline(&bio, '\n'), "venti index configuration", 25) != 0)
sysfatal("invalid magic found in index header");if(!Brdu32(&bio, &version) || version != 1)
- sysfatal("failed to read version or version unsupported");- line = Brdline(&bio, '\n');
- if(Blinelen(&bio) >= NameSize)
- sysfatal("invalid or corrupt index: name too big");- if(memcmp(line, index.sects[0].index, strlen(index.sects[0].index)) != 0)
+ sysfatal("failed to read index version or index version unsupported");+ if(memcmp(Brdline(&bio, '\n'), index.sects[0].index, strlen(index.sects[0].index)) != 0)
sysfatal("invalid or corrupt index: index/section mismatch");if(!Brdu32(&bio, &index.blocksize))
sysfatal("invalid or corrupt index: failed to read blocksize");/* Section map, then arena map; see parseamap */
/* Parse both maps, overwrite the section map; we don't need it */
+ /* TODO(mandatory feature): support multiple index sections */
parsemap(&bio, &index.amap, &index.namap);
parsemap(&bio, &index.amap, &index.namap);
- /* Validation code here */
- for(i = 0; i < index.nsects; i += 1){- /* TODO validate section */
- index.buckets = index.sects[i].stop;
- }
- index.div = (((u64int)1<<32)+index.buckets-1) / index.buckets;
- if((((u64int)1 << 32) - 1) / index.div + 1 != index.buckets)
- sysfatal("corrupt index: divisor and buckets inconsistent");- /* Lastly, maparenas */
+ indexcalc();
}
void