tbetter mk test - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit d67cd5c33c62679df29dce6b452d32882cd2eca5
(DIR) parent 2b6c15d87f9ab7a608fb146f58aee9460546ccf0
(HTM) Author: rsc <devnull@localhost>
Date: Tue, 19 Jul 2005 16:02:31 +0000
better mk test
Diffstat:
M src/cmd/venti/srv/fmtarenas.c | 3 ---
M src/cmd/venti/srv/mkfile | 17 +++++++++++------
M src/cmd/venti/srv/sortientry.c | 6 +++---
M src/cmd/venti/srv/syncindex.c | 1 +
M src/cmd/venti/srv/zblock.c | 2 +-
5 files changed, 16 insertions(+), 13 deletions(-)
---
(DIR) diff --git a/src/cmd/venti/srv/fmtarenas.c b/src/cmd/venti/srv/fmtarenas.c
t@@ -1,9 +1,6 @@
#include "stdinc.h"
#include "dat.h"
#include "fns.h"
-#ifndef ODIRECT
-#define ODIRECT 0
-#endif
void
usage(void)
(DIR) diff --git a/src/cmd/venti/srv/mkfile b/src/cmd/venti/srv/mkfile
t@@ -90,6 +90,10 @@ ainstall:V: ${TARG:%=%.ainstall}
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
t@@ -101,20 +105,21 @@ test:VQ: ${TARG:%=o.%}
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
t@@ -132,7 +137,7 @@ test:VQ: ${TARG:%=o.%}
;;
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
(DIR) diff --git a/src/cmd/venti/srv/sortientry.c b/src/cmd/venti/srv/sortientry.c
t@@ -191,7 +191,7 @@ initiebucks(Part *part, int bits, u32int size)
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);
t@@ -292,7 +292,7 @@ sortiebuck(IEBucks *ib, int b)
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;
}
t@@ -361,7 +361,7 @@ readiebuck(IEBucks *ib, int b)
// 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;
}
(DIR) diff --git a/src/cmd/venti/srv/syncindex.c b/src/cmd/venti/srv/syncindex.c
t@@ -45,6 +45,7 @@ threadmain(int argc, char *argv[])
if(argc != 1)
usage();
+ ventifmtinstall();
if(initventi(argv[0], &conf) < 0)
sysfatal("can't init venti: %r");
(DIR) diff --git a/src/cmd/venti/srv/zblock.c b/src/cmd/venti/srv/zblock.c
t@@ -14,7 +14,7 @@ fmtzbinit(Fmt *f, ZBlock *b)
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";