lib9p: srv: Use libobj instead of vcall.h

1 files changed, 51 insertions, 44 deletions

diff --git a/lib9p/include/lib9p/srv.h b/lib9p/include/lib9p/srv.h
index 0fc9011..83aabc0 100644
--- a/lib9p/include/lib9p/srv.h
+++ b/lib9p/include/lib9p/srv.h
@@ -11,7 +11,9 @@
 #include <libcr_ipc/rpc.h>
 #include <libcr_ipc/chan.h>
 #include <libhw/generic/net.h>
+#include <libmisc/assert.h>
 #include <libmisc/private.h>
+#include <libobj/obj.h>
 
 #include <lib9p/9p.h>
 
@@ -35,48 +37,53 @@ int lib9p_srv_acknowledge_flush(struct lib9p_srv_ctx *ctx);
 
 /* interface definitions ******************************************************/
 
-struct lib9p_srv_file_vtable;
-
-typedef struct {
-	struct lib9p_srv_file_vtable    *vtable;
-} implements_lib9p_srv_file;
-
-struct lib9p_srv_file_vtable {
-	/* all - resource management */
-	void                       (*free   )(implements_lib9p_srv_file *); /* must not error */
-	struct lib9p_qid           (*qid    )(implements_lib9p_srv_file *); /* must not error */
-	uint32_t                   (*chio   )(implements_lib9p_srv_file *, struct lib9p_srv_ctx *,
-	                                      bool rd, bool wr, bool trunc);
-
-	/* all - syscalls */
-	struct lib9p_stat          (*stat   )(implements_lib9p_srv_file *, struct lib9p_srv_ctx *);
-	void                       (*wstat  )(implements_lib9p_srv_file *, struct lib9p_srv_ctx *,
-	                                      struct lib9p_stat new);
-	void                       (*remove )(implements_lib9p_srv_file *, struct lib9p_srv_ctx *);
-
-	/* directories - base */
-	implements_lib9p_srv_file *(*dopen  )(implements_lib9p_srv_file *, struct lib9p_srv_ctx *,
-	                                      struct lib9p_s childname);
-	implements_lib9p_srv_file *(*dcreate)(implements_lib9p_srv_file *, struct lib9p_srv_ctx *,
-	                                      struct lib9p_s childname,
-	                                      lib9p_dm_t perm, lib9p_o_t flags);
-
-	/* directories - once opened */
-	size_t /* <- obj cnt */    (*dread  )(implements_lib9p_srv_file *, struct lib9p_srv_ctx *,
-	                                      uint8_t *buf,
-	                                      uint32_t byte_count, /* <- num bytes */
-	                                      size_t obj_offset); /* <- starting at this object */
-
-	/* non-directories - once opened */
-	uint32_t                   (*pread  )(implements_lib9p_srv_file *, struct lib9p_srv_ctx *,
-	                                      void *buf,
-	                                      uint32_t byte_count,
-	                                      uint64_t byte_offset);
-	uint32_t                   (*pwrite )(implements_lib9p_srv_file *, struct lib9p_srv_ctx *,
-	                                      void *buf,
-	                                      uint32_t byte_count,
-	                                      uint64_t byte_offset);
-};
+#define lib9p_srv_file_LO_IFACE                                                 \
+	/* all - resource management */                                         \
+	LO_FUNC(void                       , free   ) /* must not error */      \
+	LO_FUNC(struct lib9p_qid           , qid    ) /* must not error */      \
+	LO_FUNC(uint32_t                   , chio   , struct lib9p_srv_ctx *,   \
+	                                              bool rd, bool wr,         \
+	                                              bool trunc)               \
+	                                                                        \
+	/* all - syscalls */                                                    \
+	LO_FUNC(struct lib9p_stat          , stat   , struct lib9p_srv_ctx *)   \
+	LO_FUNC(void                       , wstat  , struct lib9p_srv_ctx *,   \
+	                                              struct lib9p_stat new)    \
+	LO_FUNC(void                       , remove , struct lib9p_srv_ctx *)   \
+	                                                                        \
+	/* directories - base */                                                \
+	LO_FUNC(lo_interface lib9p_srv_file, dopen  , struct lib9p_srv_ctx *,   \
+	                                              struct lib9p_s childname) \
+	LO_FUNC(lo_interface lib9p_srv_file, dcreate, struct lib9p_srv_ctx *,   \
+	                                              struct lib9p_s childname, \
+	                                              lib9p_dm_t perm,          \
+	                                              lib9p_o_t flags)          \
+	                                                                        \
+	/* directories - once opened */                                         \
+	LO_FUNC(size_t /* <- obj cnt */    , dread  , struct lib9p_srv_ctx *,   \
+	                                              uint8_t *buf,             \
+	                           /* num bytes -> */ uint32_t byte_count,      \
+	             /* starting at this object -> */ size_t obj_offset)        \
+	                                                                        \
+	/* non-directories - once opened */                                     \
+	LO_FUNC(uint32_t                   , pread  , struct lib9p_srv_ctx *,   \
+	                                              void *buf,                \
+	                                              uint32_t byte_count,      \
+	                                              uint64_t byte_offset)     \
+	LO_FUNC(uint32_t                   , pwrite , struct lib9p_srv_ctx *,   \
+	                                              void *buf,                \
+	                                              uint32_t byte_count,      \
+	                                              uint64_t byte_offset)
+LO_INTERFACE(lib9p_srv_file)
+
+#define LIB9P_SRV_NOTDIR(TYP, NAM)                                                                                                                                       \
+	static lo_interface lib9p_srv_file NAM##_dopen  (TYP *, struct lib9p_srv_ctx *, struct lib9p_s)                        { assert_notreached("not a directory"); } \
+	static lo_interface lib9p_srv_file NAM##_dcreate(TYP *, struct lib9p_srv_ctx *, struct lib9p_s, lib9p_dm_t, lib9p_o_t) { assert_notreached("not a directory"); } \
+	static size_t                      NAM##_dread  (TYP *, struct lib9p_srv_ctx *, uint8_t *, uint32_t, size_t)           { assert_notreached("not a directory"); }
+
+#define LIB9P_SRV_NOTFILE(TYP, NAM) \
+	static uint32_t NAM##_pread (TYP *, struct lib9p_srv_ctx *, void *, uint32_t, uint64_t) { assert_notreached("not a file"); } \
+	static uint32_t NAM##_pwrite(TYP *, struct lib9p_srv_ctx *, void *, uint32_t, uint64_t) { assert_notreached("not a file"); }
 
 /* main server entrypoints ****************************************************/
 
@@ -84,8 +91,8 @@ CR_RPC_DECLARE(_lib9p_srv_reqch, struct _lib9p_srv_req *, bool)
 
 struct lib9p_srv {
 	/* Things you provide */
-	void /*TODO*/              (*auth   )(struct lib9p_srv_ctx *, struct lib9p_s treename); /* optional */
-	implements_lib9p_srv_file *(*rootdir)(struct lib9p_srv_ctx *, struct lib9p_s treename);
+	void /*TODO*/               (*auth   )(struct lib9p_srv_ctx *, struct lib9p_s treename); /* optional */
+	lo_interface lib9p_srv_file (*rootdir)(struct lib9p_srv_ctx *, struct lib9p_s treename);
 
 	/* For internal use */
 	BEGIN_PRIVATE(LIB9P_SRV_H)