remove venti for now

1 files changed, 0 insertions, 332 deletions

diff --git a/src/cmd/venti/sortientry.c b/src/cmd/venti/sortientry.c
deleted file mode 100644
index 0e9f4b1e..00000000
--- a/src/cmd/venti/sortientry.c
+++ /dev/null
@@ -1,332 +0,0 @@
-#include "stdinc.h"
-#include "dat.h"
-#include "fns.h"
-
-typedef struct IEBuck	IEBuck;
-typedef struct IEBucks	IEBucks;
-
-enum
-{
-	ClumpChunks	= 32*1024
-};
-
-struct IEBuck
-{
-	u32int	head;		/* head of chain of chunks on the disk */
-	u32int	used;		/* usage of the last chunk */
-	u64int	total;		/* total number of bytes in this bucket */
-	u8int	*buf;		/* chunk of entries for this bucket */
-};
-
-struct IEBucks
-{
-	Part	*part;
-	u64int	off;		/* offset for writing data in the partition */
-	u32int	chunks;		/* total chunks written to fd */
-	u64int	max;		/* max bytes entered in any one bucket */
-	int	bits;		/* number of bits in initial bucket sort */
-	int	nbucks;		/* 1 << bits, the number of buckets */
-	u32int	size;		/* bytes in each of the buckets chunks */
-	u32int	usable;		/* amount usable for IEntry data */
-	u8int	*buf;		/* buffer for all chunks */
-	IEBuck	*bucks;
-};
-
-#define	U32GET(p)	(((p)[0]<<24)|((p)[1]<<16)|((p)[2]<<8)|(p)[3])
-#define	U32PUT(p,v)	(p)[0]=(v)>>24;(p)[1]=(v)>>16;(p)[2]=(v)>>8;(p)[3]=(v)
-
-static IEBucks	*initiebucks(Part *part, int bits, u32int size);
-static int	flushiebuck(IEBucks *ib, int b, int reset);
-static int	flushiebucks(IEBucks *ib);
-static u32int	sortiebuck(IEBucks *ib, int b);
-static u64int	sortiebucks(IEBucks *ib);
-static int	sprayientry(IEBucks *ib, IEntry *ie);
-static u32int	readarenainfo(IEBucks *ib, Arena *arena, u64int a);
-static u32int	readiebuck(IEBucks *ib, int b);
-static void	freeiebucks(IEBucks *ib);
-
-/*
- * build a sorted file with all Ientries which should be in ix.
- * assumes the arenas' directories are up to date.
- * reads each, converts the entries to index entries,
- * and sorts them.
- */
-u64int
-sortrawientries(Index *ix, Part *tmp, u64int *base)
-{
-	IEBucks *ib;
-	u64int clumps, sorted;
-	u32int n;
-	int i, ok;
-
-//ZZZ should allow configuration of bits, bucket size
-	ib = initiebucks(tmp, 8, 64*1024);
-	if(ib == nil){
-		seterr(EOk, "can't create sorting buckets: %r");
-		return TWID64;
-	}
-	ok = 0;
-	clumps = 0;
-	for(i = 0; i < ix->narenas; i++){
-		n = readarenainfo(ib, ix->arenas[i], ix->amap[i].start);
-		if(n == TWID32){
-			ok = -1;
-			break;
-		}
-		clumps += n;
-	}
-fprint(2, "got %lld clumps - starting sort\n", clumps);
-	if(ok){
-		sorted = sortiebucks(ib);
-		*base = (u64int)ib->chunks * ib->size;
-		if(sorted != clumps){
-			fprint(2, "sorting messed up: clumps=%lld sorted=%lld\n", clumps, sorted);
-			ok = -1;
-		}
-	}
-	freeiebucks(ib);
-	if(ok < 0)
-		return TWID64;
-	return clumps;
-}
-
-/*
- * read in all of the arena's clump directory,
- * convert to IEntry format, and bucket sort based
- * on the first few bits.
- */
-static u32int
-readarenainfo(IEBucks *ib, Arena *arena, u64int a)
-{
-	IEntry ie;
-	ClumpInfo *ci, *cis;
-	u32int clump;
-	int i, n, ok;
-
-//ZZZ remove fprint?
-	if(arena->clumps)
-		fprint(2, "reading directory for arena=%s with %d entries\n", arena->name, arena->clumps);
-
-	cis = MKN(ClumpInfo, ClumpChunks);
-	ok = 0;
-	memset(&ie, 0, sizeof(IEntry));
-	for(clump = 0; clump < arena->clumps; clump += n){
-		n = ClumpChunks;
-		if(n > arena->clumps - clump)
-			n = arena->clumps - clump;
-		if(readclumpinfos(arena, clump, cis, n) != n){
-			seterr(EOk, "arena directory read failed: %r");
-			ok = -1;
-			break;
-		}
-
-		for(i = 0; i < n; i++){
-			ci = &cis[i];
-			ie.ia.type = ci->type;
-			ie.ia.size = ci->uncsize;
-			ie.ia.addr = a;
-			a += ci->size + ClumpSize;
-			ie.ia.blocks = (ci->size + ClumpSize + (1 << ABlockLog) - 1) >> ABlockLog;
-			scorecp(ie.score, ci->score);
-			sprayientry(ib, &ie);
-		}
-	}
-	free(cis);
-	if(ok < 0)
-		return TWID32;
-	return clump;
-}
-
-/*
- * initialize the external bucket sorting data structures
- */
-static IEBucks*
-initiebucks(Part *part, int bits, u32int size)
-{
-	IEBucks *ib;
-	int i;
-
-	ib = MKZ(IEBucks);
-	if(ib == nil){
-		seterr(EOk, "out of memory");
-		return nil;
-	}
-	ib->bits = bits;
-	ib->nbucks = 1 << bits;
-	ib->size = size;
-	ib->usable = (size - U32Size) / IEntrySize * IEntrySize;
-	ib->bucks = MKNZ(IEBuck, ib->nbucks);
-	if(ib->bucks == nil){
-		seterr(EOk, "out of memory allocation sorting buckets");
-		freeiebucks(ib);
-		return nil;
-	}
-	ib->buf = MKN(u8int, size * (1 << bits));
-	if(ib->buf == nil){
-		seterr(EOk, "out of memory allocating sorting buckets' buffers");
-		freeiebucks(ib);
-		return nil;
-	}
-	for(i = 0; i < ib->nbucks; i++){
-		ib->bucks[i].head = TWID32;
-		ib->bucks[i].buf = &ib->buf[i * size];
-	}
-	ib->part = part;
-	return ib;
-}
-
-static void
-freeiebucks(IEBucks *ib)
-{
-	if(ib == nil)
-		return;
-	free(ib->bucks);
-	free(ib->buf);
-	free(ib);
-}
-
-/*
- * initial sort: put the entry into the correct bucket
- */
-static int
-sprayientry(IEBucks *ib, IEntry *ie)
-{
-	u32int n;
-	int b;
-
-	b = hashbits(ie->score, ib->bits);
-	n = ib->bucks[b].used;
-	packientry(ie, &ib->bucks[b].buf[n]);
-	n += IEntrySize;
-	ib->bucks[b].used = n;
-	if(n + IEntrySize <= ib->usable)
-		return 0;
-	return flushiebuck(ib, b, 1);
-}
-
-/*
- * finish sorting:
- * for each bucket, read it in and sort it
- * write out the the final file
- */
-static u64int
-sortiebucks(IEBucks *ib)
-{
-	u64int tot;
-	u32int n;
-	int i;
-
-	if(flushiebucks(ib) < 0)
-		return TWID64;
-	for(i = 0; i < ib->nbucks; i++)
-		ib->bucks[i].buf = nil;
-	ib->off = (u64int)ib->chunks * ib->size;
-	free(ib->buf);
-fprint(2, "ib->max = %lld\n", ib->max);
-fprint(2, "ib->chunks = %ud\n", ib->chunks);
-	ib->buf = MKN(u8int, ib->max + U32Size);
-	if(ib->buf == nil){
-		seterr(EOk, "out of memory allocating final sorting buffer; try more buckets");
-		return TWID64;
-	}
-	tot = 0;
-	for(i = 0; i < ib->nbucks; i++){
-		n = sortiebuck(ib, i);
-		if(n == TWID32)
-			return TWID64;
-		tot += n;
-	}
-	return tot;
-	return 0;
-}
-
-/*
- * sort from bucket b of ib into the output file to
- */
-static u32int
-sortiebuck(IEBucks *ib, int b)
-{
-	u32int n;
-
-	n = readiebuck(ib, b);
-	if(n == TWID32)
-		return TWID32;
-	qsort(ib->buf, n, IEntrySize, ientrycmp);
-	if(writepart(ib->part, ib->off, ib->buf, n * IEntrySize) < 0){
-		seterr(EOk, "can't write sorted bucket: %r");
-		return TWID32;
-	}
-	ib->off += n * IEntrySize;
-	return n;
-}
-
-/*
- * write out a single bucket
- */
-static int
-flushiebuck(IEBucks *ib, int b, int reset)
-{
-	u32int n;
-
-	if(ib->bucks[b].used == 0)
-		return 0;
-	n = ib->bucks[b].used;
-	U32PUT(&ib->bucks[b].buf[n], ib->bucks[b].head);
-	n += U32Size;
-	if(writepart(ib->part, (u64int)ib->chunks * ib->size, ib->bucks[b].buf, n) < 0){
-		seterr(EOk, "can't write sorting bucket to file: %r");
-		return -1;
-	}
-	ib->bucks[b].head = ib->chunks++;
-	ib->bucks[b].total += ib->bucks[b].used;
-	if(reset)
-		ib->bucks[b].used = 0;
-	return 0;
-}
-
-/*
- * write out all of the buckets, and compute
- * the maximum size of any bucket
- */
-static int
-flushiebucks(IEBucks *ib)
-{
-	int i;
-
-	for(i = 0; i < ib->nbucks; i++){
-		if(flushiebuck(ib, i, 0) < 0)
-			return -1;
-		if(ib->bucks[i].total > ib->max)
-			ib->max = ib->bucks[i].total;
-	}
-	return 0;
-}
-
-/*
- * read in the chained buffers for bucket b,
- * and return it's total number of IEntries
- */
-static u32int
-readiebuck(IEBucks *ib, int b)
-{
-	u32int head, n, m;
-
-	head = ib->bucks[b].head;
-	n = 0;
-	m = ib->bucks[b].used;
-	if(m == 0)
-		m = ib->usable;
-fprint(2, "%d total = %lld\n", b, ib->bucks[b].total);
-	while(head != TWID32){
-		if(readpart(ib->part, (u64int)head * ib->size, &ib->buf[n], m + U32Size) < 0){
-fprint(2, "n = %ud\n", n);
-			seterr(EOk, "can't read index sort bucket: %r");
-			return TWID32;
-		}
-		n += m;
-		head = U32GET(&ib->buf[n]);
-		m = ib->usable;
-	}
-fprint(2, "n = %ud\n", n);
-	return n / IEntrySize;
-}