rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve list encode/decode

Browse source
This commit is contained in:
Rongsong Shen 2025-04-28 10:32:18 +08:00
parent 3a7ae150b8
commit 40006c00d2
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/capnpc-c.c
View file

@ -1231,14 +1231,14 @@ void mk_struct_list_encoder(capnp_ctx_t *ctx, struct node *n) {
str_addf(&(ctx->SRC), str_addf(&(ctx->SRC),
"void encode_%s_list(struct capn_segment *cs, %s_list *l,int " "void encode_%s_list(struct capn_segment *cs, %s_list *l,int "
"count,%s *s) {\n", "count,%s **s) {\n",
n->name.str, n->name.str, buf); n->name.str, n->name.str, buf);
str_addf(&(ctx->SRC), "\t%s_list lst;\n", n->name.str); str_addf(&(ctx->SRC), "\t%s_list lst;\n", n->name.str);
str_addf(&(ctx->SRC), "\tint i;\n"); str_addf(&(ctx->SRC), "\tint i;\n");
str_addf(&(ctx->SRC), "\tlst = new_%s_list(cs, count);\n", n->name.str); str_addf(&(ctx->SRC), "\tlst = new_%s_list(cs, count);\n", n->name.str);
str_addf(&(ctx->SRC), "\tfor(i = 0; i < count; i ++) {\n"); str_addf(&(ctx->SRC), "\tfor(i = 0; i < count; i ++) {\n");
str_addf(&(ctx->SRC), "\t\tstruct %s d;\n", n->name.str); str_addf(&(ctx->SRC), "\t\tstruct %s d;\n", n->name.str);
str_addf(&(ctx->SRC), "\t\tencode_%s(cs, &d, &(s[i]));\n", n->name.str); str_addf(&(ctx->SRC), "\t\tencode_%s(cs, &d, s[i]);\n", n->name.str);
str_addf(&(ctx->SRC), "\t\tset_%s(&d, lst, i);\n", n->name.str); str_addf(&(ctx->SRC), "\t\tset_%s(&d, lst, i);\n", n->name.str);
str_addf(&(ctx->SRC), "\t}\n"); str_addf(&(ctx->SRC), "\t}\n");
str_addf(&(ctx->SRC), "\t(*l) = lst;\n"); str_addf(&(ctx->SRC), "\t(*l) = lst;\n");
@ -1295,18 +1295,20 @@ void mk_struct_list_decoder(capnp_ctx_t *ctx, struct node *n) {
} }
str_addf(&(ctx->SRC), str_addf(&(ctx->SRC),
"void decode_%s_list(int *pcount, %s **d, %s_list list) {\n", "void decode_%s_list(int *pcount, %s ***d, %s_list list) {\n",
n->name.str, buf, n->name.str); n->name.str, buf, n->name.str);
str_addf(&(ctx->SRC), "\tint i;\n"); str_addf(&(ctx->SRC), "\tint i;\n");
str_addf(&(ctx->SRC), "\tint nc;\n"); str_addf(&(ctx->SRC), "\tint nc;\n");
str_addf(&(ctx->SRC), "\t%s *ptr;\n", buf); str_addf(&(ctx->SRC), "\t%s **ptr;\n", buf);
str_addf(&(ctx->SRC), "\tcapn_resolve(&(list.p));\n"); str_addf(&(ctx->SRC), "\tcapn_resolve(&(list.p));\n");
str_addf(&(ctx->SRC), "\tnc = list.p.len;\n"); str_addf(&(ctx->SRC), "\tnc = list.p.len;\n");
str_addf(&(ctx->SRC), "\tptr = (%s *)calloc(nc, sizeof(%s));\n", buf, buf); str_addf(&(ctx->SRC), "\tptr = (%s **)calloc(nc, sizeof(%s *));\n", buf, buf);
str_addf(&(ctx->SRC), "\tfor(i = 0; i < nc; i ++) {\n"); str_addf(&(ctx->SRC), "\tfor(i = 0; i < nc; i ++) {\n");
str_addf(&(ctx->SRC), "\t\tstruct %s s;\n", n->name.str); str_addf(&(ctx->SRC), "\t\tstruct %s s;\n", n->name.str);
str_addf(&(ctx->SRC), "\t\tget_%s(&s, list, i);\n", n->name.str); str_addf(&(ctx->SRC), "\t\tget_%s(&s, list, i);\n", n->name.str);
str_addf(&(ctx->SRC), "\t\tdecode_%s(&(ptr[i]), &s);\n", n->name.str); str_addf(&(ctx->SRC), "\t\tptr[i] = (%s *)calloc(1, sizeof(%s));\n",
buf, buf);
str_addf(&(ctx->SRC), "\t\tdecode_%s(ptr[i], &s);\n", n->name.str);
str_addf(&(ctx->SRC), "\t}\n"); str_addf(&(ctx->SRC), "\t}\n");
str_addf(&(ctx->SRC), "\t(*d) = ptr;\n"); str_addf(&(ctx->SRC), "\t(*d) = ptr;\n");
str_addf(&(ctx->SRC), "\t(*pcount) = nc;\n"); str_addf(&(ctx->SRC), "\t(*pcount) = nc;\n");
@ -2102,9 +2104,9 @@ static void mk_codec_declares(capnp_ctx_t *ctx, const char *n1,
n2); n2);
str_addf(&(ctx->HDR), "void decode_%s(%s *, struct %s *);\n", n1, n2, n1); str_addf(&(ctx->HDR), "void decode_%s(%s *, struct %s *);\n", n1, n2, n1);
str_addf(&(ctx->HDR), str_addf(&(ctx->HDR),
"void encode_%s_list(struct capn_segment *,%s_list *, int, %s *);\n", "void encode_%s_list(struct capn_segment *,%s_list *, int, %s **);\n",
n1, n1, n2); n1, n1, n2);
str_addf(&(ctx->HDR), "void decode_%s_list(int *, %s **, %s_list);\n", n1, n2, str_addf(&(ctx->HDR), "void decode_%s_list(int *, %s ***, %s_list);\n", n1, n2,
n1); n1);
str_addf(&(ctx->HDR), str_addf(&(ctx->HDR),
"void encode_%s_ptr(struct capn_segment*, %s_ptr *, %s *);\n", n1, "void encode_%s_ptr(struct capn_segment*, %s_ptr *, %s *);\n", n1,

2
examples/book/book.h
View file

@ -25,7 +25,7 @@ typedef struct {
int n_authors; int n_authors;
char **authors; char **authors;
int n_chapters; int n_chapters;
chapter_t *chapters_; chapter_t **chapters_;
publish_t *publish; publish_t *publish;
nulldata_t *nulldata; nulldata_t *nulldata;
int n_magic1; int n_magic1;

11
examples/book/test.c
View file

@ -20,7 +20,7 @@ int encode() {
uint32_t magic1[2] = { uint32_t magic1[2] = {
1101,1012 1101,1012
}; };
chapter_t chapters[3] = { chapter_t chapters_[3] = {
{.caption ="Chapter1", {.caption ="Chapter1",
.start =1, .start =1,
.end=99}, .end=99},
@ -31,6 +31,9 @@ int encode() {
.start = 151, .start = 151,
.end=199} .end=199}
}; };
chapter_t* chapters[3] = {
&chapters_[0], &chapters_[1], &chapters_[2]
};
publish_t publish = { publish_t publish = {
.isbn = 335677, .isbn = 335677,
.year =2001 .year =2001
@ -87,10 +90,10 @@ int decode() {
printf("chapters(%d):\n", book->n_chapters); printf("chapters(%d):\n", book->n_chapters);
for(i = 0; i < book->n_chapters; i ++) { for(i = 0; i < book->n_chapters; i ++) {
printf("\tcaption: %s\n", book->chapters_[i].caption); printf("\tcaption: %s\n", book->chapters_[i]->caption);
printf("\tfrom %d to %d\n", printf("\tfrom %d to %d\n",
book->chapters_[i].start, book->chapters_[i]->start,
book->chapters_[i].end); book->chapters_[i]->end);
} }
printf("ISBN: %lu year: %u\n", printf("ISBN: %lu year: %u\n",