From 5e2691460e9fb2ec9b77c1f9d133ae6b667afc3a Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Sun, 28 Jun 2009 15:41:53 -0700 Subject: Ditch abbreviated field business. --- upb_msg.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 54 insertions(+), 14 deletions(-) (limited to 'upb_msg.c') diff --git a/upb_msg.c b/upb_msg.c index 0517cf0..f2ad6c4 100644 --- a/upb_msg.c +++ b/upb_msg.c @@ -6,6 +6,7 @@ #include #include "descriptor.h" #include "upb_msg.h" +#include "upb_parse.h" #define ALIGN_UP(p, t) (t + ((p - 1) & (~t - 1))) @@ -17,9 +18,7 @@ static int div_round_up(int numerator, int denominator) { } static int compare_fields(const void *e1, const void *e2) { - const struct upb_msg_field *f1 = e1, *f2 = e2; - const google_protobuf_FieldDescriptorProto *fd1 = f1->descriptor; - const google_protobuf_FieldDescriptorProto *fd2 = f2->descriptor; + const google_protobuf_FieldDescriptorProto *fd1 = e1, *fd2 = e2; /* Required fields go before non-required. */ bool req1 = fd1->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED; bool req2 = fd2->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED; @@ -48,18 +47,19 @@ bool upb_msg_init(struct upb_msg *m, struct google_protobuf_DescriptorProto *d) m->num_required_fields = 0; m->size = m->set_flags_bytes; - m->fields = malloc(sizeof(struct upb_msg_field) * m->num_fields); + m->fields = malloc(sizeof(*m->fields) * m->num_fields); + m->field_descriptors = malloc(sizeof(*m->field_descriptors) * 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]; + m->field_descriptors[i] = d->field->elements[i]; } - qsort(m->fields, m->num_fields, sizeof(struct upb_msg_field), compare_fields); + qsort(m->field_descriptors, m->num_fields, sizeof(void*), compare_fields); size_t max_align = 0; for(unsigned int i = 0; i < m->num_fields; i++) { struct upb_msg_field *f = &m->fields[i]; - google_protobuf_FieldDescriptorProto *fd = f->descriptor; + google_protobuf_FieldDescriptorProto *fd = m->field_descriptors[i]; 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 @@ -72,14 +72,11 @@ bool upb_msg_init(struct upb_msg *m, struct google_protobuf_DescriptorProto *d) if(fd->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED) m->num_required_fields++; - /* 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 + /* 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 * when the references are resolved. */ - 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}; + struct upb_fieldsbynum_entry nument = {.e = {.key = fd->number}, .f = *f}; + struct upb_fieldsbyname_entry strent = {.e = {.key = *fd->name}, .f = *f}; upb_inttable_insert(&m->fields_by_num, &nument.e); upb_strtable_insert(&m->fields_by_name, &strent.e); } @@ -94,3 +91,46 @@ void upb_msg_free(struct upb_msg *m) upb_strtable_free(&m->fields_by_name); free(m->fields); } + +#if 0 +struct parse_frame_data { + struct upb_msg *m; + void *data; +}; + +static void set_frame_data(struct upb_parse_state *s, struct upb_msg *m) +{ +} + +static upb_field_type_t tag_cb(struct upb_parse_state *s, struct upb_tag *tag, + void **user_field_desc) +{ + struct upb_msg *m = (struct upb_msg*)s->top->user_data; + struct upb_msg_field *f = upb_msg_fieldbynum(m, tag->field_number); + if(!f || !upb_check_type(tag->wire_type, f->type)) + return 0; /* Skip unknown or fields of the wrong type. */ + *user_field_desc = f->ref.msg; + return f->type; +} + +static void value_cb(struct upb_parse_state *s, union upb_value *v, + void *str, void *user_field_desc) +{ + *user_field_desc = f->ref.msg; +} + +static void submsg_start_cb(struct upb_parse_state *s, void *user_field_desc) +{ + set_frame_data(s, user_field_desc); +} + +void *upb_msg_parse(struct upb_msg *m, struct upb_string *str) +{ + struct upb_parse_state s; + upb_parse_state_init(&s, sizeof(struct parse_frame_data)); + set_frame_data(&s, m); + s.tag_cb = tag_cb; + s.value_cb = value_cb; + s.submsg_start_cb = submsg_start_cb; +} +#endif -- cgit v1.2.3