Merge branch 'lukeshu/9p-tests'

1 files changed, 47 insertions, 16 deletions

diff --git a/lib9p/tests/test_server/main.c b/lib9p/tests/test_server/main.c
index 8d22a04..2743629 100644
--- a/lib9p/tests/test_server/main.c
+++ b/lib9p/tests/test_server/main.c
@@ -5,6 +5,8 @@
  */
 
 #include <error.h>
+#include <errno.h>
+#include <stdio.h>
 #include <stdlib.h> /* for atoi() */
 
 #include <lib9p/srv.h>
@@ -18,6 +20,7 @@
 
 #include "static.h"
 #include "fs_shutdown.h"
+#include "fs_slowread.h"
 
 /* configuration **************************************************************/
 
@@ -37,6 +40,7 @@ struct {
 	uint16_t                        port;
 	struct hostnet_tcp_listener     listeners[CONFIG_SRV9P_NUM_CONNS];
 	struct lib9p_srv                srv;
+	FILE                           *logstream;
 } globals = {
 	.srv = (struct lib9p_srv){
 		.rootdir = get_root,
@@ -45,32 +49,33 @@ struct {
 
 /* file tree ******************************************************************/
 
-enum { PATH_BASE = __COUNTER__ };
-#define PATH_COUNTER __COUNTER__ - PATH_BASE
-
-#define STATIC_FILE(STRNAME, SYMNAME)                                      \
-	UTIL9P_STATIC_FILE(PATH_COUNTER, STRNAME,                          \
+#define STATIC_FILE(N, STRNAME, SYMNAME)                                   \
+	UTIL9P_STATIC_FILE(N, STRNAME,                                     \
 	                   .data_start = _binary_static_##SYMNAME##_start, \
 	                   .data_end   = _binary_static_##SYMNAME##_end)
-#define STATIC_DIR(STRNAME, ...)  \
-	UTIL9P_STATIC_DIR(PATH_COUNTER, STRNAME, __VA_ARGS__)
+#define STATIC_DIR(N, STRNAME, ...) \
+	UTIL9P_STATIC_DIR(N, STRNAME, __VA_ARGS__)
 
-#define API_FILE(STRNAME, SYMNAME, ...)                                      \
+#define API_FILE(N, STRNAME, SYMNAME, ...)                                   \
 	lo_box_##SYMNAME##_file_as_lib9p_srv_file(&((struct SYMNAME##_file){ \
 		.name = STRNAME,                                             \
-		.pathnum = PATH_COUNTER                                      \
+		.pathnum = N                                                 \
 		__VA_OPT__(,) __VA_ARGS__                                    \
 	}))
 
 struct lib9p_srv_file root =
-		STATIC_DIR("",
-		           STATIC_DIR("Documentation",
-		                      STATIC_FILE("x", Documentation_x_txt),
+		STATIC_DIR(1, "",
+		           STATIC_DIR(2, "Documentation",
+		                      STATIC_FILE(3, "x", Documentation_x_txt),
 		                      ),
-		           STATIC_FILE("README.md", README_md),
-		           API_FILE("shutdown", shutdown,
+		           STATIC_FILE(4, "README.md", README_md),
+		           API_FILE(5, "shutdown", shutdown,
 		                   .listeners = globals.listeners,
 		                   .nlisteners = LM_ARRAY_LEN(globals.listeners)),
+		           API_FILE(6, "slowread", slowread,
+		                    .flushable = false),
+		           API_FILE(7, "slowread-flushable", slowread,
+		                    .flushable = true),
 		           );
 
 static lo_interface lib9p_srv_file get_root(struct lib9p_srv_ctx *LM_UNUSED(ctx), struct lib9p_s LM_UNUSED(treename)) {
@@ -109,15 +114,41 @@ static COROUTINE init_cr(void *) {
 	cr_exit();
 }
 
+static void log_fct(char character, void *_stream) {
+	FILE *stream = _stream;
+	putc(character, stream);
+	putchar(character);
+}
+
+static void log_msg(struct lib9p_srv_ctx *ctx, enum lib9p_msg_type typ, void *hostmsg) {
+	/* It sucks that %v trips -Wformat and -Wformat-extra-args
+	 * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47781 */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
+	fmt_fctprintf(log_fct, globals.logstream,
+	              "%c %v\n", typ % 2 ? '<' : '>',
+	              lo_box_lib9p_msg_as_fmt_formatter(&ctx->basectx, typ, hostmsg));
+#pragma GCC diagnostic pop
+	fflush(globals.logstream);
+}
+
 int main(int argc, char *argv[]) {
-	if (argc != 2)
-		error(2, 0, "usage: %s PORT_NUMBER", argv[0]);
+	if (argc != 3)
+		error(2, 0, "usage: %s PORT_NUMBER LOGFILE", argv[0]);
+
 	globals.port = atoi(argv[1]);
+	globals.logstream = fopen(argv[2], "w");
+	if (!globals.logstream)
+		error(2, errno, "fopen");
+	globals.srv.msglog = log_msg;
+
 	struct hostclock clock_monotonic = {
 		.clock_id = CLOCK_MONOTONIC,
 	};
 	bootclock = lo_box_hostclock_as_alarmclock(&clock_monotonic);
 	coroutine_add("init", init_cr, NULL);
 	coroutine_main();
+	fclose(globals.logstream);
 	return 0;
 }