shithub: neoventi

Info  •  Files  •  Log  •  Branches

cleanup

--- a/main.c

+++ b/main.c

@@ -29,7 +29,7 @@

 threadmain(int argc, char **argv)

 {

 	parseargs(argc, argv);

-	print("Initializing neoventi build 3... ");

+	print("Initializing neoventi build 4... ");

 	init();

 	validate();

 	print("initialized, launching server.\n");

--- a/mkfile

+++ b/mkfile

@@ -8,6 +8,9 @@

 </sys/src/cmd/mkone

+vac:VE: $O.out

+	vacfs -h tcp!127.1!14011 vac:4091f8b8aafc7b8a815f38534b70a171e4ae3e44

+

 run:VE: $O.out

 	./$O.out & pid=$apid

 	sleep 2

--- a/notebook

+++ b/notebook

@@ -396,6 +396,4 @@

 Caching / prefetching / some such system will definitely be needed to win on the read side - or, well, *probably* be needed. Parallelized readers might be sufficient, though that may require changes to libventi / vacfs / etc to enable multiple reads in flight at a time. But again, measure before designing.

-Worst case, neoventi's prototype has demonstrated that I _can_ do this, even if I have to change the design a bunch more. And, I kinda want to do the final implementation in Hare anyways.

-

-

+Worst case, neoventi's prototype has demonstrated that I _can_ do this, even if I have to change the design a bunch more. And, I kinda want to do the final implementation in Hare anyways. I'll need to set up a new neoventi for write testing, because testing it on the root drive would be moronic - I'd have to boot the "real" venti read-only for that, and I've no idea how fossil would handle that. That makes this as good a time as any to actually implement the config handling...

--- a/server.c

+++ b/server.c

@@ -4,6 +4,8 @@

 #include <thread.h>

 #include "neoventi.h"

+static void vtsend(VtConn conn, char *buf, u16int size, u8int tag, int drop);

+

 // Handles an error on `conn` handling client request `tbuf`

 // Only the tag must be preserved in the buffer

 static void

@@ -18,14 +20,10 @@

 	va_end(args);

 	if(tbuf != nil){

 		len = snprint(tbuf+6, 0x10000, "neoventi: %r");

-		tbuf[2] = VtRerror;

 		tbuf[4] = len >> 8;

 		tbuf[5] = len & 0xFF;

 		len += 4;

-		tbuf[0] = len >> 8;

-		tbuf[1] = len & 0xFF;

-		if(write(conn.fd, tbuf, len+2) != len+2)

-			fprint(2, "failed to report error: %r");

+		vtsend(conn, tbuf, len, VtRerror, 1);

 	}

 	longjmp(conn.bounce, 1);

 }

@@ -68,23 +66,33 @@

 }

 static void

+vtsend(VtConn conn, char *buf, u16int size, u8int tag, int drop)

+{

+	buf[0] = size>>8;

+	buf[1] = size&0xFF;

+	buf[2] = tag;

+	if(write(conn.fd, buf, size+2) != size+2){

+		if(drop)

+			fprint(2, "failed to submit error packet: %r\n");

+		else

+			vterr(conn, buf, "failed to write packet: %r");

+	}

+}

+

+static void

 vtread(VtConn conn, char *buf)

 {

 	u8int *score;

 	VtArena arena;

 	u64int addr;

-	u16int size;

 	u8int blocks;

+	u16int size;

 	score = (u8int*)buf + 4;

 	if(!vtreadlookup(score, &arena, &addr, &size, &blocks))

 		sysfatal("todo graceful read errors");

 	// Response: VtRread, msg tag, data

-	buf[0] = (size+2)>>8;

-	buf[1] = (size+2) & 0xFF;

-	buf[2] = VtRread;

 	readclump((uchar*)buf+4, arena, addr, blocks);

-	if(write(conn.fd, buf, size + 4) != size+4)

-		vterr(conn, buf, "failed to write data");

+	vtsend(conn, buf, size+2, VtRread, 0);

 }

 static int

@@ -113,12 +121,9 @@

 		vterr(conn, buf, "received message before hello: %d", buf[2]);

 	if(buf[4] != 0 || buf[5] != 2 || buf[6] != '0' || buf[7] != '2')

 		vterr(conn, buf, "unsupported protocol version requested in Thello: %d %d %d %d", buf[4], buf[5], buf[6], buf[7]);

-	buf[2] = VtRhello;

 	buf[6] = 'n';

 	buf[7] = 'o';

-	buf[1] = 8;

-	if(write(conn.fd, buf, 10) != 10)

-		vterr(conn, buf, "failed to rhello: %r");

+	vtsend(conn, buf, 8, VtRhello, 0);

 }

 typedef struct {