Less or better chatter.

Russ Cox committed 21 years ago

Commit d920d421 parent 74d480c2 files · +16 −32Browse files

Unified · Split

2 files

 {
 	char buf[ERRMAX], ebuf[ERRMAX];
 	Fsrpc *r;
-	int n;
+	int i, n;
 	char *dbfile, *srv, *file;
 	ulong initial;
 		DEBUG(DFD, "read9p...");
 		n = read9pmsg(netfd, r->buf, messagesize);
 		if(n <= 0)
-			fatal(nil);
+			fatal("eof: n=%d %r", n);
-		if(convM2S(r->buf, n, &r->work) == 0)
+		if(convM2S(r->buf, n, &r->work) == 0){
+			iprint("convM2S %d byte message\n", n);
+			for(i=0; i<n; i++){
+				iprint(" %.2ux", r->buf[i]);
+				if(i%16 == 15)
+					iprint("\n");
+			}
+			if(i%16)
+				iprint("\n");
 			fatal("convM2S format error");
+		}
+//iprint("<- %F\n", &r->work);
 		DEBUG(DFD, "%F\n", &r->work);
 		(fcalls[r->work.type])(r);
 	}
 	else
 		t->type = r->type + 1;
+//iprint("-> %F\n", t);
 	DEBUG(DFD, "\t%F\n", t);
 	data = malloc(messagesize);	/* not mallocz; no need to clear */
 		fatal(Enomem);
 	n = convS2M(t, data, messagesize);
 	if((m=write(netfd, data, n))!=n){
-		fprint(2, "wrote %d got %d (%r)\n", n, m);
+		iprint("wrote %d got %d (%r)\n", n, m);
 		fatal("write");
 	}
 	free(data);

@@ -147,33 +147,6 @@ putstrn0(char *str, int n, int usewrite) · 146 unmodified lines
147	qiwrite(kprintoq, str, n);	147	qiwrite(kprintoq, str, n);
148	}else if(screenputs != nil)	148	}else if(screenputs != nil)
149	screenputs(str, n);	149	screenputs(str, n);
150
151	if(serialoq == nil){
152	uartputs(str, n);
153	return;
154	}
155
156	while(n > 0) {
157	t = memchr(str, '\n', n);
158	if(t && !kbd.raw) {
159	m = t-str;
160	if(usewrite){
161	qwrite(serialoq, str, m);
162	qwrite(serialoq, "\r\n", 2);
163	} else {
164	qiwrite(serialoq, str, m);
165	qiwrite(serialoq, "\r\n", 2);
166	}
167	n -= m+1;
168	str = t+1;
169	} else {
170	if(usewrite)
171	qwrite(serialoq, str, n);
172	else
173	qiwrite(serialoq, str, n);
174	break;
175	}
176	}
177	}	150	}
178		151
179	void	152	void

Keyboard shortcuts