shithub: neoventi

Info  •  Files  •  Log  •  Branches

cache clean

--- a/cache.c

+++ b/cache.c

@@ -18,10 +18,10 @@

 static Lock freelock;

 #define NENTRIES 8

-#define ENTRIES 0x80000

+#define ENTRIES 0x40000

 // Oversizes, but ensures power-of-two for fibonacci hashing

 #define BUCKETS (ENTRIES/8)

-#define BITS 48

+#define BITS 64-15

 void

 cacheinit(void)

@@ -32,7 +32,6 @@

 	data = sbrk((usize)0x2000 * ENTRIES);

 	if(data == (void*)-1)

 		sysfatal("failed to allocate cache space of %lux", 8192*ENTRIES/2);

-	print("data %llx, end %llx\n", data, data + 8192*ENTRIES);

 	buckets = sbrk(64 + 64*BUCKETS);

 	freelist = sbrk(4 * ENTRIES);

 	displacement = ((usize)buckets & 0b111111);

@@ -89,9 +88,6 @@

 {

 	usize cacheindex = bucket->values[i*3] | (bucket->values[i*3+1]<<8) | (bucket->values[i*3+2]<<16);

 	*buf = data + cacheindex * 8192;

-	if(*buf == (void*)0x7fffdfff){

-		print("data %llx, cacheindex %lld, data+cacheindex*0x2000 %llx\n", data, cacheindex, data+cacheindex*0x2000);

-	}

 }

 static int

@@ -127,9 +123,6 @@

 			// found an empty slot

 			cacheindex = grabfree();

 			*buf = data+(usize)cacheindex*8192;

-	if(*buf == (void*)0x7fffdfff){

-		print("data %llx, cacheindex %lld, data+cacheindex*0x2000 %llx\n", data, cacheindex, data+cacheindex*0x2000);

-	}

 			put(bucket, i, key, cacheindex);

 			return 0;

 		case 1: