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

compiler: Allocate all possible space for constants

Browse source 
When the c-capnp compiler runs, currently only takes the len of 1st
segment in the list as a capacity used in the generator for constants
definitions.

This works when the schema processing only generates 1 segment, or the
1st segment has 8192 bytes. There are cases where the fd returns
multiple segments an the first one has very low capacity (e.g. 96 or 80).
Hence, if more constants require to be allocated for the current schema
it will have misleading positions.

This commit takes a conservative approach by summing up all the lenghts
of capnproto segments obtained at the fd_init call of the compiler.
Those values are taken to set the memory allocation and the max
capacity for the segment utilized in the code generation.
This commit is contained in:
jose luis ferrer 2018-02-01 15:13:18 +01:00
parent cb30563de7
commit d9240320c1
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/capnpc-c.c
View file

@ -1179,14 +1179,22 @@ int main() {
struct node *file_node, *n; struct node *file_node, *n;
struct node *all_files = NULL, *all_structs = NULL; struct node *all_files = NULL, *all_structs = NULL;
int i, j; int i, j;
uint64_t total_len=0;
struct capn_segment *current_seg;
if (capn_init_fp(&capn, stdin, 0)) { if (capn_init_fp(&capn, stdin, 0)==-1) {
fprintf(stderr, "failed to read schema from stdin\n"); fprintf(stderr, "failed to read schema from stdin\n");
return -1; return -1;
} }
g_valseg.data = calloc(1, capn.seglist->len); current_seg = capn.seglist;
g_valseg.cap = capn.seglist->len; do{
total_len+=current_seg->len;
current_seg = current_seg->next;
}while(current_seg);
g_valseg.data = calloc(1, total_len);
g_valseg.cap = total_len;
root.p = capn_getp(capn_root(&capn), 0, 1); root.p = capn_getp(capn_root(&capn), 0, 1);
read_CodeGeneratorRequest(&req, root); read_CodeGeneratorRequest(&req, root);