wip: lib9p: Multi-iovec replieslukeshu/9p-read-multi-iovec

1 files changed, 35 insertions, 10 deletions

diff --git a/lib9p/core_generated.c b/lib9p/core_generated.c
index 08ab4f0..49cb8d9 100644
--- a/lib9p/core_generated.c
+++ b/lib9p/core_generated.c
@@ -1915,7 +1915,11 @@ static void unmarshal_Rread([[maybe_unused]] struct lib9p_ctx *ctx, uint8_t *net
 	net_offset += 1;
 	UNMARSHAL_U16LE(ctx, out->tag);
 	UNMARSHAL_U32LE(ctx, out->count);
-	UNMARSHAL_BYTES(ctx, out->data, out->count);
+	out->data.iov = ctx->extra;
+	ctx->extra += sizeof(out->data.iov[0]);
+	out->data.iov->iov_base = &ctx->net_bytes[ctx->net_offset];
+	out->data.iov->iov_len = out->count;
+	out->data.iovcnt = 1;
 }
 
 static void unmarshal_Twrite([[maybe_unused]] struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out_buf) {
@@ -1928,7 +1932,11 @@ static void unmarshal_Twrite([[maybe_unused]] struct lib9p_ctx *ctx, uint8_t *ne
 	UNMARSHAL_U32LE(ctx, out->fid);
 	UNMARSHAL_U64LE(ctx, out->offset);
 	UNMARSHAL_U32LE(ctx, out->count);
-	UNMARSHAL_BYTES(ctx, out->data, out->count);
+	out->data.iov = ctx->extra;
+	ctx->extra += sizeof(out->data.iov[0]);
+	out->data.iov->iov_base = &ctx->net_bytes[ctx->net_offset];
+	out->data.iov->iov_len = out->count;
+	out->data.iovcnt = 1;
 }
 
 static void unmarshal_Rwrite([[maybe_unused]] struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out_buf) {
@@ -2428,7 +2436,11 @@ static void unmarshal_Rreaddir([[maybe_unused]] struct lib9p_ctx *ctx, uint8_t *
 	net_offset += 1;
 	UNMARSHAL_U16LE(ctx, out->tag);
 	UNMARSHAL_U32LE(ctx, out->count);
-	UNMARSHAL_BYTES(ctx, out->data, out->count);
+	out->data.iov = ctx->extra;
+	ctx->extra += sizeof(out->data.iov[0]);
+	out->data.iov->iov_base = &ctx->net_bytes[ctx->net_offset];
+	out->data.iov->iov_len = out->count;
+	out->data.iovcnt = 1;
 }
 
 static void unmarshal_Tfsync([[maybe_unused]] struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out_buf) {
@@ -2649,7 +2661,11 @@ static void unmarshal_Rsread([[maybe_unused]] struct lib9p_ctx *ctx, uint8_t *ne
 	net_offset += 1;
 	UNMARSHAL_U16LE(ctx, out->tag);
 	UNMARSHAL_U32LE(ctx, out->count);
-	UNMARSHAL_BYTES(ctx, out->data, out->count);
+	out->data.iov = ctx->extra;
+	ctx->extra += sizeof(out->data.iov[0]);
+	out->data.iov->iov_base = &ctx->net_bytes[ctx->net_offset];
+	out->data.iov->iov_len = out->count;
+	out->data.iovcnt = 1;
 }
 
 static void unmarshal_Tswrite([[maybe_unused]] struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out_buf) {
@@ -2668,7 +2684,11 @@ static void unmarshal_Tswrite([[maybe_unused]] struct lib9p_ctx *ctx, uint8_t *n
 		UNMARSHAL_BYTES(ctx, out->wname[i].utf8, out->wname[i].len);
 	}
 	UNMARSHAL_U32LE(ctx, out->count);
-	UNMARSHAL_BYTES(ctx, out->data, out->count);
+	out->data.iov = ctx->extra;
+	ctx->extra += sizeof(out->data.iov[0]);
+	out->data.iov->iov_base = &ctx->net_bytes[ctx->net_offset];
+	out->data.iov->iov_len = out->count;
+	out->data.iovcnt = 1;
 }
 
 static void unmarshal_Rswrite([[maybe_unused]] struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out_buf) {
@@ -3119,7 +3139,8 @@ static error marshal_Rread(struct lib9p_ctx *ctx, struct lib9p_msg_Rread *val, s
 	MARSHAL_U8LE(ctx, 117);
 	MARSHAL_U16LE(ctx, val->tag);
 	MARSHAL_U32LE(ctx, val->count);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->data, val->count);
+	for (int iov_i = 0; iov_i < val->data->iovcnt; iov_i++)
+		MARSHAL_BYTES_ZEROCOPY(ctx, val->data->iov[iov_i].iov_base, val->data->iov[iov_i].iov_len);
 	return ERROR_NULL;
 }
 
@@ -3138,7 +3159,8 @@ static error marshal_Twrite(struct lib9p_ctx *ctx, struct lib9p_msg_Twrite *val,
 	MARSHAL_U32LE(ctx, val->fid);
 	MARSHAL_U64LE(ctx, val->offset);
 	MARSHAL_U32LE(ctx, val->count);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->data, val->count);
+	for (int iov_i = 0; iov_i < val->data->iovcnt; iov_i++)
+		MARSHAL_BYTES_ZEROCOPY(ctx, val->data->iov[iov_i].iov_base, val->data->iov[iov_i].iov_len);
 	return ERROR_NULL;
 }
 
@@ -3880,7 +3902,8 @@ static error marshal_Rreaddir(struct lib9p_ctx *ctx, struct lib9p_msg_Rreaddir *
 	MARSHAL_U8LE(ctx, 41);
 	MARSHAL_U16LE(ctx, val->tag);
 	MARSHAL_U32LE(ctx, val->count);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->data, val->count);
+	for (int iov_i = 0; iov_i < val->data->iovcnt; iov_i++)
+		MARSHAL_BYTES_ZEROCOPY(ctx, val->data->iov[iov_i].iov_base, val->data->iov[iov_i].iov_len);
 	return ERROR_NULL;
 }
 
@@ -4210,7 +4233,8 @@ static error marshal_Rsread(struct lib9p_ctx *ctx, struct lib9p_msg_Rsread *val,
 	MARSHAL_U8LE(ctx, 153);
 	MARSHAL_U16LE(ctx, val->tag);
 	MARSHAL_U32LE(ctx, val->count);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->data, val->count);
+	for (int iov_i = 0; iov_i < val->data->iovcnt; iov_i++)
+		MARSHAL_BYTES_ZEROCOPY(ctx, val->data->iov[iov_i].iov_base, val->data->iov[iov_i].iov_len);
 	return ERROR_NULL;
 }
 
@@ -4236,7 +4260,8 @@ static error marshal_Tswrite(struct lib9p_ctx *ctx, struct lib9p_msg_Tswrite *va
 		MARSHAL_BYTES_ZEROCOPY(ctx, val->wname[i].utf8, val->wname[i].len);
 	}
 	MARSHAL_U32LE(ctx, val->count);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->data, val->count);
+	for (int iov_i = 0; iov_i < val->data->iovcnt; iov_i++)
+		MARSHAL_BYTES_ZEROCOPY(ctx, val->data->iov[iov_i].iov_base, val->data->iov[iov_i].iov_len);
 	return ERROR_NULL;
 }