commit - 2b6c15d87f9ab7a608fb146f58aee9460546ccf0
commit + d67cd5c33c62679df29dce6b452d32882cd2eca5
blob - 44c975ecaf13a2e36dc972cddc98addd45ffb3ee
blob + c287bdacdec166736038b77fd7f45e9733f195b3
--- src/cmd/venti/srv/fmtarenas.c
+++ src/cmd/venti/srv/fmtarenas.c
#include "stdinc.h"
#include "dat.h"
#include "fns.h"
-#ifndef ODIRECT
-#define ODIRECT 0
-#endif
void
usage(void)
blob - 2fd4508e888a4477c741bca2aa227aad0687116e
blob + 1a2fd02b7c5ea5dc245acf04ae3e5d556d656cf6
--- src/cmd/venti/srv/mkfile
+++ src/cmd/venti/srv/mkfile
test:VQ: ${TARG:%=o.%}
slay o.venti|rc
vtmp=/home/tmp
+ test -f $vtmp/arena || dd bs=1048576 count=100 if=/dev/zero of=$vtmp/arena
+ test -f $vtmp/bloom || dd bs=1048576 count=10 if=/dev/zero of=$vtmp/bloom
+ test -f $vtmp/isect || dd bs=1048576 count=10 if=/dev/zero of=$vtmp/isect
+ test -f $vtmp/check || dd bs=1048576 count=10 if=/dev/zero of=$vtmp/check
echo '**********' FMTARENAS
./o.fmtarenas -a 40M -b 8k arenas $vtmp/arena
echo '**********' FMTBLOOM
echo isect $vtmp/isect
echo arenas $vtmp/arena
echo bloom $vtmp/bloom
- echo webroot $HOME/src/venti/www
+ echo webroot $PLAN9/src/cmd/venti/srv/www
echo mem 64M
echo icmem 64M
echo bcmem 64M
+ echo queuewrites
+ echo addr 'tcp!*!17034'
+ echo httpaddr 'tcp!*!8001'
) >vtmp.conf
echo '**********' FMTINDEX
./o.fmtindex vtmp.conf
echo '**********' VENTI
- # ./o.venti -c vtmp.conf -B 64M -I 64M -C 64M -a 'tcp!*!17034' -h 'tcp!*!8001' >a 2>&1 &
- ./o.venti -c vtmp.conf -a 'tcp!*!17034' -h 'tcp!*!8001' >a 2>&1 &
- sleep 5
+ ./o.venti -c vtmp.conf >a 2>&1
echo '**********' VAC
venti='tcp!127.0.0.1!17034' export venti
- 9 time vac /usr/local/plan9 >a.vac
+ 9 time vac /usr/local/plan9/src >a.vac
case ${websync:-no} in
yes)
echo '**********' SYNC VIA WEB
;;
esac
echo '**********' CHECKINDEX
- ./o.checkindex -B64M vtmp.conf /home/tmp/check >check.out
+ ./o.checkindex -B64M vtmp.conf $vtmp/check >check.out
wc check.out
luadisk.o: luadisk.c
blob - e1fc24b09097954d091619b2c96a1920f44e68ca
blob + 28d469fcf2730f740b6642ec594ac703905bc636
--- src/cmd/venti/srv/sortientry.c
+++ src/cmd/venti/srv/sortientry.c
return nil;
}
ib->xbuf = MKN(u8int, size * ((1 << bits)+1));
- ib->buf = (u8int*)(((ulong)ib->xbuf+size-1)&~(ulong)(size-1));
+ ib->buf = (u8int*)(((uintptr)ib->xbuf+size-1)&~(uintptr)(size-1));
if(ib->buf == nil){
seterr(EOk, "out of memory allocating sorting buckets' buffers");
freeiebucks(ib);
if(n == TWID32)
return TWID32;
qsort(ib->buf, n, IEntrySize, ientrycmp);
- if(writepart(ib->part, ib->off, ib->buf, n * IEntrySize) < 0){
+ if(writepart(ib->part, ib->off, ib->buf, n*IEntrySize) < 0){
seterr(EOk, "can't write sorted bucket: %r");
return TWID32;
}
// if(ib->bucks[b].total)
// fprint(2, "\tbucket %d: %d entries\n", b, ib->bucks[b].total/IEntrySize);
while(head != TWID32){
- if(readpart(ib->part, (u64int)head * ib->size, &ib->buf[n], m + U32Size) < 0){
+ if(readpart(ib->part, (u64int)head * ib->size, &ib->buf[n], m+U32Size) < 0){
seterr(EOk, "can't read index sort bucket: %r");
return TWID32;
}
blob - b35ca2a425b4a6ffe4a3da3e78089f98b1f465f9
blob + 56bf1527267934c625868a9ad0be115d477f4378
--- src/cmd/venti/srv/syncindex.c
+++ src/cmd/venti/srv/syncindex.c
if(argc != 1)
usage();
+ ventifmtinstall();
if(initventi(argv[0], &conf) < 0)
sysfatal("can't init venti: %r");
blob - b33cdd25d47ecc8c022e92d3999aea6a39364cb8
blob + 4aa11f45a8c02e1be7841246e2869206c0e8d163
--- src/cmd/venti/srv/zblock.c
+++ src/cmd/venti/srv/zblock.c
f->nfmt = 0;
}
-#define ROUNDUP(p, n) ((void*)(((ulong)(p)+(n)-1)&~(ulong)((n)-1)))
+#define ROUNDUP(p, n) ((void*)(((uintptr)(p)+(n)-1)&~(uintptr)((n)-1)))
static char zmagic[] = "1234567890abcdefghijkl";