o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor bug fixes (mechiel lukkien, andrey)

Browse source
This commit is contained in:
rsc 2006-04-20 21:01:48 +00:00
parent a5f3a00bcd
commit 4f959600b6
4 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/venti/srv/bloom.c
View file

@ -101,8 +101,6 @@ gethashes(u8int *score, ulong *h)
a ^= *(u32int*)(score+i); a ^= *(u32int*)(score+i);
b ^= *(u32int*)(score+i+4); b ^= *(u32int*)(score+i+4);
} }
if(i+4 <= VtScoreSize) /* 20 is not 4-aligned */
a ^= *(u32int*)(score+i);
for(i=0; i<BloomMaxHash; i++, a+=b) for(i=0; i<BloomMaxHash; i++, a+=b)
h[i] = a < BloomHeadSize*8 ? BloomHeadSize*8 : a; h[i] = a < BloomHeadSize*8 ? BloomHeadSize*8 : a;
} }

2
src/cmd/venti/srv/fmtbloom.c
View file

@ -107,7 +107,7 @@ threadmain(int argc, char *argv[])
b.nhash = nhash; b.nhash = nhash;
bits = nhash*10/7; bits = nhash*10/7;
nblocks = (8*size)/bits; nblocks = (8*size)/bits;
fprint(2, "fmtbloom: using %lldMB, %d hashes/score, best up to %,lld blocks\n", size, nhash, nblocks); fprint(2, "fmtbloom: using %lldMB, %d hashes/score, best up to %,lld blocks\n", size/1024/1024, nhash, nblocks);
b.data = vtmallocz(size); b.data = vtmallocz(size);
b.part = part; b.part = part;
if(writebloom(&b) < 0) if(writebloom(&b) < 0)

2
src/cmd/venti/srv/graph.c
View file

@ -121,7 +121,7 @@ statgraph(Graph *g)
if(g->wid > nelem(bin)) if(g->wid > nelem(bin))
g->wid = nelem(bin); g->wid = nelem(bin);
if(g->fill < 0) if(g->fill < 0)
g->fill = ((uint)g->arg>>8)%nelem(lofill); g->fill = ((uint)(uintptr)g->arg>>8)%nelem(lofill);
if(g->fill > nelem(lofill)) if(g->fill > nelem(lofill))
g->fill %= nelem(lofill); g->fill %= nelem(lofill);

2
src/cmd/venti/srv/part.c
View file

@ -313,7 +313,7 @@ print("FAILED isread=%d r=%d count=%d blocksize=%d\n", isread, r, count, blocksi
memmove(buf, tmp, count); memmove(buf, tmp, count);
else{ else{
memmove(tmp, buf, count); memmove(tmp, buf, count);
if(pwrite(fd, tmp, opsize, offset) != blocksize){ if(pwrite(fd, tmp, blocksize, offset) != blocksize){
dst = tmp; dst = tmp;
op = "write"; op = "write";
goto Error; goto Error;