diff options
| author | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-02-03 23:03:03 -0700 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-02-09 17:28:22 -0700 |
| commit | 4efc7582a255439a574f577272d8be11f6491fe4 (patch) | |
| tree | 325f1bad5a67d5731a35ac18867f854cfe9f4a41 /lib9p | |
| parent | 5c373cfe544df4ddba44adf3f6b60399340e4bd5 (diff) | |
lib9p: Separate the srv config from the main config
Diffstat (limited to 'lib9p')
| -rw-r--r-- | lib9p/internal.h | 6 | ||||
| -rw-r--r-- | lib9p/srv.c | 12 | ||||
| -rw-r--r-- | lib9p/tests/test_server/config/config.h | 13 |
3 files changed, 17 insertions, 14 deletions
diff --git a/lib9p/internal.h b/lib9p/internal.h index eb67992..d939d46 100644 --- a/lib9p/internal.h +++ b/lib9p/internal.h @@ -28,12 +28,6 @@ #ifndef CONFIG_9P_MAX_HOSTMSG_SIZE #error config.h must define CONFIG_9P_MAX_HOSTMSG_SIZE #endif -#ifndef CONFIG_9P_MAX_FIDS - #error config.h must define CONFIG_9P_MAX_FIDS -#endif -#ifndef CONFIG_9P_MAX_REQS - #error config.h must define CONFIG_9P_MAX_REQS -#endif #ifndef CONFIG_9P_MAX_ERR_SIZE #error config.h must define CONFIG_9P_MAX_ERR_SIZE #endif diff --git a/lib9p/srv.c b/lib9p/srv.c index 10a8a96..06117b8 100644 --- a/lib9p/srv.c +++ b/lib9p/srv.c @@ -20,8 +20,16 @@ #define IMPLEMENTATION_FOR_LIB9P_SRV_H YES #include <lib9p/srv.h> + #include "internal.h" +#ifndef CONFIG_9P_SRV_MAX_FIDS + #error config.h must define CONFIG_9P_SRV_MAX_FIDS +#endif +#ifndef CONFIG_9P_SRV_MAX_REQS + #error config.h must define CONFIG_9P_SRV_MAX_REQS +#endif + /* context ********************************************************************/ bool lib9p_srv_flush_requested(struct lib9p_srv_ctx *ctx) { @@ -55,13 +63,13 @@ struct _srv_fidinfo { #define NAME fidmap #define KEY_T lib9p_fid_t #define VAL_T struct _srv_fidinfo -#define CAP CONFIG_9P_MAX_FIDS +#define CAP CONFIG_9P_SRV_MAX_FIDS #include "map.h" #define NAME reqmap #define KEY_T lib9p_tag_t #define VAL_T struct _lib9p_srv_req * -#define CAP CONFIG_9P_MAX_REQS +#define CAP CONFIG_9P_SRV_MAX_REQS #include "map.h" /* The hierarchy of concepts is: diff --git a/lib9p/tests/test_server/config/config.h b/lib9p/tests/test_server/config/config.h index e4036d6..ffd549b 100644 --- a/lib9p/tests/test_server/config/config.h +++ b/lib9p/tests/test_server/config/config.h @@ -36,9 +36,9 @@ * struct padding, (2) array pointers. */ #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 */ @@ -54,9 +54,10 @@ #define CONFIG_COROUTINE_DEBUG 0 /* bool */ #define CONFIG_COROUTINE_VALGRIND 1 /* bool */ #define CONFIG_COROUTINE_GDB 1 /* bool */ -#define CONFIG_COROUTINE_NUM (1 /* usb_common */ +\ - 1 /* usb_keyboard */ +\ - CONFIG_SRV9P_NUM_CONNS /* accept+read */ +\ - (CONFIG_9P_MAX_REQS*CONFIG_SRV9P_NUM_CONNS) /* work+write */ ) +#define CONFIG_COROUTINE_NUM ( \ + 1 /* usb_common */ + \ + 1 /* usb_keyboard */ + \ + CONFIG_SRV9P_NUM_CONNS /* accept+read */ + \ + (CONFIG_9P_SRV_MAX_REQS*CONFIG_SRV9P_NUM_CONNS) /* work+write */ ) #endif /* _CONFIG_H_ */ |