Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update upbc to use self-describing upb_msg instead of void*.

Browse Source
pull/13171/head
Joshua Haberman 16 years ago
parent 6191fe3ae2
commit d160380736
4 changed files with 39 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/upb_context.c
  2. 6
      src/upb_context.h
  3. 3
      src/upb_def.c
  4. 55
      tools/upbc.c

4
src/upb_context.c
Unescape View File

@ -44,7 +44,7 @@ struct upb_context *upb_context_new()
struct upb_string name = UPB_STRLIT("google.protobuf.FileDescriptorSet");
struct upb_symtab_entry *e = upb_strtable_lookup(&c->psymtab, &name);
assert(e);
c->fds_msg = e->ref.msg;
c->fds_msgdef = e->ref.msg;
c->fds_size = 16;
c->fds_len = 0;
c->fds = malloc(sizeof(*c->fds));
@ -349,7 +349,7 @@ void upb_context_addfds(struct upb_context *c,
void upb_context_parsefds(struct upb_context *c, struct upb_string *fds_str,
struct upb_status *status)
{
struct upb_msg *fds = upb_msg_new(c->fds_msg);
struct upb_msg *fds = upb_msg_new(c->fds_msgdef);
upb_msg_parsestr(fds, fds_str->ptr, fds_str->byte_len, status);
if(!upb_ok(status)) return;
upb_context_addfds(c, (google_protobuf_FileDescriptorSet*)fds, status);

6
src/upb_context.h
Unescape View File

@ -41,9 +41,9 @@ struct upb_symtab_entry {
struct upb_context {
upb_atomic_refcount_t refcount;
upb_rwlock_t lock;
struct upb_strtable symtab; /* The context's symbol table. */
struct upb_strtable psymtab; /* Private symbols, for internal use. */
struct upb_msgdef *fds_msg; /* In psymtab, ptr here for convenience. */
struct upb_strtable symtab; /* The context's symbol table. */
struct upb_strtable psymtab; /* Private symbols, for internal use. */
struct upb_msgdef *fds_msgdef; /* In psymtab, ptr here for convenience. */
/* A list of the FileDescriptorProtos we own (from having parsed them
* ourselves) and must free on destruction. */

3
src/upb_def.c
Unescape View File

@ -110,7 +110,8 @@ void _upb_msgdef_free(struct upb_msgdef *m)
for (unsigned int i = 0; i < m->num_fields; i++) {
struct upb_fielddef *f = &m->fields[i];
upb_string_unref(f->name);
upb_def_unref(f->ref, f->type);
if (upb_issubmsg(f) || f->type == UPB_TYPENUM(ENUM))
upb_def_unref(f->ref, f->type);
}
free(m->fields);
free(m);

55
tools/upbc.c
Unescape View File

@ -275,8 +275,7 @@ int compare_entries(const void *_e1, const void *_e2)
*
* TODO: make these use a generic msg visitor. */
static void add_strings_from_msg(void *data, struct upb_msgdef *m,
struct upb_strtable *t);
static void add_strings_from_msg(struct upb_msg *msg, struct upb_strtable *t);
static void add_strings_from_value(union upb_value_ptr p,
struct upb_fielddef *f,
@ -287,17 +286,17 @@ static void add_strings_from_value(union upb_value_ptr p,
if(upb_strtable_lookup(t, &e.e.key) == NULL)
upb_strtable_insert(t, &e.e);
} else if(upb_issubmsg(f)) {
add_strings_from_msg(*p.msg, f->ref.msg, t);
add_strings_from_msg(*p.msg, t);
}
}
static void add_strings_from_msg(void *data, struct upb_msgdef *m,
struct upb_strtable *t)
static void add_strings_from_msg(struct upb_msg *msg, struct upb_strtable *t)
{
struct upb_msgdef *m = msg->def;
for(uint32_t i = 0; i < m->num_fields; i++) {
struct upb_fielddef *f = &m->fields[i];
if(!upb_msg_isset(data, f)) continue;
union upb_value_ptr p = upb_msg_getptr(data, f);
if(!upb_msg_isset(msg, f)) continue;
union upb_value_ptr p = upb_msg_getptr(msg, f);
if(upb_isarray(f)) {
struct upb_array *arr = *p.arr;
for(uint32_t j = 0; j < arr->len; j++)
@ -348,12 +347,13 @@ static void add_value(union upb_value_ptr p, struct upb_fielddef *f,
type_e->values[type_e->values_len++] = upb_value_read(p, f->type);
}
static void add_submsgs(void *data, struct upb_msgdef *m, struct upb_strtable *t)
static void add_submsgs(struct upb_msg *msg, struct upb_strtable *t)
{
struct upb_msgdef *m = msg->def;
for(uint32_t i = 0; i < m->num_fields; i++) {
struct upb_fielddef *f = &m->fields[i];
if(!upb_msg_isset(data, f)) continue;
union upb_value_ptr p = upb_msg_getptr(data, f);
if(!upb_msg_isset(msg, f)) continue;
union upb_value_ptr p = upb_msg_getptr(msg, f);
if(upb_isarray(f)) {
if(upb_isstring(f)) continue; /* Handled by a different code-path. */
struct upb_array *arr = *p.arr;
@ -379,19 +379,18 @@ static void add_submsgs(void *data, struct upb_msgdef *m, struct upb_strtable *t
* array are contiguous (and don't have submsgs of the same type
* interleaved). */
for(uint32_t j = 0; j < arr->len; j++)
add_submsgs(*upb_array_getelementptr(arr, j).msg, f->ref.msg, t);
add_submsgs(*upb_array_getelementptr(arr, j).msg, t);
} else {
if(!upb_issubmsg(f)) continue;
add_value(p, f, t);
add_submsgs(*p.msg, f->ref.msg, t);
add_submsgs(*p.msg, t);
}
}
}
/* write_messages_c emits a .c file that contains the data of a protobuf,
* serialized as C structures. */
static void write_message_c(void *data, struct upb_msgdef *m,
char *cident, char *hfile_name,
static void write_message_c(struct upb_msg *msg, char *cident, char *hfile_name,
int argc, char *argv[], char *infile_name,
FILE *stream)
{
@ -421,7 +420,7 @@ static void write_message_c(void *data, struct upb_msgdef *m,
* same string more than once. */
struct upb_strtable strings;
upb_strtable_init(&strings, 16, sizeof(struct strtable_entry));
add_strings_from_msg(data, m, &strings);
add_strings_from_msg(msg, &strings);
int size;
struct strtable_entry **str_entries = strtable_to_array(&strings, &size);
@ -459,14 +458,14 @@ static void write_message_c(void *data, struct upb_msgdef *m,
* a unique number within its type. */
struct upb_strtable types;
upb_strtable_init(&types, 16, sizeof(struct typetable_entry));
union upb_value val = {.msg = data};
union upb_value val = {.msg = msg};
/* A fake field to get the recursion going. */
struct upb_fielddef fake_field = {
.type = UPB_TYPENUM(MESSAGE),
.ref = {.msg = m}
.ref = {.msg = msg->def}
};
add_value(upb_value_addrof(&val), &fake_field, &types);
add_submsgs(data, m, &types);
add_submsgs(msg, &types);
/* Emit foward declarations for all msgs of all types, and define arrays. */
fprintf(stream, "/* Forward declarations of messages, and array decls. */\n");
@ -669,7 +668,7 @@ int main(int argc, char *argv[])
/* Parse input file. */
struct upb_context *c = upb_context_new();
struct upb_msg *fds_msg = upb_msg_new(c->fds_msg);
struct upb_msg *fds_msg = upb_msg_new(c->fds_msgdef);
struct upb_status status = UPB_STATUS_INIT;
upb_msg_parsestr(fds_msg, descriptor->ptr, descriptor->byte_len, &status);
if(!upb_ok(&status))
@ -680,9 +679,19 @@ int main(int argc, char *argv[])
if(!upb_ok(&status))
error("Failed to resolve symbols in descriptor: %s", status.msg);
/* We need to sort the fields of all the descriptors. They will already be
* sorted in the upb_msgs that we base our header file output on, so we must
* sort here to match. */
// We need to sort the fields of all the descriptors. This is currently
// somewhat special-cased to when we are emitting a descriptor for
// FileDescriptorProto, which is used internally for bootstrapping.
//
// The fundamental issue is that we will be parsing descriptors into memory
// using a reflection-based code-path, but upb then reads the descriptors
// from memory using the C structs emitted by upbc. This means that the
// msgdef we will use internally to parse the descriptors must use the same
// field order as the .h files we are about to generate. But the msgdefs we
// will use to generate those .h files have already been sorted according to
// this scheme.
//
// If/when we ever make upbc more general, we'll have to revisit this.
for(uint32_t i = 0; i < fds->file->len; i++) {
google_protobuf_FileDescriptorProto *fd = fds->file->elements[i];
if(!fd->set_flags.has.message_type) continue;
@ -711,7 +720,7 @@ int main(int argc, char *argv[])
if(cident) {
FILE *c_file = fopen(c_filename, "w");
if(!c_file) error("Failed to open .h output file");
write_message_c(fds, c->fds_msg, cident, h_filename, argc, argv, input_file, c_file);
write_message_c(fds_msg, cident, h_filename, argc, argv, input_file, c_file);
fclose(c_file);
}
upb_msg_unref(fds_msg);

Write Preview
Loading…
Cancel
Save