|
|
|
@ -17,17 +17,18 @@ static int div_round_up(int numerator, int denominator) { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static int compare_fields(const void *e1, const void *e2) { |
|
|
|
|
const google_protobuf_FieldDescriptorProto *f1 = e1, *f2 = e2; |
|
|
|
|
const struct upb_msg_field *f1 = e1, *f2 = e2; |
|
|
|
|
const google_protobuf_FieldDescriptorProto *fd1 = f1->descriptor; |
|
|
|
|
const google_protobuf_FieldDescriptorProto *fd2 = f2->descriptor; |
|
|
|
|
/* Required fields go before non-required. */ |
|
|
|
|
if(f1->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED && |
|
|
|
|
f2->label != GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED) { |
|
|
|
|
return -1; |
|
|
|
|
} else if(f1->label != GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED && |
|
|
|
|
f2->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED) { |
|
|
|
|
return 1; |
|
|
|
|
bool req1 = fd1->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED; |
|
|
|
|
bool req2 = fd2->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED; |
|
|
|
|
if(req1 != req2) { |
|
|
|
|
return req2 - req1; |
|
|
|
|
} else { |
|
|
|
|
/* Within required and non-required field lists, list in number order. */ |
|
|
|
|
return f1->number - f2->number; |
|
|
|
|
/* Within required and non-required field lists, list in number order.
|
|
|
|
|
* TODO: consider ordering by data size to reduce padding. */ |
|
|
|
|
return fd1->number - fd2->number; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -41,35 +42,44 @@ bool upb_msg_init(struct upb_msg *m, struct google_protobuf_DescriptorProto *d) |
|
|
|
|
upb_strtable_init(&m->fields_by_name, d->field->len, |
|
|
|
|
sizeof(struct upb_fieldsbyname_entry)); |
|
|
|
|
|
|
|
|
|
m->fields = malloc(sizeof(struct upb_msg_field) * d->field->len); |
|
|
|
|
m->num_fields = d->field->len; |
|
|
|
|
m->set_flags_bytes = div_round_up(m->num_fields, 8); |
|
|
|
|
|
|
|
|
|
/* These are incremented in the loop. */ |
|
|
|
|
m->num_required_fields = 0; |
|
|
|
|
m->size = m->set_flags_bytes; |
|
|
|
|
|
|
|
|
|
qsort(m->fields, d->field->len, sizeof(struct upb_msg_field), compare_fields); |
|
|
|
|
m->fields = malloc(sizeof(struct upb_msg_field) * m->num_fields); |
|
|
|
|
for(unsigned int i = 0; i < m->num_fields; i++) { |
|
|
|
|
/* We count on the caller to keep this pointer alive. */ |
|
|
|
|
m->fields[i].descriptor = d->field->elements[i]; |
|
|
|
|
} |
|
|
|
|
qsort(m->fields, m->num_fields, sizeof(struct upb_msg_field), compare_fields); |
|
|
|
|
|
|
|
|
|
size_t max_align = 0; |
|
|
|
|
|
|
|
|
|
for(unsigned int i = 0; i < d->field->len; i++) { |
|
|
|
|
for(unsigned int i = 0; i < m->num_fields; i++) { |
|
|
|
|
struct upb_msg_field *f = &m->fields[i]; |
|
|
|
|
google_protobuf_FieldDescriptorProto *fd; /* TODO */ |
|
|
|
|
struct upb_type_info *type_info = &upb_type_info[f->type]; |
|
|
|
|
google_protobuf_FieldDescriptorProto *fd = f->descriptor; |
|
|
|
|
struct upb_type_info *type_info = &upb_type_info[fd->type]; |
|
|
|
|
|
|
|
|
|
/* General alignment rules are: each member must be at an address that is a
|
|
|
|
|
* multiple of that type's alignment. Also, the size of the structure as |
|
|
|
|
* a whole must be a multiple of the greatest alignment of any member. */ |
|
|
|
|
f->field_index = i; |
|
|
|
|
f->type = fd->type; |
|
|
|
|
f->byte_offset = ALIGN_UP(m->size, type_info->align); |
|
|
|
|
m->size = f->byte_offset + type_info->size; |
|
|
|
|
max_align = max(max_align, type_info->align); |
|
|
|
|
if(fd->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED) |
|
|
|
|
m->num_required_fields++; |
|
|
|
|
|
|
|
|
|
/* Insert into the tables. Note that f->ref will be uninitialized, even in
|
|
|
|
|
* the tables' copies of *f, which is why we must update them separately |
|
|
|
|
/* Insert into the tables. Note that af->ref will be uninitialized, even in
|
|
|
|
|
* the tables' copies of *af, which is why we must update them separately |
|
|
|
|
* when the references are resolved. */ |
|
|
|
|
struct upb_fieldsbynum_entry nument = {.e = {.key = fd->number}, .f = *f}; |
|
|
|
|
struct upb_fieldsbyname_entry strent = {.e = {.key = *fd->name}, .f = *f}; |
|
|
|
|
struct upb_abbrev_msg_field af = {.byte_offset = f->byte_offset, |
|
|
|
|
.field_index = f->field_index, |
|
|
|
|
.type = fd->type}; |
|
|
|
|
struct upb_fieldsbynum_entry nument = {.e = {.key = fd->number}, .f = af}; |
|
|
|
|
struct upb_fieldsbyname_entry strent = {.e = {.key = *fd->name}, .f = af}; |
|
|
|
|
upb_inttable_insert(&m->fields_by_num, &nument.e); |
|
|
|
|
upb_strtable_insert(&m->fields_by_name, &strent.e); |
|
|
|
|
} |
|
|
|
|