grpc 1.42.0 → 1.46.3

data/third_party/upb/upb/text_encode.c

@@ -13,11 +13,11 @@
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -35,6 +35,9 @@
 #include <string.h>
 
 #include "upb/reflection.h"
+#include "upb/upb_internal.h"
+
+// Must be last.
 #include "upb/port_def.inc"
 
 typedef struct {
@@ -42,13 +45,14 @@ typedef struct {
   size_t overflow;
   int indent_depth;
   int options;
-  const upb_symtab *ext_pool;
+  const upb_DefPool* ext_pool;
   _upb_mapsorter sorter;
 } txtenc;
 
-static void txtenc_msg(txtenc *e, const upb_msg *msg, const upb_msgdef *m);
+static void txtenc_msg(txtenc* e, const upb_Message* msg,
+                       const upb_MessageDef* m);
 
-static void txtenc_putbytes(txtenc *e, const void *data, size_t len) {
+static void txtenc_putbytes(txtenc* e, const void* data, size_t len) {
   size_t have = e->end - e->ptr;
   if (UPB_LIKELY(have >= len)) {
     memcpy(e->ptr, data, len);
@@ -62,11 +66,11 @@ static void txtenc_putbytes(txtenc *e, const void *data, size_t len) {
   }
 }
 
-static void txtenc_putstr(txtenc *e, const char *str) {
+static void txtenc_putstr(txtenc* e, const char* str) {
   txtenc_putbytes(e, str, strlen(str));
 }
 
-static void txtenc_printf(txtenc *e, const char *fmt, ...) {
+static void txtenc_printf(txtenc* e, const char* fmt, ...) {
   size_t n;
   size_t have = e->end - e->ptr;
   va_list args;
@@ -83,7 +87,7 @@ static void txtenc_printf(txtenc *e, const char *fmt, ...) {
   }
 }
 
-static void txtenc_indent(txtenc *e) {
+static void txtenc_indent(txtenc* e) {
   if ((e->options & UPB_TXTENC_SINGLELINE) == 0) {
     int i = e->indent_depth;
     while (i-- > 0) {
@@ -92,7 +96,7 @@ static void txtenc_indent(txtenc *e) {
   }
 }
 
-static void txtenc_endfield(txtenc *e) {
+static void txtenc_endfield(txtenc* e) {
   if (e->options & UPB_TXTENC_SINGLELINE) {
     txtenc_putstr(e, " ");
   } else {
@@ -100,20 +104,20 @@ static void txtenc_endfield(txtenc *e) {
   }
 }
 
-static void txtenc_enum(int32_t val, const upb_fielddef *f, txtenc *e) {
-  const upb_enumdef *e_def = upb_fielddef_enumsubdef(f);
-  const char *name = upb_enumdef_iton(e_def, val);
+static void txtenc_enum(int32_t val, const upb_FieldDef* f, txtenc* e) {
+  const upb_EnumDef* e_def = upb_FieldDef_EnumSubDef(f);
+  const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNumber(e_def, val);
 
-  if (name) {
-    txtenc_printf(e, "%s", name);
+  if (ev) {
+    txtenc_printf(e, "%s", upb_EnumValueDef_Name(ev));
   } else {
     txtenc_printf(e, "%" PRId32, val);
   }
 }
 
-static void txtenc_string(txtenc *e, upb_strview str, bool bytes) {
-  const char *ptr = str.data;
-  const char *end = ptr + str.size;
+static void txtenc_string(txtenc* e, upb_StringView str, bool bytes) {
+  const char* ptr = str.data;
+  const char* end = ptr + str.size;
   txtenc_putstr(e, "\"");
 
   while (ptr < end) {
@@ -150,50 +154,65 @@ static void txtenc_string(txtenc *e, upb_strview str, bool bytes) {
   txtenc_putstr(e, "\"");
 }
 
-static void txtenc_field(txtenc *e, upb_msgval val, const upb_fielddef *f) {
+static void txtenc_field(txtenc* e, upb_MessageValue val,
+                         const upb_FieldDef* f) {
   txtenc_indent(e);
-  txtenc_printf(e, "%s: ", upb_fielddef_name(f));
+  upb_CType type = upb_FieldDef_CType(f);
+  const char* name = upb_FieldDef_Name(f);
+
+  if (type == kUpb_CType_Message) {
+    txtenc_printf(e, "%s {", name);
+    txtenc_endfield(e);
+    e->indent_depth++;
+    txtenc_msg(e, val.msg_val, upb_FieldDef_MessageSubDef(f));
+    e->indent_depth--;
+    txtenc_indent(e);
+    txtenc_putstr(e, "}");
+    txtenc_endfield(e);
+    return;
+  }
+
+  txtenc_printf(e, "%s: ", name);
 
-  switch (upb_fielddef_type(f)) {
-    case UPB_TYPE_BOOL:
+  switch (type) {
+    case kUpb_CType_Bool:
       txtenc_putstr(e, val.bool_val ? "true" : "false");
       break;
-    case UPB_TYPE_FLOAT:
-      txtenc_printf(e, "%f", val.float_val);
+    case kUpb_CType_Float: {
+      char buf[32];
+      _upb_EncodeRoundTripFloat(val.float_val, buf, sizeof(buf));
+      txtenc_putstr(e, buf);
       break;
-    case UPB_TYPE_DOUBLE:
-      txtenc_printf(e, "%f", val.double_val);
+    }
+    case kUpb_CType_Double: {
+      char buf[32];
+      _upb_EncodeRoundTripDouble(val.double_val, buf, sizeof(buf));
+      txtenc_putstr(e, buf);
       break;
-    case UPB_TYPE_INT32:
+    }
+    case kUpb_CType_Int32:
       txtenc_printf(e, "%" PRId32, val.int32_val);
       break;
-    case UPB_TYPE_UINT32:
+    case kUpb_CType_UInt32:
       txtenc_printf(e, "%" PRIu32, val.uint32_val);
       break;
-    case UPB_TYPE_INT64:
+    case kUpb_CType_Int64:
       txtenc_printf(e, "%" PRId64, val.int64_val);
       break;
-    case UPB_TYPE_UINT64:
+    case kUpb_CType_UInt64:
       txtenc_printf(e, "%" PRIu64, val.uint64_val);
       break;
-    case UPB_TYPE_STRING:
+    case kUpb_CType_String:
       txtenc_string(e, val.str_val, false);
       break;
-    case UPB_TYPE_BYTES:
+    case kUpb_CType_Bytes:
       txtenc_string(e, val.str_val, true);
       break;
-    case UPB_TYPE_ENUM:
+    case kUpb_CType_Enum:
       txtenc_enum(val.int32_val, f, e);
       break;
-    case UPB_TYPE_MESSAGE:
-      txtenc_putstr(e, "{");
-      txtenc_endfield(e);
-      e->indent_depth++;
-      txtenc_msg(e, val.msg_val, upb_fielddef_msgsubdef(f));
-      e->indent_depth--;
-      txtenc_indent(e);
-      txtenc_putstr(e, "}");
-      break;
+    default:
+      UPB_UNREACHABLE();
   }
 
   txtenc_endfield(e);
@@ -206,23 +225,23 @@ static void txtenc_field(txtenc *e, upb_msgval val, const upb_fielddef *f) {
  *    foo_field: 2
  *    foo_field: 3
  */
-static void txtenc_array(txtenc *e, const upb_array *arr,
-                         const upb_fielddef *f) {
+static void txtenc_array(txtenc* e, const upb_Array* arr,
+                         const upb_FieldDef* f) {
   size_t i;
-  size_t size = upb_array_size(arr);
+  size_t size = upb_Array_Size(arr);
 
   for (i = 0; i < size; i++) {
-    txtenc_field(e, upb_array_get(arr, i), f);
+    txtenc_field(e, upb_Array_Get(arr, i), f);
   }
 }
 
-static void txtenc_mapentry(txtenc *e, upb_msgval key, upb_msgval val,
-                            const upb_fielddef *f) {
-  const upb_msgdef *entry = upb_fielddef_msgsubdef(f);
-  const upb_fielddef *key_f = upb_msgdef_field(entry, 0);
-  const upb_fielddef *val_f = upb_msgdef_field(entry, 1);
+static void txtenc_mapentry(txtenc* e, upb_MessageValue key,
+                            upb_MessageValue val, const upb_FieldDef* f) {
+  const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f);
+  const upb_FieldDef* key_f = upb_MessageDef_Field(entry, 0);
+  const upb_FieldDef* val_f = upb_MessageDef_Field(entry, 1);
   txtenc_indent(e);
-  txtenc_printf(e, "%s: {", upb_fielddef_name(f));
+  txtenc_printf(e, "%s {", upb_FieldDef_Name(f));
   txtenc_endfield(e);
   e->indent_depth++;
 
@@ -247,24 +266,23 @@ static void txtenc_mapentry(txtenc *e, upb_msgval key, upb_msgval val,
  *      value: 456
  *    }
  */
-static void txtenc_map(txtenc *e, const upb_map *map, const upb_fielddef *f) {
+static void txtenc_map(txtenc* e, const upb_Map* map, const upb_FieldDef* f) {
   if (e->options & UPB_TXTENC_NOSORT) {
-    size_t iter = UPB_MAP_BEGIN;
-    while (upb_mapiter_next(map, &iter)) {
-      upb_msgval key = upb_mapiter_key(map, iter);
-      upb_msgval val = upb_mapiter_value(map, iter);
+    size_t iter = kUpb_Map_Begin;
+    while (upb_MapIterator_Next(map, &iter)) {
+      upb_MessageValue key = upb_MapIterator_Key(map, iter);
+      upb_MessageValue val = upb_MapIterator_Value(map, iter);
       txtenc_mapentry(e, key, val, f);
     }
   } else {
-    const upb_msgdef *entry = upb_fielddef_msgsubdef(f);
-    const upb_fielddef *key_f = upb_msgdef_field(entry, 0);
+    const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f);
+    const upb_FieldDef* key_f = upb_MessageDef_Field(entry, 0);
     _upb_sortedmap sorted;
-    upb_map_entry ent;
+    upb_MapEntry ent;
 
-    _upb_mapsorter_pushmap(&e->sorter, upb_fielddef_descriptortype(key_f), map,
-                           &sorted);
+    _upb_mapsorter_pushmap(&e->sorter, upb_FieldDef_Type(key_f), map, &sorted);
     while (_upb_sortedmap_next(&e->sorter, map, &sorted, &ent)) {
-      upb_msgval key, val;
+      upb_MessageValue key, val;
       memcpy(&key, &ent.k, sizeof(key));
       memcpy(&val, &ent.v, sizeof(val));
       txtenc_mapentry(e, key, val, f);
@@ -273,10 +291,15 @@ static void txtenc_map(txtenc *e, const upb_map *map, const upb_fielddef *f) {
   }
 }
 
-#define CHK(x) do { if (!(x)) { return false; } } while(0)
+#define CHK(x)      \
+  do {              \
+    if (!(x)) {     \
+      return false; \
+    }               \
+  } while (0)
 
-static const char *txtenc_parsevarint(const char *ptr, const char *limit,
-                                      uint64_t *val) {
+static const char* txtenc_parsevarint(const char* ptr, const char* limit,
+                                      uint64_t* val) {
   uint8_t byte;
   int bitpos = 0;
   *val = 0;
@@ -302,7 +325,7 @@ static const char *txtenc_parsevarint(const char *ptr, const char *limit,
  *   1: 111
  * }
  */
-static const char *txtenc_unknown(txtenc *e, const char *ptr, const char *end,
+static const char* txtenc_unknown(txtenc* e, const char* ptr, const char* end,
                                   int groupnum) {
   while (ptr < end) {
     uint64_t tag_64;
@@ -311,7 +334,7 @@ static const char *txtenc_unknown(txtenc *e, const char *ptr, const char *end,
     CHK(tag_64 < UINT32_MAX);
     tag = (uint32_t)tag_64;
 
-    if ((tag & 7) == UPB_WIRE_TYPE_END_GROUP) {
+    if ((tag & 7) == kUpb_WireType_EndGroup) {
       CHK((tag >> 3) == (uint32_t)groupnum);
       return ptr;
     }
@@ -320,13 +343,13 @@ static const char *txtenc_unknown(txtenc *e, const char *ptr, const char *end,
     txtenc_printf(e, "%d: ", (int)(tag >> 3));
 
     switch (tag & 7) {
-      case UPB_WIRE_TYPE_VARINT: {
+      case kUpb_WireType_Varint: {
         uint64_t val;
         CHK(ptr = txtenc_parsevarint(ptr, end, &val));
         txtenc_printf(e, "%" PRIu64, val);
         break;
       }
-      case UPB_WIRE_TYPE_32BIT: {
+      case kUpb_WireType_32Bit: {
         uint32_t val;
         CHK(end - ptr >= 4);
         memcpy(&val, ptr, 4);
@@ -334,7 +357,7 @@ static const char *txtenc_unknown(txtenc *e, const char *ptr, const char *end,
         txtenc_printf(e, "0x%08" PRIu32, val);
         break;
       }
-      case UPB_WIRE_TYPE_64BIT: {
+      case kUpb_WireType_64Bit: {
         uint64_t val;
         CHK(end - ptr >= 8);
         memcpy(&val, ptr, 8);
@@ -342,10 +365,10 @@ static const char *txtenc_unknown(txtenc *e, const char *ptr, const char *end,
         txtenc_printf(e, "0x%016" PRIu64, val);
         break;
       }
-      case UPB_WIRE_TYPE_DELIMITED: {
+      case kUpb_WireType_Delimited: {
         uint64_t len;
         size_t avail = end - ptr;
-        char *start = e->ptr;
+        char* start = e->ptr;
         size_t start_overflow = e->overflow;
         CHK(ptr = txtenc_parsevarint(ptr, end, &len));
         CHK(avail >= len);
@@ -360,7 +383,7 @@ static const char *txtenc_unknown(txtenc *e, const char *ptr, const char *end,
           txtenc_putstr(e, "}");
         } else {
           /* Didn't work out, print as raw bytes. */
-          upb_strview str;
+          upb_StringView str;
           e->indent_depth--;
           e->ptr = start;
           e->overflow = start_overflow;
@@ -371,7 +394,7 @@ static const char *txtenc_unknown(txtenc *e, const char *ptr, const char *end,
         ptr += len;
         break;
       }
-      case UPB_WIRE_TYPE_START_GROUP:
+      case kUpb_WireType_StartGroup:
         txtenc_putstr(e, "{");
         txtenc_endfield(e);
         e->indent_depth++;
@@ -389,16 +412,16 @@ static const char *txtenc_unknown(txtenc *e, const char *ptr, const char *end,
 
 #undef CHK
 
-static void txtenc_msg(txtenc *e, const upb_msg *msg,
-                       const upb_msgdef *m) {
-  size_t iter = UPB_MSG_BEGIN;
-  const upb_fielddef *f;
-  upb_msgval val;
+static void txtenc_msg(txtenc* e, const upb_Message* msg,
+                       const upb_MessageDef* m) {
+  size_t iter = kUpb_Message_Begin;
+  const upb_FieldDef* f;
+  upb_MessageValue val;
 
-  while (upb_msg_next(msg, m, e->ext_pool, &f, &val, &iter)) {
-    if (upb_fielddef_ismap(f)) {
+  while (upb_Message_Next(msg, m, e->ext_pool, &f, &val, &iter)) {
+    if (upb_FieldDef_IsMap(f)) {
       txtenc_map(e, val.map_val, f);
-    } else if (upb_fielddef_isseq(f)) {
+    } else if (upb_FieldDef_IsRepeated(f)) {
       txtenc_array(e, val.array_val, f);
     } else {
       txtenc_field(e, val, f);
@@ -407,8 +430,8 @@ static void txtenc_msg(txtenc *e, const upb_msg *msg,
 
   if ((e->options & UPB_TXTENC_SKIPUNKNOWN) == 0) {
     size_t len;
-    const char *ptr = upb_msg_getunknown(msg, &len);
-    char *start = e->ptr;
+    const char* ptr = upb_Message_GetUnknown(msg, &len);
+    char* start = e->ptr;
     if (ptr) {
       if (!txtenc_unknown(e, ptr, ptr + len, -1)) {
         /* Unknown failed to parse, back up and don't print it at all. */
@@ -418,7 +441,7 @@ static void txtenc_msg(txtenc *e, const upb_msg *msg,
   }
 }
 
-size_t txtenc_nullz(txtenc *e, size_t size) {
+size_t txtenc_nullz(txtenc* e, size_t size) {
   size_t ret = e->ptr - e->buf + e->overflow;
 
   if (size > 0) {
@@ -429,9 +452,9 @@ size_t txtenc_nullz(txtenc *e, size_t size) {
   return ret;
 }
 
-size_t upb_text_encode(const upb_msg *msg, const upb_msgdef *m,
-                       const upb_symtab *ext_pool, int options, char *buf,
-                       size_t size) {
+size_t upb_TextEncode(const upb_Message* msg, const upb_MessageDef* m,
+                      const upb_DefPool* ext_pool, int options, char* buf,
+                      size_t size) {
   txtenc e;
 
   e.buf = buf;

data/third_party/upb/upb/text_encode.h

@@ -13,11 +13,11 @@
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -53,12 +53,12 @@ enum {
  * size (excluding NULL) is returned.  This means that a return value >= |size|
  * implies that the output was truncated.  (These are the same semantics as
  * snprintf()). */
-size_t upb_text_encode(const upb_msg *msg, const upb_msgdef *m,
-                       const upb_symtab *ext_pool, int options, char *buf,
-                       size_t size);
+size_t upb_TextEncode(const upb_Message* msg, const upb_MessageDef* m,
+                      const upb_DefPool* ext_pool, int options, char* buf,
+                      size_t size);
 
 #ifdef __cplusplus
-}  /* extern "C" */
+} /* extern "C" */
 #endif
 
-#endif  /* UPB_TEXTENCODE_H_ */
+#endif /* UPB_TEXTENCODE_H_ */