diff options
| -rw-r--r-- | lib9p/include/lib9p/srv.h | 19 | ||||
| -rw-r--r-- | lib9p/srv.c | 14 | ||||
| -rw-r--r-- | lib9p/tests/test_server/main.c | 4 | ||||
| -rw-r--r-- | lib9p_util/static.c | 14 |
4 files changed, 37 insertions, 14 deletions
diff --git a/lib9p/include/lib9p/srv.h b/lib9p/include/lib9p/srv.h index a714125..ff5ebdc 100644 --- a/lib9p/include/lib9p/srv.h +++ b/lib9p/include/lib9p/srv.h @@ -40,6 +40,12 @@ int lib9p_srv_acknowledge_flush(struct lib9p_srv_ctx *ctx); lo_interface lib9p_srv_fio; lo_interface lib9p_srv_dio; +/* FIXME: I don't like that the pointers returned by stat() and + * pread() have to remain live after they return. Perhaps a + * `respond()`-callback? But that just reads as gross in C. + * + * FIXME: It would be nice if pread() could return more than 1 iovec. + */ #define lib9p_srv_file_LO_IFACE \ /* resource management **********************************************/ \ \ @@ -90,16 +96,23 @@ LO_INTERFACE(lib9p_srv_file); LO_FUNC(struct lib9p_qid , qid ) \ LO_FUNC(void , iofree ) \ LO_FUNC(uint32_t , iounit ) \ - LO_FUNC(uint32_t , pread , struct lib9p_srv_ctx *, \ - void *buf, \ + LO_FUNC(void , pread , struct lib9p_srv_ctx *, \ uint32_t byte_count, \ - uint64_t byte_offset) \ + uint64_t byte_offset, \ + struct iovec *ret) \ LO_FUNC(uint32_t , pwrite , struct lib9p_srv_ctx *, \ void *buf, \ uint32_t byte_count, \ uint64_t byte_offset) LO_INTERFACE(lib9p_srv_fio); +/* FIXME: The dio interface just feels clunky. I'm not in a rush to + * change it because util9p_static_dir is already implemented and I + * don't anticipate the sbc-harness needing another dio + * implementation. But if I wanted lib9p to be used outside of + * sbc-harness, this is one of the first things that I'd want to + * change. + */ #define lib9p_srv_dio_LO_IFACE \ LO_FUNC(struct lib9p_qid , qid ) \ LO_FUNC(void , iofree ) \ diff --git a/lib9p/srv.c b/lib9p/srv.c index 9c679b6..50d0b78 100644 --- a/lib9p/srv.c +++ b/lib9p/srv.c @@ -950,7 +950,6 @@ static void handle_Tread(struct _lib9p_srv_req *ctx, /* Variables. */ struct srv_pathinfo *pathinfo = pathmap_load(&ctx->parent_sess->paths, fidinfo->path); assert(pathinfo); - resp->data = (char *)(&resp[1]); /* Do it. */ if (srv_util_pathisdir(pathinfo)) { @@ -967,6 +966,7 @@ static void handle_Tread(struct _lib9p_srv_req *ctx, return; } /* Do it. */ + resp->data = (char *)(&resp[1]); size_t num = LO_CALL(fidinfo->dir.io, dread, &ctx->ctx, (uint8_t *)resp->data, req->count, idx); /* Translate object-count back to byte-count. */ uint32_t len = 0; @@ -979,8 +979,16 @@ static void handle_Tread(struct _lib9p_srv_req *ctx, /* Remember. */ fidinfo->dir.idx = idx+num; fidinfo->dir.off = req->offset + len; - } else - resp->count = LO_CALL(fidinfo->file.io, pread, &ctx->ctx, resp->data, req->count, req->offset); + } else { + struct iovec iov; + LO_CALL(fidinfo->file.io, pread, &ctx->ctx, req->count, req->offset, &iov); + if (!lib9p_ctx_has_error(&ctx->ctx.basectx)) { + resp->count = iov.iov_len; + resp->data = iov.iov_base; + if (resp->count > req->count) + resp->count = req->count; + } + } } static void handle_Twrite(struct _lib9p_srv_req *ctx, diff --git a/lib9p/tests/test_server/main.c b/lib9p/tests/test_server/main.c index b993714..c759029 100644 --- a/lib9p/tests/test_server/main.c +++ b/lib9p/tests/test_server/main.c @@ -124,7 +124,9 @@ static uint32_t api_pwrite(struct api_file *self, struct lib9p_srv_ctx *ctx, voi LO_CALL(lo_box_hostnet_tcplist_as_net_stream_listener(&globals.listeners[i]), close); return byte_count; } -static uint32_t api_pread(struct api_file *, struct lib9p_srv_ctx *, void *, uint32_t, uint64_t) { +static void api_pread(struct api_file *LM_UNUSED(self), struct lib9p_srv_ctx *LM_UNUSED(ctx), + uint32_t LM_UNUSED(byte_count), uint64_t LM_UNUSED(byte_offset), + struct iovec *LM_UNUSED(ret)) { assert_notreached("not readable"); } diff --git a/lib9p_util/static.c b/lib9p_util/static.c index 50bb129..7f1e6b7 100644 --- a/lib9p_util/static.c +++ b/lib9p_util/static.c @@ -218,27 +218,27 @@ static uint32_t util9p_static_file_iounit(struct util9p_static_file *self) { assert(self); return 0; } -static uint32_t util9p_static_file_pread(struct util9p_static_file *self, struct lib9p_srv_ctx *ctx, - void *buf, - uint32_t byte_count, - uint64_t byte_offset) { +static void util9p_static_file_pread(struct util9p_static_file *self, struct lib9p_srv_ctx *ctx, + uint32_t byte_count, uint64_t byte_offset, + struct iovec *ret) { assert(self); assert(ctx); + assert(ret); size_t data_size = util9p_static_file_size(self); if (byte_offset > (uint64_t)data_size) { lib9p_error(&ctx->basectx, LINUX_EINVAL, "offset is past end-of-file length"); - return 0; + return; } size_t beg_off = (size_t)byte_offset; size_t end_off = beg_off + (size_t)byte_count; if (end_off > data_size) end_off = data_size; - memcpy(buf, &self->data_start[beg_off], end_off-beg_off); - return (uint32_t)(end_off-beg_off); + ret->iov_base = &self->data_start[beg_off]; + ret->iov_len = end_off-beg_off; } static uint32_t util9p_static_file_pwrite(struct util9p_static_file *self, struct lib9p_srv_ctx *ctx, void *LM_UNUSED(buf), |