From 4efc7582a255439a574f577272d8be11f6491fe4 Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
Date: Mon, 3 Feb 2025 23:03:03 -0700
Subject: lib9p: Separate the srv config from the main config
---
cmd/sbc_harness/config/config.h | 16 ++++++++--------
cmd/sbc_harness/main.c | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'cmd/sbc_harness')
diff --git a/cmd/sbc_harness/config/config.h b/cmd/sbc_harness/config/config.h
index 309fac1..3a777f5 100644
--- a/cmd/sbc_harness/config/config.h
+++ b/cmd/sbc_harness/config/config.h
@@ -56,9 +56,9 @@
* struct padding, (2) nul-terminator byes for strings.
*/
#define CONFIG_9P_MAX_HOSTMSG_SIZE CONFIG_9P_MAX_MSG_SIZE+16
-#define CONFIG_9P_MAX_FIDS 16
-#define CONFIG_9P_MAX_REQS 2
#define CONFIG_9P_MAX_ERR_SIZE 128 /* 128 is what Plan 9 4e uses */
+#define CONFIG_9P_SRV_MAX_FIDS 16
+#define CONFIG_9P_SRV_MAX_REQS 2
#define CONFIG_9P_ENABLE_9P2000 1 /* bool */
#define CONFIG_9P_ENABLE_9P2000_u 1 /* bool */
#define CONFIG_9P_ENABLE_9P2000_e 0 /* bool */
@@ -94,11 +94,11 @@
#define CONFIG_COROUTINE_GDB 1 /* bool */
#define _CONFIG_9P_NUM_SOCKS 7
-#define CONFIG_COROUTINE_NUM ( \
- 1 /* usb_common */ + \
- 1 /* usb_keyboard */ + \
- CONFIG_W5500_NUM /* irq handler */ + \
- _CONFIG_9P_NUM_SOCKS /* 9P accept()+read() */ + \
- (CONFIG_9P_MAX_REQS*_CONFIG_9P_NUM_SOCKS) /* 9P work+write() */ )
+#define CONFIG_COROUTINE_NUM ( \
+ 1 /* usb_common */ + \
+ 1 /* usb_keyboard */ + \
+ CONFIG_W5500_NUM /* irq handler */ + \
+ _CONFIG_9P_NUM_SOCKS /* 9P accept()+read() */ + \
+ (CONFIG_9P_SRV_MAX_REQS*_CONFIG_9P_NUM_SOCKS) /* 9P work+write() */ )
#endif /* _CONFIG_H_ */
diff --git a/cmd/sbc_harness/main.c b/cmd/sbc_harness/main.c
index 00f1c4a..b17725d 100644
--- a/cmd/sbc_harness/main.c
+++ b/cmd/sbc_harness/main.c
@@ -1,6 +1,6 @@
/* sbc_harness/main.c - Main entry point and event loop for sbc-harness
*
- * Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com>
+ * Copyright (C) 2024-2025 Luke T. Shumaker <lukeshu@lukeshu.com>
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
@@ -68,7 +68,7 @@ static COROUTINE read9p_cr(void *) {
}
const char *hexdig = "0123456789ABCDEF";
-static_assert(CONFIG_9P_MAX_REQS*_CONFIG_9P_NUM_SOCKS <= 16);
+static_assert(CONFIG_9P_SRV_MAX_REQS*_CONFIG_9P_NUM_SOCKS <= 16);
COROUTINE init_cr(void *) {
cr_begin();
@@ -122,7 +122,7 @@ COROUTINE init_cr(void *) {
char name[] = {'r', 'e', 'a', 'd', '-', hexdig[i], '\0'};
coroutine_add(name, read9p_cr, NULL);
}
- for (int i = 0; i < CONFIG_9P_MAX_REQS*_CONFIG_9P_NUM_SOCKS; i++) {
+ for (int i = 0; i < CONFIG_9P_SRV_MAX_REQS*_CONFIG_9P_NUM_SOCKS; i++) {
char name[] = {'w', 'r', 'i', 't', 'e', '-', hexdig[i], '\0'};
coroutine_add(name, lib9p_srv_write_cr, &globals.srv);
}
--
cgit v1.2.3-2-g168b
From a25ab8432dcf15d7d43adbc429a7cd9b493b3d91 Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
Date: Tue, 4 Feb 2025 08:57:14 -0700
Subject: lib9p: srv: Use a separate pathmap
---
cmd/sbc_harness/config/config.h | 1 +
1 file changed, 1 insertion(+)
(limited to 'cmd/sbc_harness')
diff --git a/cmd/sbc_harness/config/config.h b/cmd/sbc_harness/config/config.h
index 3a777f5..fa3236c 100644
--- a/cmd/sbc_harness/config/config.h
+++ b/cmd/sbc_harness/config/config.h
@@ -59,6 +59,7 @@
#define CONFIG_9P_MAX_ERR_SIZE 128 /* 128 is what Plan 9 4e uses */
#define CONFIG_9P_SRV_MAX_FIDS 16
#define CONFIG_9P_SRV_MAX_REQS 2
+#define CONFIG_9P_SRV_MAX_DEPTH 3
#define CONFIG_9P_ENABLE_9P2000 1 /* bool */
#define CONFIG_9P_ENABLE_9P2000_u 1 /* bool */
#define CONFIG_9P_ENABLE_9P2000_e 0 /* bool */
--
cgit v1.2.3-2-g168b