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

Lots of encoder/decoder work (backwards encoder).

Browse Source
pull/13171/head
Joshua Haberman 8 years ago
parent 1aafd4111b
commit 699b51b441
2 changed files with 317 additions and 310 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 226
      upb/decode.c
  2. 401
      upb/encode.c

226
upb/decode.c
Unescape View File

@ -10,6 +10,15 @@ typedef enum {
UPB_WIRE_TYPE_32BIT = 5 UPB_WIRE_TYPE_32BIT = 5
} upb_wiretype_t; } upb_wiretype_t;
typedef struct {
upb_env *env;
/* Current decoding pointer. Points to the beginning of a field until we
* have finished decoding the whole field. */
const char *ptr;
} upb_decstate;
#define CHK(x) if (!(x)) { return false; }
static void upb_decode_seterr(upb_env *env, const char *msg) { static void upb_decode_seterr(upb_env *env, const char *msg) {
upb_status status = UPB_STATUS_INIT; upb_status status = UPB_STATUS_INIT;
upb_status_seterrmsg(&status, msg); upb_status_seterrmsg(&status, msg);
@ -110,24 +119,56 @@ static void upb_set32(void *msg, size_t ofs, uint32_t val) {
memcpy((char*)msg + ofs, &val, sizeof(val)); memcpy((char*)msg + ofs, &val, sizeof(val));
} }
bool upb_append_unknown(const char **ptr, const char *start, const char *limit, static bool upb_append_unknownfield(const char **ptr, const char *start,
char *msg) { const char *limit, char *msg) {
UPB_UNUSED(limit); UPB_UNUSED(limit);
UPB_UNUSED(msg); UPB_UNUSED(msg);
*ptr = limit; *ptr = limit;
return true; return true;
} }
bool upb_decode_field(const char **ptr, const char *limit, char *msg, static bool upb_decode_unknownfielddata(upb_decstate *d, const char *ptr,
const upb_msglayout_msginit_v1 *l, upb_env *env) { const char *limit, char *msg,
const upb_msglayout_msginit_v1 *l) {
do {
switch (wire_type) {
case UPB_WIRE_TYPE_VARINT:
CHK(upb_decode_varint(&ptr, limit, &val));
break;
case UPB_WIRE_TYPE_32BIT:
CHK(upb_decode_32bit(&ptr, limit, &val));
break;
case UPB_WIRE_TYPE_64BIT:
CHK(upb_decode_64bit(&ptr, limit, &val));
break;
case UPB_WIRE_TYPE_DELIMITED: {
upb_stringview val;
CHK(upb_decode_string(&ptr, limit, &val));
}
case UPB_WIRE_TYPE_START_GROUP:
depth++;
continue;
case UPB_WIRE_TYPE_END_GROUP:
depth--;
continue;
}
UPB_ASSERT(depth == 0);
upb_append_unknown(msg, l, d->ptr, ptr);
d->ptr = ptr;
return true;
} while (true);
}
static bool upb_decode_field(upb_decstate *d, const char *limit, char *msg,
const upb_msglayout_msginit_v1 *l) {
uint32_t tag; uint32_t tag;
uint32_t wire_type; uint32_t wire_type;
uint32_t field_number; uint32_t field_number;
const char *p = *ptr; const char *ptr = d->ptr;
const char *field_start = p;
const upb_msglayout_fieldinit_v1 *f; const upb_msglayout_fieldinit_v1 *f;
if (!upb_decode_varint32(&p, limit, &tag)) { if (!upb_decode_varint32(&ptr, limit, &tag)) {
upb_decode_seterr(env, "Error decoding tag.\n"); upb_decode_seterr(env, "Error decoding tag.\n");
return false; return false;
} }
@ -141,84 +182,178 @@ bool upb_decode_field(const char **ptr, const char *limit, char *msg,
f = upb_find_field(l, field_number); f = upb_find_field(l, field_number);
if (f) {
return upb_decode_knownfield(d, ptr, limit, msg, l, f);
} else {
return upb_decode_unknownfield(d, ptr, limit, msg, l);
}
if (f->label == UPB_LABEL_REPEATED) {
arr = upb_getarray(msg, f, env);
}
switch (wire_type) { switch (wire_type) {
case UPB_WIRE_TYPE_VARINT: { case UPB_WIRE_TYPE_VARINT: {
uint64_t val; uint64_t val;
if (!upb_decode_varint(&p, limit, &val)) { if (!upb_decode_varint(&ptr, limit, &val)) {
upb_decode_seterr(env, "Error decoding varint value.\n"); upb_decode_seterr(env, "Error decoding varint value.\n");
return false; return false;
} }
if (!f) { if (!f) {
return upb_append_unknown(ptr, field_start, p, msg); return upb_append_unknown(ptr, field_start, ptr, msg);
} }
switch (f->type) { if (f->label == UPB_LABEL_REPEATED) {
case UPB_DESCRIPTOR_TYPE_INT64: upb_array *arr = upb_getarray(msg, f, env);
case UPB_DESCRIPTOR_TYPE_UINT64: switch (f->type) {
memcpy(msg + f->offset, &val, sizeof(val)); case UPB_DESCRIPTOR_TYPE_INT64:
break; case UPB_DESCRIPTOR_TYPE_UINT64:
case UPB_DESCRIPTOR_TYPE_INT32: memcpy(arr->data, &val, sizeof(val));
case UPB_DESCRIPTOR_TYPE_UINT32: arr->len++;
case UPB_DESCRIPTOR_TYPE_ENUM: { break;
uint32_t val32 = val; case UPB_DESCRIPTOR_TYPE_INT32:
memcpy(msg + f->offset, &val32, sizeof(val32)); case UPB_DESCRIPTOR_TYPE_UINT32:
break; case UPB_DESCRIPTOR_TYPE_ENUM: {
uint32_t val32 = val;
memcpy(arr->data, &val32, sizeof(val32));
arr->len++;
break;
}
case UPB_DESCRIPTOR_TYPE_SINT32: {
int32_t decoded = upb_zzdec_32(val);
memcpy(arr->data, &decoded, sizeof(decoded));
arr->len++;
break;
}
case UPB_DESCRIPTOR_TYPE_SINT64: {
int64_t decoded = upb_zzdec_64(val);
memcpy(arr->data, &decoded, sizeof(decoded));
arr->len++;
break;
}
default:
return upb_append_unknown(ptr, field_start, ptr, msg);
} }
case UPB_DESCRIPTOR_TYPE_SINT32: { } else {
int32_t decoded = upb_zzdec_32(val); switch (f->type) {
memcpy(msg + f->offset, &decoded, sizeof(decoded)); case UPB_DESCRIPTOR_TYPE_INT64:
break; case UPB_DESCRIPTOR_TYPE_UINT64:
} memcpy(msg + f->offset, &val, sizeof(val));
case UPB_DESCRIPTOR_TYPE_SINT64: { break;
int64_t decoded = upb_zzdec_64(val); case UPB_DESCRIPTOR_TYPE_INT32:
memcpy(msg + f->offset, &decoded, sizeof(decoded)); case UPB_DESCRIPTOR_TYPE_UINT32:
break; case UPB_DESCRIPTOR_TYPE_ENUM: {
uint32_t val32 = val;
memcpy(msg + f->offset, &val32, sizeof(val32));
break;
}
case UPB_DESCRIPTOR_TYPE_SINT32: {
int32_t decoded = upb_zzdec_32(val);
memcpy(msg + f->offset, &decoded, sizeof(decoded));
break;
}
case UPB_DESCRIPTOR_TYPE_SINT64: {
int64_t decoded = upb_zzdec_64(val);
memcpy(msg + f->offset, &decoded, sizeof(decoded));
break;
}
default:
return upb_append_unknown(ptr, field_start, ptr, msg);
} }
default:
return upb_append_unknown(ptr, field_start, p, msg);
} }
break; break;
} }
case UPB_WIRE_TYPE_64BIT: { case UPB_WIRE_TYPE_64BIT: {
uint64_t val; uint64_t val;
if (!upb_decode_64bit(&p, limit, &val)) { if (!upb_decode_64bit(&ptr, limit, &val)) {
upb_decode_seterr(env, "Error decoding 64bit value.\n"); upb_decode_seterr(env, "Error decoding 64bit value.\n");
return false; return false;
} }
if (!f) { if (!f) {
return upb_append_unknown(ptr, field_start, p, msg); return upb_append_unknown(ptr, field_start, ptr, msg);
}
switch (f->type) {
case UPB_DESCRIPTOR_TYPE_DOUBLE:
case UPB_DESCRIPTOR_TYPE_FIXED64:
case UPB_DESCRIPTOR_TYPE_SFIXED64:
memcpy(msg + f->offset, &val, sizeof(val));
default:
return upb_append_unknown(ptr, field_start, ptr, msg);
} }
break; break;
} }
case UPB_WIRE_TYPE_32BIT: { case UPB_WIRE_TYPE_32BIT: {
uint32_t val; uint32_t val;
if (!upb_decode_32bit(&p, limit, &val)) { if (!upb_decode_32bit(&ptr, limit, &val)) {
upb_decode_seterr(env, "Error decoding 32bit value.\n"); upb_decode_seterr(env, "Error decoding 32bit value.\n");
return false; return false;
} }
if (!f) { if (!f) {
return upb_append_unknown(ptr, field_start, p, msg); return upb_append_unknown(ptr, field_start, ptr, msg);
}
switch (f->type) {
case UPB_DESCRIPTOR_TYPE_FLOAT:
case UPB_DESCRIPTOR_TYPE_FIXED32:
case UPB_DESCRIPTOR_TYPE_SFIXED32:
memcpy(msg + f->offset, &val, sizeof(val));
default:
return upb_append_unknown(ptr, field_start, ptr, msg);
} }
break; break;
} }
case UPB_WIRE_TYPE_DELIMITED: { case UPB_WIRE_TYPE_DELIMITED: {
upb_stringview val; upb_stringview val;
if (!upb_decode_string(&p, limit, &val)) { if (!upb_decode_string(&ptr, limit, &val)) {
upb_decode_seterr(env, "Error decoding delimited value.\n"); upb_decode_seterr(env, "Error decoding delimited value.\n");
return false; return false;
} }
if (!f) { if (!f) {
return upb_append_unknown(ptr, field_start, p, msg); return upb_append_unknown(ptr, field_start, ptr, msg);
}
switch (f->type) {
case UPB_DESCRIPTOR_TYPE_STRING:
case UPB_DESCRIPTOR_TYPE_BYTES:
memcpy(msg + f->offset, &val, sizeof(val));
break;
case UPB_DESCRIPTOR_TYPE_INT64:
case UPB_DESCRIPTOR_TYPE_UINT64: {
memcpy(msg + f->offset, &val, sizeof(val));
break;
case UPB_DESCRIPTOR_TYPE_INT32:
case UPB_DESCRIPTOR_TYPE_UINT32:
case UPB_DESCRIPTOR_TYPE_ENUM: {
uint32_t val32 = val;
memcpy(msg + f->offset, &val32, sizeof(val32));
break;
}
case UPB_DESCRIPTOR_TYPE_SINT32: {
int32_t decoded = upb_zzdec_32(val);
memcpy(msg + f->offset, &decoded, sizeof(decoded));
break;
}
case UPB_DESCRIPTOR_TYPE_SINT64:
case UPB_DESCRIPTOR_TYPE_FLOAT:
case UPB_DESCRIPTOR_TYPE_FIXED32:
case UPB_DESCRIPTOR_TYPE_SFIXED32:
/*
case UPB_DESCRIPTOR_TYPE_MESSAGE: {
upb_decode_message(val,
}
*/
default:
return upb_append_unknown(ptr, field_start, ptr, msg);
} }
memcpy(msg + f->offset, &val, sizeof(val));
break; break;
} }
} }
@ -227,17 +362,15 @@ bool upb_decode_field(const char **ptr, const char *limit, char *msg,
upb_set32(msg, l->oneofs[f->oneof_index].case_offset, f->number); upb_set32(msg, l->oneofs[f->oneof_index].case_offset, f->number);
} }
*ptr = p; d->ptr = ptr;
return true; return true;
} }
bool upb_decode(upb_stringview buf, void *msg_void, static bool upb_decode_message(upb_decstate *d, upb_stringview buf,
const upb_msglayout_msginit_v1 *l, upb_env *env) { char *msg, const upb_msglayout_msginit_v1 *l) {
char *msg = msg_void;
const char *ptr = buf.data;
const char *limit = ptr + buf.size; const char *limit = ptr + buf.size;
while (ptr < limit) { while (d->ptr < limit) {
if (!upb_decode_field(&ptr, limit, msg, l, env)) { if (!upb_decode_field(&ptr, limit, msg, l, env)) {
return false; return false;
} }
@ -245,3 +378,8 @@ bool upb_decode(upb_stringview buf, void *msg_void,
return true; return true;
} }
bool upb_decode(upb_stringview buf, void *msg,
const upb_msglayout_msginit_v1 *l, upb_env *env) {
return upb_decode_message(buf, msg, l, env);
}

401
upb/encode.c
Unescape View File

@ -3,6 +3,7 @@
#include "upb/structs.int.h" #include "upb/structs.int.h"
#define UPB_PB_VARINT_MAX_LEN 10 #define UPB_PB_VARINT_MAX_LEN 10
#define CHK(x) do { if (!(x)) { return false; } } while(0)
static size_t upb_encode_varint(uint64_t val, char *buf) { static size_t upb_encode_varint(uint64_t val, char *buf) {
size_t i; size_t i;
@ -17,11 +18,6 @@ static size_t upb_encode_varint(uint64_t val, char *buf) {
return i; return i;
} }
static size_t upb_varint_size(uint64_t val) {
char buf[UPB_PB_VARINT_MAX_LEN];
return upb_encode_varint(val, buf);
}
static uint32_t upb_zzenc_32(int32_t n) { return (n << 1) ^ (n >> 31); } static uint32_t upb_zzenc_32(int32_t n) { return (n << 1) ^ (n >> 31); }
static uint64_t upb_zzenc_64(int64_t n) { return (n << 1) ^ (n >> 63); } static uint64_t upb_zzenc_64(int64_t n) { return (n << 1) ^ (n >> 63); }
@ -57,78 +53,29 @@ const uint8_t upb_native_wiretypes[] = {
UPB_WIRE_TYPE_VARINT, /* SINT64 */ UPB_WIRE_TYPE_VARINT, /* SINT64 */
}; };
/* The output buffer is divided into segments; a segment is a string of data
* that is "ready to go" -- it does not need any varint lengths inserted into
* the middle. The seams between segments are where varints will be inserted
* once they are known.
*
* We also use the concept of a "run", which is a range of encoded bytes that
* occur at a single submessage level. Every segment contains one or more runs.
*
* A segment can span messages. Consider:
*
* .--Submessage lengths---------.
* | | |
* | V V
* V | |--------------- | |-----------------
* Submessages: | |-----------------------------------------------
* Top-level msg: ------------------------------------------------------------
*
* Segments: ----- ------------------- -----------------
* Runs: *---- *--------------*--- *----------------
* (* marks the start)
*
* Note that the top-level menssage is not in any segment because it does not
* have any length preceding it.
*
* A segment is only interrupted when another length needs to be inserted. So
* observe how the second segment spans both the inner submessage and part of
* the next enclosing message. */
typedef struct {
uint32_t msglen; /* The length to varint-encode before this segment. */
uint32_t seglen; /* Length of the segment. */
} upb_segment;
typedef struct { typedef struct {
upb_env *env; upb_env *env;
char *buf, *ptr, *limit; char *buf, *ptr, *limit;
/* The beginning of the current run, or undefined if we are at the top
* level. */
char *runbegin;
/* The list of segments we are accumulating. */
upb_segment *segbuf, *segptr, *seglimit;
/* The stack of enclosing submessages. Each entry in the stack points to the
* segment where this submessage's length is being accumulated. */
int *stack, *top, *stacklimit;
} upb_encstate; } upb_encstate;
static upb_segment *upb_encode_top(upb_encstate *e) { static size_t upb_roundup_pow2(size_t bytes) {
return &e->segbuf[*e->top]; size_t ret = 128;
while (ret < bytes) {
ret *= 2;
}
return ret;
} }
static bool upb_encode_growbuffer(upb_encstate *e, size_t bytes) { static bool upb_encode_growbuffer(upb_encstate *e, size_t bytes) {
char *new_buf;
size_t needed = bytes + (e->ptr - e->buf);
size_t old_size = e->limit - e->buf; size_t old_size = e->limit - e->buf;
size_t new_size = upb_roundup_pow2(bytes + (e->limit - e->ptr));
char *new_buf = upb_env_realloc(e->env, e->buf, old_size, new_size);
CHK(new_buf);
size_t new_size = old_size; /* We want previous data at the end, realloc() put it at the beginning. */
memmove(e->limit - old_size, e->buf, old_size);
while (new_size < needed) { e->ptr = new_buf + new_size - (e->limit - e->ptr);
new_size *= 2;
}
new_buf = upb_env_realloc(e->env, e->buf, old_size, new_size);
if (new_buf == NULL) {
return false;
}
e->ptr = new_buf + (e->ptr - e->buf);
e->runbegin = new_buf + (e->runbegin - e->buf);
e->limit = new_buf + new_size; e->limit = new_buf + new_size;
e->buf = new_buf; e->buf = new_buf;
return true; return true;
@ -137,120 +84,20 @@ static bool upb_encode_growbuffer(upb_encstate *e, size_t bytes) {
/* Call to ensure that at least "bytes" bytes are available for writing at /* Call to ensure that at least "bytes" bytes are available for writing at
* e->ptr. Returns false if the bytes could not be allocated. */ * e->ptr. Returns false if the bytes could not be allocated. */
static bool upb_encode_reserve(upb_encstate *e, size_t bytes) { static bool upb_encode_reserve(upb_encstate *e, size_t bytes) {
if (UPB_LIKELY((size_t)(e->limit - e->ptr) >= bytes)) { CHK(UPB_LIKELY((size_t)(e->ptr - e->buf) >= bytes) ||
return true; upb_encode_growbuffer(e, bytes));
}
return upb_encode_growbuffer(e, bytes);
}
/* Call when "bytes" bytes have been writte at e->ptr. The caller *must* have e->ptr -= bytes;
* previously called reserve() with at least this many bytes. */ return true;
static void upb_encode_advance(upb_encstate *e, size_t bytes) {
UPB_ASSERT((size_t)(e->limit - e->ptr) >= bytes);
e->ptr += bytes;
} }
/* Writes the given bytes to the buffer, handling reserve/advance. */ /* Writes the given bytes to the buffer, handling reserve/advance. */
static bool upb_put_bytes(upb_encstate *e, const void *data, size_t len) { static bool upb_put_bytes(upb_encstate *e, const void *data, size_t len) {
if (!upb_encode_reserve(e, len)) { CHK(upb_encode_reserve(e, len));
return false;
}
memcpy(e->ptr, data, len); memcpy(e->ptr, data, len);
upb_encode_advance(e, len);
return true;
}
/* Finish the current run by adding the run totals to the segment and message
* length. */
static void upb_encode_accumulate(upb_encstate *e) {
size_t run_len;
UPB_ASSERT(e->ptr >= e->runbegin);
run_len = e->ptr - e->runbegin;
e->segptr->seglen += run_len;
upb_encode_top(e)->msglen += run_len;
e->runbegin = e->ptr;
}
/* Call to indicate the start of delimited region for which the full length is
* not yet known. The length will be inserted at the current position once it
* is known (and subsequent data moved if necessary). */
static bool upb_encode_startdelim(upb_encstate *e) {
if (e->top) {
/* We are already buffering, advance to the next segment and push it on the
* stack. */
upb_encode_accumulate(e);
if (++e->top == e->stacklimit) {
/* TODO(haberman): grow stack? */
return false;
}
if (++e->segptr == e->seglimit) {
/* Grow segment buffer. */
size_t old_size =
(e->seglimit - e->segbuf) * sizeof(upb_segment);
size_t new_size = old_size * 2;
upb_segment *new_buf =
upb_env_realloc(e->env, e->segbuf, old_size, new_size);
if (new_buf == NULL) {
return false;
}
e->segptr = new_buf + (e->segptr - e->segbuf);
e->seglimit = new_buf + (new_size / sizeof(upb_segment));
e->segbuf = new_buf;
}
} else {
/* We were previously at the top level, start buffering. */
e->segptr = e->segbuf;
e->top = e->stack;
e->runbegin = e->ptr;
}
*e->top = e->segptr - e->segbuf;
e->segptr->seglen = 0;
e->segptr->msglen = 0;
return true; return true;
} }
/* Call to indicate the end of a delimited region. We now know the length of
* the delimited region. If we are not nested inside any other delimited
* regions, we can now emit all of the buffered data we accumulated. */
static bool upb_encode_enddelim(upb_encstate *e) {
size_t msglen;
upb_encode_accumulate(e);
msglen = upb_encode_top(e)->msglen;
if (e->top == e->stack) {
/* All lengths are now available, emit all buffered data. */
char buf[UPB_PB_VARINT_MAX_LEN];
upb_segment *s;
const char *ptr = e->buf;
for (s = e->segbuf; s <= e->segptr; s++) {
size_t lenbytes = upb_encode_varint(s->msglen, buf);
//putbuf(e, buf, lenbytes);
//putbuf(e, ptr, s->seglen);
ptr += s->seglen;
}
e->ptr = e->buf;
e->top = NULL;
} else {
/* Need to keep buffering; propagate length info into enclosing
* submessages. */
--e->top;
upb_encode_top(e)->msglen += msglen + upb_varint_size(msglen);
}
return true;
}
/* encoding of wire types *****************************************************/
static bool upb_put_fixed64(upb_encstate *e, uint64_t val) { static bool upb_put_fixed64(upb_encstate *e, uint64_t val) {
/* TODO(haberman): byte-swap for big endian. */ /* TODO(haberman): byte-swap for big endian. */
return upb_put_bytes(e, &val, sizeof(uint64_t)); return upb_put_bytes(e, &val, sizeof(uint64_t));
@ -262,11 +109,13 @@ static bool upb_put_fixed32(upb_encstate *e, uint32_t val) {
} }
static bool upb_put_varint(upb_encstate *e, uint64_t val) { static bool upb_put_varint(upb_encstate *e, uint64_t val) {
if (!upb_encode_reserve(e, UPB_PB_VARINT_MAX_LEN)) { size_t len;
return false; char *start;
} CHK(upb_encode_reserve(e, UPB_PB_VARINT_MAX_LEN));
len = upb_encode_varint(val, e->ptr);
upb_encode_advance(e, upb_encode_varint(val, e->ptr)); start = e->ptr + UPB_PB_VARINT_MAX_LEN - len;
memmove(start, e->ptr, len);
e->ptr = start;
return true; return true;
} }
@ -304,11 +153,12 @@ static bool upb_put_tag(upb_encstate *e, int field_number, int wire_type) {
static bool upb_put_fixedarray(upb_encstate *e, const upb_array *arr, static bool upb_put_fixedarray(upb_encstate *e, const upb_array *arr,
size_t size) { size_t size) {
size_t bytes = arr->len * size; size_t bytes = arr->len * size;
return upb_put_varint(e, bytes) && upb_put_bytes(e, arr->data, bytes); return upb_put_bytes(e, arr->data, bytes) && upb_put_varint(e, bytes);
} }
bool upb_encode_message(upb_encstate *e, const char *msg, bool upb_encode_message(upb_encstate *e, const char *msg,
const upb_msglayout_msginit_v1 *m); const upb_msglayout_msginit_v1 *m,
size_t *size);
static bool upb_encode_array(upb_encstate *e, const char *field_mem, static bool upb_encode_array(upb_encstate *e, const char *field_mem,
const upb_msglayout_msginit_v1 *m, const upb_msglayout_msginit_v1 *m,
@ -319,146 +169,161 @@ static bool upb_encode_array(upb_encstate *e, const char *field_mem,
return true; return true;
} }
/* We encode all primitive arrays as packed, regardless of what was specified #define VARINT_CASE(ctype, encode) do { \
* in the .proto file. Could special case 1-sized arrays. */ uint64_t *start = arr->data; \
if (!upb_put_tag(e, f->number, UPB_WIRE_TYPE_DELIMITED)) { uint64_t *ptr = start + arr->len; \
return false; char *buf_ptr = e->ptr; \
} do { \
ptr--; \
#define VARINT_CASE(ctype, encode) { \ CHK(upb_put_varint(e, encode)); \
uint64_t *data = arr->data; \ } while (ptr != start); \
uint64_t *limit = data + arr->len; \ CHK(upb_put_varint(e, buf_ptr - e->ptr)); \
if (!upb_encode_startdelim(e)) { \ break; \
return false; \ } while(0)
} \
for (; data < limit; data++) { \
if (!upb_put_varint(e, encode)) { \
return false; \
} \
} \
return upb_encode_enddelim(e); \
}
switch (f->type) { switch (f->type) {
case UPB_DESCRIPTOR_TYPE_DOUBLE: case UPB_DESCRIPTOR_TYPE_DOUBLE:
return upb_put_fixedarray(e, arr, sizeof(double)); CHK(upb_put_fixedarray(e, arr, sizeof(double)));
break;
case UPB_DESCRIPTOR_TYPE_FLOAT: case UPB_DESCRIPTOR_TYPE_FLOAT:
return upb_put_fixedarray(e, arr, sizeof(float)); CHK(upb_put_fixedarray(e, arr, sizeof(float)));
break;
case UPB_DESCRIPTOR_TYPE_SFIXED64: case UPB_DESCRIPTOR_TYPE_SFIXED64:
case UPB_DESCRIPTOR_TYPE_FIXED64: case UPB_DESCRIPTOR_TYPE_FIXED64:
return upb_put_fixedarray(e, arr, sizeof(uint64_t)); CHK(upb_put_fixedarray(e, arr, sizeof(uint64_t)));
break;
case UPB_DESCRIPTOR_TYPE_FIXED32: case UPB_DESCRIPTOR_TYPE_FIXED32:
case UPB_DESCRIPTOR_TYPE_SFIXED32: case UPB_DESCRIPTOR_TYPE_SFIXED32:
return upb_put_fixedarray(e, arr, sizeof(uint32_t)); CHK(upb_put_fixedarray(e, arr, sizeof(uint32_t)));
break;
case UPB_DESCRIPTOR_TYPE_INT64: case UPB_DESCRIPTOR_TYPE_INT64:
case UPB_DESCRIPTOR_TYPE_UINT64: case UPB_DESCRIPTOR_TYPE_UINT64:
VARINT_CASE(uint64_t, *data); VARINT_CASE(uint64_t, *ptr);
case UPB_DESCRIPTOR_TYPE_UINT32: case UPB_DESCRIPTOR_TYPE_UINT32:
case UPB_DESCRIPTOR_TYPE_INT32: case UPB_DESCRIPTOR_TYPE_INT32:
case UPB_DESCRIPTOR_TYPE_ENUM: case UPB_DESCRIPTOR_TYPE_ENUM:
VARINT_CASE(uint32_t, *data); VARINT_CASE(uint32_t, *ptr);
case UPB_DESCRIPTOR_TYPE_BOOL: case UPB_DESCRIPTOR_TYPE_BOOL:
VARINT_CASE(bool, *data); VARINT_CASE(bool, *ptr);
case UPB_DESCRIPTOR_TYPE_SINT32: case UPB_DESCRIPTOR_TYPE_SINT32:
VARINT_CASE(int32_t, upb_zzenc_32(*data)); VARINT_CASE(int32_t, upb_zzenc_32(*ptr));
case UPB_DESCRIPTOR_TYPE_SINT64: case UPB_DESCRIPTOR_TYPE_SINT64:
VARINT_CASE(int64_t, upb_zzenc_64(*data)); VARINT_CASE(int64_t, upb_zzenc_64(*ptr));
case UPB_DESCRIPTOR_TYPE_STRING: case UPB_DESCRIPTOR_TYPE_STRING:
case UPB_DESCRIPTOR_TYPE_BYTES: { case UPB_DESCRIPTOR_TYPE_BYTES: {
upb_stringview *data = arr->data; upb_stringview *start = arr->data;
upb_stringview *limit = data + arr->len; upb_stringview *ptr = start + arr->len;
goto put_string_data; /* Skip first tag, we already put it. */ do {
for (; data < limit; data++) { ptr--;
if (!upb_put_tag(e, f->number, UPB_WIRE_TYPE_DELIMITED)) { CHK(upb_put_bytes(e, ptr->data, ptr->size) &&
return false; upb_put_varint(e, ptr->size) &&
} upb_put_tag(e, f->number, UPB_WIRE_TYPE_DELIMITED));
put_string_data: } while (ptr != start);
if (!upb_put_varint(e, data->size) || return true;
!upb_put_bytes(e, data->data, data->size)) { }
return false; case UPB_DESCRIPTOR_TYPE_GROUP: {
} void **start = arr->data;
} void **ptr = start + arr->len;
const upb_msglayout_msginit_v1 *subm = m->submsgs[f->submsg_index];
do {
size_t size;
ptr--;
CHK(upb_put_tag(e, f->number, UPB_WIRE_TYPE_END_GROUP) &&
upb_encode_message(e, *ptr, subm, &size) &&
upb_put_tag(e, f->number, UPB_WIRE_TYPE_START_GROUP));
} while (ptr != start);
return true;
} }
case UPB_DESCRIPTOR_TYPE_GROUP:
case UPB_DESCRIPTOR_TYPE_MESSAGE: { case UPB_DESCRIPTOR_TYPE_MESSAGE: {
void **data = arr->data; void **start = arr->data;
void **limit = data + arr->len; void **ptr = start + arr->len;
const upb_msglayout_msginit_v1 *subm = m->submsgs[f->submsg_index]; const upb_msglayout_msginit_v1 *subm = m->submsgs[f->submsg_index];
goto put_submsg_data; /* Skip first tag, we already put it. */ do {
for (; data < limit; data++) { size_t size;
if (!upb_put_tag(e, f->number, UPB_WIRE_TYPE_DELIMITED)) { ptr--;
return false; CHK(upb_encode_message(e, *ptr, subm, &size) &&
} upb_put_varint(e, size) &&
put_submsg_data: upb_put_tag(e, f->number, UPB_WIRE_TYPE_DELIMITED));
if (!upb_encode_startdelim(e) || } while (ptr != start);
!upb_encode_message(e, *data, subm) || return true;
!upb_encode_enddelim(e)) {
return false;
}
}
} }
} }
UPB_UNREACHABLE();
#undef VARINT_CASE #undef VARINT_CASE
/* We encode all primitive arrays as packed, regardless of what was specified
* in the .proto file. Could special case 1-sized arrays. */
CHK(upb_put_tag(e, f->number, UPB_WIRE_TYPE_DELIMITED));
return true;
} }
static bool upb_encode_scalarfield(upb_encstate *e, const char *field_mem, static bool upb_encode_scalarfield(upb_encstate *e, const char *field_mem,
const upb_msglayout_msginit_v1 *m, const upb_msglayout_msginit_v1 *m,
const upb_msglayout_fieldinit_v1 *f, const upb_msglayout_fieldinit_v1 *f,
bool is_proto3) { bool is_proto3) {
#define CASE(ctype, type, wire_type, encodeval) { \ #define CASE(ctype, type, wire_type, encodeval) do { \
ctype val = *(ctype*)field_mem; \ ctype val = *(ctype*)field_mem; \
if (is_proto3 && val == 0) { \ if (is_proto3 && val == 0) { \
return true; \ return true; \
} \ } \
return upb_put_tag(e, f->number, wire_type) && \ return upb_put_ ## type(e, encodeval) && \
upb_put_ ## type(e, encodeval); \ upb_put_tag(e, f->number, wire_type); \
} } while(0)
switch (f->type) { switch (f->type) {
case UPB_DESCRIPTOR_TYPE_DOUBLE: case UPB_DESCRIPTOR_TYPE_DOUBLE:
CASE(double, double, UPB_WIRE_TYPE_64BIT, val) CASE(double, double, UPB_WIRE_TYPE_64BIT, val);
case UPB_DESCRIPTOR_TYPE_FLOAT: case UPB_DESCRIPTOR_TYPE_FLOAT:
CASE(float, float, UPB_WIRE_TYPE_32BIT, val) CASE(float, float, UPB_WIRE_TYPE_32BIT, val);
case UPB_DESCRIPTOR_TYPE_INT64: case UPB_DESCRIPTOR_TYPE_INT64:
case UPB_DESCRIPTOR_TYPE_UINT64: case UPB_DESCRIPTOR_TYPE_UINT64:
CASE(uint64_t, varint, UPB_WIRE_TYPE_VARINT, val) CASE(uint64_t, varint, UPB_WIRE_TYPE_VARINT, val);
case UPB_DESCRIPTOR_TYPE_UINT32: case UPB_DESCRIPTOR_TYPE_UINT32:
case UPB_DESCRIPTOR_TYPE_INT32: case UPB_DESCRIPTOR_TYPE_INT32:
case UPB_DESCRIPTOR_TYPE_ENUM: case UPB_DESCRIPTOR_TYPE_ENUM:
CASE(uint32_t, varint, UPB_WIRE_TYPE_VARINT, val) CASE(uint32_t, varint, UPB_WIRE_TYPE_VARINT, val);
case UPB_DESCRIPTOR_TYPE_SFIXED64: case UPB_DESCRIPTOR_TYPE_SFIXED64:
case UPB_DESCRIPTOR_TYPE_FIXED64: case UPB_DESCRIPTOR_TYPE_FIXED64:
CASE(uint64_t, fixed64, UPB_WIRE_TYPE_64BIT, val) CASE(uint64_t, fixed64, UPB_WIRE_TYPE_64BIT, val);
case UPB_DESCRIPTOR_TYPE_FIXED32: case UPB_DESCRIPTOR_TYPE_FIXED32:
case UPB_DESCRIPTOR_TYPE_SFIXED32: case UPB_DESCRIPTOR_TYPE_SFIXED32:
CASE(uint32_t, fixed32, UPB_WIRE_TYPE_32BIT, val) CASE(uint32_t, fixed32, UPB_WIRE_TYPE_32BIT, val);
case UPB_DESCRIPTOR_TYPE_BOOL: case UPB_DESCRIPTOR_TYPE_BOOL:
CASE(bool, varint, UPB_WIRE_TYPE_VARINT, val) CASE(bool, varint, UPB_WIRE_TYPE_VARINT, val);
case UPB_DESCRIPTOR_TYPE_SINT32: case UPB_DESCRIPTOR_TYPE_SINT32:
CASE(int32_t, varint, UPB_WIRE_TYPE_VARINT, upb_zzenc_32(val)) CASE(int32_t, varint, UPB_WIRE_TYPE_VARINT, upb_zzenc_32(val));
case UPB_DESCRIPTOR_TYPE_SINT64: case UPB_DESCRIPTOR_TYPE_SINT64:
CASE(int64_t, varint, UPB_WIRE_TYPE_VARINT, upb_zzenc_64(val)) CASE(int64_t, varint, UPB_WIRE_TYPE_VARINT, upb_zzenc_64(val));
case UPB_DESCRIPTOR_TYPE_STRING: case UPB_DESCRIPTOR_TYPE_STRING:
case UPB_DESCRIPTOR_TYPE_BYTES: { case UPB_DESCRIPTOR_TYPE_BYTES: {
upb_stringview view = *(upb_stringview*)field_mem; upb_stringview view = *(upb_stringview*)field_mem;
if (is_proto3 && view.size == 0) { if (is_proto3 && view.size == 0) {
return true; return true;
} }
return upb_put_tag(e, f->number, UPB_WIRE_TYPE_DELIMITED) && return upb_put_bytes(e, view.data, view.size) &&
upb_put_varint(e, view.size) && upb_put_varint(e, view.size) &&
upb_put_bytes(e, view.data, view.size); upb_put_tag(e, f->number, UPB_WIRE_TYPE_DELIMITED);
}
case UPB_DESCRIPTOR_TYPE_GROUP: {
size_t size;
void *submsg = *(void**)field_mem;
const upb_msglayout_msginit_v1 *subm = m->submsgs[f->submsg_index];
if (is_proto3 && submsg == NULL) {
return true;
}
return upb_put_tag(e, f->number, UPB_WIRE_TYPE_END_GROUP) &&
upb_encode_message(e, submsg, subm, &size) &&
upb_put_tag(e, f->number, UPB_WIRE_TYPE_START_GROUP);
} }
case UPB_DESCRIPTOR_TYPE_GROUP:
case UPB_DESCRIPTOR_TYPE_MESSAGE: { case UPB_DESCRIPTOR_TYPE_MESSAGE: {
size_t size;
void *submsg = *(void**)field_mem; void *submsg = *(void**)field_mem;
const upb_msglayout_msginit_v1 *subm = m->submsgs[f->submsg_index];
if (is_proto3 && submsg == NULL) { if (is_proto3 && submsg == NULL) {
return true; return true;
} }
return upb_put_tag(e, f->number, UPB_WIRE_TYPE_DELIMITED) && return upb_encode_message(e, submsg, subm, &size) &&
upb_encode_startdelim(e) && upb_put_varint(e, size) &&
upb_encode_message(e, submsg, m->submsgs[f->submsg_index]) && upb_put_tag(e, f->number, UPB_WIRE_TYPE_DELIMITED);
upb_encode_enddelim(e);
} }
} }
#undef CASE #undef CASE
@ -479,34 +344,38 @@ bool upb_encode_hasscalarfield(const char *msg,
} }
bool upb_encode_message(upb_encstate* e, const char *msg, bool upb_encode_message(upb_encstate* e, const char *msg,
const upb_msglayout_msginit_v1 *m) { const upb_msglayout_msginit_v1 *m,
size_t *size) {
int i; int i;
for (i = 0; i < m->field_count; i++) { char *buf_end = e->ptr;
for (i = m->field_count - 1; i >= 0; i--) {
const upb_msglayout_fieldinit_v1 *f = &m->fields[i]; const upb_msglayout_fieldinit_v1 *f = &m->fields[i];
if (f->label == UPB_LABEL_REPEATED) { if (f->label == UPB_LABEL_REPEATED) {
if (!upb_encode_array(e, msg, m, f)) { CHK(upb_encode_array(e, msg, m, f));
return NULL;
}
} else { } else {
if (upb_encode_hasscalarfield(msg, m, f) && if (upb_encode_hasscalarfield(msg, m, f)) {
!upb_encode_scalarfield(e, msg + f->offset, m, f, !m->is_proto2)) { CHK(upb_encode_scalarfield(e, msg + f->offset, m, f, !m->is_proto2));
return NULL;
} }
} }
} }
*size = buf_end - e->ptr;
return true; return true;
} }
char *upb_encode(const void *msg, const upb_msglayout_msginit_v1 *m, char *upb_encode(const void *msg, const upb_msglayout_msginit_v1 *m,
upb_env *env, size_t *size) { upb_env *env, size_t *size) {
upb_encstate e; upb_encstate e;
e.env = env;
e.buf = NULL;
e.limit = NULL;
e.ptr = NULL;
if (!upb_encode_message(&e, msg, m)) { if (!upb_encode_message(&e, msg, m, size)) {
return false; return false;
} }
*size = e.ptr - e.buf; *size = e.limit - e.ptr;
return e.buf; return e.ptr;
} }

Write Preview
Loading…
Cancel
Save