lib9p_srv: Re-think flush semantics

1 files changed, 39 insertions, 6 deletions

diff --git a/lib9p/tests/testclient-sess.c b/lib9p/tests/testclient-sess.c
index ded70d1..561c0c9 100644
--- a/lib9p/tests/testclient-sess.c
+++ b/lib9p/tests/testclient-sess.c
@@ -170,29 +170,62 @@ int main(int argc, char *argv[]) {
 	recv9p(); /* Rattach */
 
 	/* flush, but original response comes back first */
-	wname[0] = lib9p_str("slowread"); send9p(Twalk, .tag=0, .fid=0, .newfid=1, .nwname=1, .wname=wname);
+	wname[0] = lib9p_str("flush-read"); send9p(Twalk, .tag=0, .fid=0, .newfid=1, .nwname=1, .wname=wname);
 	recv9p(); /* Rwalk */
 	send9p(Topen, .tag=0, .fid=1, .mode=LIB9P_O_MODE_READ);
 	recv9p(); /* Ropen */
-	send9p(Tread, .tag=1, .fid=1, .offset=0, .count=6);
-	send9p(Tflush, .tag=2, .oldtag=1);
+	send9p(Tread, .tag=0, .fid=1, .offset=0, .count=10);
+	send9p(Tflush, .tag=1, .oldtag=0);
 	recv9p(); /* Rread */
 	recv9p(); /* Rflush */
 
 	/* flush, original request is aborted with error */
-	wname[0] = lib9p_str("slowread-flushable"); send9p(Twalk, .tag=1, .fid=0, .newfid=2, .nwname=1, .wname=wname);
+	wname[0] = lib9p_str("flush-error"); send9p(Twalk, .tag=0, .fid=0, .newfid=2, .nwname=1, .wname=wname);
 	recv9p(); /* Rwalk */
 	send9p(Topen, .tag=0, .fid=2, .mode=LIB9P_O_MODE_READ);
 	recv9p(); /* Ropen */
-	send9p(Tread, .tag=1, .fid=2, .offset=0, .count=6);
-	send9p(Tflush, .tag=2, .oldtag=1);
+	send9p(Tread, .tag=0, .fid=2, .offset=0, .count=10);
+	send9p(Tflush, .tag=1, .oldtag=0);
 	recv9p(); /* Rerror */
 	recv9p(); /* Rflush */
 
+	/* flush, original request is aborted without error */
+	wname[0] = lib9p_str("flush-silent"); send9p(Twalk, .tag=0, .fid=0, .newfid=3, .nwname=1, .wname=wname);
+	recv9p(); /* Rwalk */
+	send9p(Topen, .tag=0, .fid=3, .mode=LIB9P_O_MODE_READ);
+	recv9p(); /* Ropen */
+	send9p(Tread, .tag=0, .fid=3, .offset=0, .count=10);
+	send9p(Tflush, .tag=1, .oldtag=0);
+	recv9p(); /* Rflush */
+
+	/* multiflush, original request is aborted without error */
+	wname[0] = lib9p_str("flush-slowsilent"); send9p(Twalk, .tag=0, .fid=0, .newfid=4, .nwname=1, .wname=wname);
+	recv9p(); /* Rwalk */
+	send9p(Topen, .tag=0, .fid=4, .mode=LIB9P_O_MODE_READ);
+	recv9p(); /* Ropen */
+	send9p(Tread, .tag=0, .fid=4, .offset=0, .count=10);
+	send9p(Tflush, .tag=1, .oldtag=0);
+	send9p(Tflush, .tag=2, .oldtag=0);
+	recv9p(); /* Rflush */
+
+	/* flush, but flush is flushed */
+	wname[0] = lib9p_str("flush-slowread"); send9p(Twalk, .tag=0, .fid=0, .newfid=5, .nwname=1, .wname=wname);
+	recv9p(); /* Rwalk */
+	send9p(Topen, .tag=0, .fid=5, .mode=LIB9P_O_MODE_READ);
+	recv9p(); /* Ropen */
+	send9p(Tread, .tag=0, .fid=5, .offset=0, .count=10);
+	send9p(Tflush, .tag=1, .oldtag=0);
+	send9p(Tflush, .tag=2, .oldtag=1);
+	recv9p(); /* Rflush */
+	recv9p(); /* Rread */
+
 	/* flush, unknown tag */
 	send9p(Tflush, .tag=0, .oldtag=99);
 	recv9p(); /* Rflush */
 
+	/* flushed by Tversion */
+	send9p(Tread, .tag=0, .fid=3, .offset=0, .count=10);
+
 	/* shutdown ***********************************************************/
 	send9p(Tversion, .tag=0, .max_msg_size=(8*1024), .version=lib9p_str("9P2000"));
 	recv9p(); /* Rversion */